Merge branch 'main' into elastic_response_hook

Author: nozik

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.5.0-0.24b0...HEAD)
+- `opentelemetry-sdk-extension-aws` Release AWS Python SDK Extension as 1.0.0
+  ([#667](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/667))
 
 ### Added
 - `opentelemetry-instrumentation-elasticsearch` Added `response_hook` callback
@@ -14,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - `opentelemetry-instrumentation-botocore` Unpatch botocore Endpoint.prepare_request on uninstrument
   ([#664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/664))
+- `opentelemetry-instrumentation-botocore` Fix span injection for lambda invoke
+  ([#663](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/663))
 
 ## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
 
@@ -28,8 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-fastapi` Allow instrumentation of newer FastAPI versions.
   ([#602](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/602))
-
-### Changed
 - Enable explicit `excluded_urls` argument in `opentelemetry-instrumentation-flask`
   ([#604](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/604))
 

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24b0
     opentelemetry-instrumentation-dbapi == 0.24b0
     opentelemetry-instrumentation == 0.24b0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
     opentelemetry-test == 0.24b0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.packages.find]
 where = src

instrumentation/opentelemetry-instrumentation-boto/setup.cfg

@@ -41,7 +41,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-semantic-conventions == 0.24b0
     opentelemetry-instrumentation == 0.24b0
-    opentelemetry-instrumentation-botocore == 0.24b0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py

@@ -150,15 +150,15 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
         error = None
         result = None
 
-        # inject trace context into payload headers for lambda Invoke
-        if BotocoreInstrumentor._is_lambda_invoke(
-            service_name, operation_name, api_params
-        ):
-            BotocoreInstrumentor._patch_lambda_invoke(api_params)
-
         with self._tracer.start_as_current_span(
             "{}".format(service_name), kind=SpanKind.CLIENT,
         ) as span:
+            # inject trace context into payload headers for lambda Invoke
+            if BotocoreInstrumentor._is_lambda_invoke(
+                service_name, operation_name, api_params
+            ):
+                BotocoreInstrumentor._patch_lambda_invoke(api_params)
+
             if span.is_recording():
                 span.set_attribute("aws.operation", operation_name)
                 span.set_attribute("aws.region", instance.meta.region_name)

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py

@@ -435,11 +435,13 @@ def test_lambda_invoke_propagation(self):
 
             self.assertIn(MockTextMapPropagator.TRACE_ID_KEY, headers)
             self.assertEqual(
-                "0", headers[MockTextMapPropagator.TRACE_ID_KEY],
+                str(spans[2].get_span_context().trace_id),
+                headers[MockTextMapPropagator.TRACE_ID_KEY],
             )
             self.assertIn(MockTextMapPropagator.SPAN_ID_KEY, headers)
             self.assertEqual(
-                "0", headers[MockTextMapPropagator.SPAN_ID_KEY],
+                str(spans[2].get_span_context().span_id),
+                headers[MockTextMapPropagator.SPAN_ID_KEY],
             )
         finally:
             set_global_textmap(previous_propagator)

instrumentation/opentelemetry-instrumentation-httpx/setup.cfg

@@ -42,7 +42,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-instrumentation == 0.24b0
     opentelemetry-semantic-conventions == 0.24b0
-    wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-mysql/setup.cfg

@@ -41,7 +41,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-instrumentation-dbapi == 0.24b0
     opentelemetry-instrumentation == 0.24b0
-    wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg

@@ -41,7 +41,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-instrumentation-dbapi == 0.24b0
     opentelemetry-instrumentation == 0.24b0
-    wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg

@@ -41,7 +41,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-instrumentation-dbapi == 0.24b0
     opentelemetry-instrumentation == 0.24b0
-    wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24b0"
+__version__ = "1.0.0"

util/opentelemetry-util-http/setup.cfg

@@ -37,14 +37,6 @@ python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:
-install_requires =
-    opentelemetry-api ~= 1.3
-    opentelemetry-instrumentation == 0.24b0
-    asgiref ~= 3.0
-
-[options.extras_require]
-test =
-    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src