Skip to content

Commit bc751ea

Browse files
author
Michele Mancioppi
authored
Merge branch 'main' into aws_ecs_detector
2 parents 2de26c8 + 9b8243c commit bc751ea

File tree

24 files changed

+36
-1822
lines changed

24 files changed

+36
-1822
lines changed

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ignore=CVS,gen,Dockerfile,docker-compose.yml,README.md,requirements.txt,docs
1212
# Add files or directories matching the regex patterns to be excluded. The
1313
# regex matches against base names, not paths.
1414
ignore-patterns=
15-
ignore-paths=exporter/opentelemetry-exporter-datadog/.*$
15+
ignore-paths=
1616

1717
# Python code to execute, usually for sys.path manipulation such as
1818
# pygtk.require().

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
- `opentelemetry-instrumentation-django` Fixed bug where auto-instrumentation fails when django is installed and settings are not configured.
13+
([#1369](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1369))
1214
- `opentelemetry-instrumentation-system-metrics` add supports to collect system thread count. ([#1339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1339))
1315
- Implement [`aws.ecs.*`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/cloud_provider/aws/ecs.md) and [`aws.logs.*`](https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/cloud_provider/aws/logs/) resource attributes in the `AwsEcsResourceDetector` detector when the ECS Metadata v4 is available
1416
([#1212](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1212))
@@ -17,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1719

1820

1921

22+
- `opentelemetry-instrumentation-asyncpg` Fix high cardinality in the span name
23+
([#1324](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1324))
24+
2025
### Added
2126

2227
- `opentelemetry-instrumentation-grpc` add supports to filter requests to instrument. ([#1241](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1241))
@@ -44,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4449
([#1208](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1208))
4550
- `opentelemetry-instrumentation-aiohttp-client` Fix producing additional spans with each newly created ClientSession
4651
- ([#1246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1246))
47-
- Add _is_openetlemetry_instrumented check in _InstrumentedFastAPI class
52+
- Add _is_opentelemetry_instrumented check in _InstrumentedFastAPI class
4853
([#1313](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1313))
4954
- Fix uninstrumentation of existing app instances in FastAPI
5055
([#1258](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1258))

docs/exporter/datadog/datadog.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/index.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
5353
pip install -e ./sdk-extension/opentelemetry-sdk-extension-aws
5454
5555
56-
.. toctree::
57-
:maxdepth: 2
58-
:caption: OpenTelemetry Exporters
59-
:name: exporters
60-
:glob:
61-
62-
exporter/**
63-
6456
.. toctree::
6557
:maxdepth: 2
6658
:caption: OpenTelemetry Instrumentations

docs/nitpick-exceptions.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ class_references=
99
opentelemetry.propagators.textmap.DefaultGetter
1010
; API
1111
opentelemetry.propagators.textmap.Getter
12-
; - DatadogFormat
1312
; - AWSXRayPropagator
1413
opentelemetry.sdk.trace.id_generator.IdGenerator
1514
; - AwsXRayIdGenerator
@@ -38,7 +37,6 @@ anys=
3837
; - AwsXRayIdGenerator
3938
; SDK
4039
SpanProcessor
41-
; - DatadogExportSpanProcessor
4240
TracerProvider
4341
; - AwsXRayIdGenerator
4442
; Instrumentation

eachdist.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ packages=
4646

4747
[exclude_release]
4848
packages=
49-
opentelemetry-exporter-datadog
5049
opentelemetry-sdk-extension-aws
5150
opentelemetry-propagator-aws-xray
5251

exporter/opentelemetry-exporter-datadog/README.rst

Lines changed: 0 additions & 32 deletions
This file was deleted.

exporter/opentelemetry-exporter-datadog/pyproject.toml

Lines changed: 0 additions & 49 deletions
This file was deleted.

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py

Lines changed: 0 additions & 77 deletions
This file was deleted.

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)