Merge branch 'master' into asyncpg-semantic-conv

Author: lzchen

sdk-extension/opentelemetry-sdk-extension-aws/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add AWS X-Ray Ids Generator Entry Point
+  ([#201](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/201))
 - Fix typo for installing OTel SDK in docs
   ([#200](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/200))
 - Import missing components for docs

sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg

@@ -44,6 +44,8 @@ install_requires =
 [options.entry_points]
 opentelemetry_propagator =
     aws_xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat
+opentelemetry_ids_generator =
+    aws_xray = opentelemetry.sdk.extension.aws.trace.aws_xray_ids_generator:AwsXRayIdsGenerator
 
 [options.extras_require]
 test =