diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a7edd7d8a..ccbe3b9777 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.1-0.25b1...HEAD) + +### Changed + - `opentelemetry-sdk-extension-aws` & `opentelemetry-propagator-aws` Release AWS Python SDK Extension as 2.0.1 and AWS Propagator as 1.0.1 ([#753](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/753)) +### Fixed + +- `opentelemetry-distro` uses the correct entrypoint name which was updated in the core release of 1.6.0 but the distro was not updated with it + ([#755](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/755)) + ## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18 ### Changed - `opentelemetry-util-http` no longer contains an instrumentation entrypoint and will not be loaded -automatically by the auto instrumentor. -([#745](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/745)) + automatically by the auto instrumentor. + ([#745](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/745)) - `opentelemetry-instrumentation-pika` Bugfix use properties.headers. It will prevent the header injection from raising. ([#740](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/740)) - `opentelemetry-instrumentation-botocore` Add extension for DynamoDB diff --git a/opentelemetry-distro/src/opentelemetry/distro/__init__.py b/opentelemetry-distro/src/opentelemetry/distro/__init__.py index 97e3e2fcc9..bfbfa061d7 100644 --- a/opentelemetry-distro/src/opentelemetry/distro/__init__.py +++ b/opentelemetry-distro/src/opentelemetry/distro/__init__.py @@ -31,4 +31,4 @@ class OpenTelemetryDistro(BaseDistro): # pylint: disable=no-self-use def _configure(self, **kwargs): - os.environ.setdefault(OTEL_TRACES_EXPORTER, "otlp_proto_grpc_span") + os.environ.setdefault(OTEL_TRACES_EXPORTER, "otlp_proto_grpc") diff --git a/opentelemetry-distro/tests/test_distro.py b/opentelemetry-distro/tests/test_distro.py index 2e42ed904a..6888e8e9ce 100644 --- a/opentelemetry-distro/tests/test_distro.py +++ b/opentelemetry-distro/tests/test_distro.py @@ -34,5 +34,5 @@ def test_default_configuration(self): self.assertIsNone(os.environ.get(OTEL_TRACES_EXPORTER)) distro.configure() self.assertEqual( - "otlp_proto_grpc_span", os.environ.get(OTEL_TRACES_EXPORTER) + "otlp_proto_grpc", os.environ.get(OTEL_TRACES_EXPORTER) ) diff --git a/opentelemetry-instrumentation/README.rst b/opentelemetry-instrumentation/README.rst index cae4e3ab5f..79378d47e6 100644 --- a/opentelemetry-instrumentation/README.rst +++ b/opentelemetry-instrumentation/README.rst @@ -72,12 +72,12 @@ Well known trace exporter names: - jaeger_thrift - opencensus - otlp - - otlp_proto_grpc_span - - otlp_proto_http_span + - otlp_proto_grpc + - otlp_proto_http - zipkin_json - zipkin_proto -``otlp`` is an alias for ``otlp_proto_grpc_span``. +``otlp`` is an alias for ``otlp_proto_grpc``. * ``--id-generator`` or ``OTEL_PYTHON_ID_GENERATOR``