From 11d90746b3783f234b63c47debc1ade492aee71d Mon Sep 17 00:00:00 2001 From: "(Eliseo) Nathaniel Ruiz Nowell" Date: Mon, 5 Jul 2021 10:41:20 -0700 Subject: [PATCH] Update AWS entry points to match spec --- CHANGELOG.md | 2 ++ sdk-extension/opentelemetry-sdk-extension-aws/README.rst | 2 +- sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg | 4 ++-- .../sdk/extension/aws/trace/propagation/aws_xray_format.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3713fc9333..115ea57c8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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.3.0-0.22b0...HEAD) +- `opentelemetry-sdk-extension-aws` Update AWS entry points to match spec + ([#566](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/566)) - Include Flask 2.0 as compatible with existing flask instrumentation ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545)) diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/README.rst b/sdk-extension/opentelemetry-sdk-extension-aws/README.rst index 790f6cb1dc..e95b44411e 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/README.rst +++ b/sdk-extension/opentelemetry-sdk-extension-aws/README.rst @@ -53,7 +53,7 @@ This can be done by either setting this environment variable: :: - export OTEL_PROPAGATORS = aws_xray + export OTEL_PROPAGATORS = xray Or by setting this propagator in your instrumented application: diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index bec34df03b..6f312fa51c 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -42,9 +42,9 @@ install_requires = [options.entry_points] opentelemetry_propagator = - aws_xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat + xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat opentelemetry_id_generator = - aws_xray = opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator + xray = opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator [options.extras_require] test = diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py index 2e5e913252..2bc145b791 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py @@ -31,7 +31,7 @@ :: - export OTEL_PROPAGATORS = aws_xray + export OTEL_PROPAGATORS = xray Or by setting this propagator in your instrumented application: