Update AWS entry points to match spec (#566)

open-telemetry · Jul 6, 2021 · bddd082 · bddd082
1 parent b2802dd
commit bddd082
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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/...dk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py b/...dk-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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@