Update changelogs + fix lint

instrumentation/opentelemetry-instrumentation-botocore/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+- Add propagator injection for botocore calls
+  ([#181](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/181))
 
 ## Version 0.13b0
 

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

@@ -56,15 +56,23 @@
 from botocore.client import BaseClient
 from wrapt import ObjectProxy, wrap_function_wrapper
 
+from opentelemetry import propagators
 from opentelemetry.instrumentation.botocore.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.sdk.trace import Resource
-from opentelemetry import propagators
 from opentelemetry.trace import SpanKind, get_tracer
 
 logger = logging.getLogger(__name__)
 
 
+# pylint: disable=unused-argument
+def _patched_endpoint_prepare_request(wrapped, instance, args, kwargs):
+    request = args[0]
+    headers = request.headers
+    propagators.inject(type(headers).__setitem__, headers)
+    return wrapped(*args, **kwargs)
+
+
 class BotocoreInstrumentor(BaseInstrumentor):
     """A instrumentor for Botocore
 
@@ -89,7 +97,7 @@ def _instrument(self, **kwargs):
         wrap_function_wrapper(
             "botocore.endpoint",
             "Endpoint.prepare_request",
-            self._patched_prepare_request,
+            _patched_endpoint_prepare_request,
         )
 
     def _uninstrument(self, **kwargs):
@@ -151,12 +159,6 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
 
             return result
 
-    def _patched_prepare_request(self, wrapped, instance, args, kwargs):
-        request = args[0]
-        headers = request.headers
-        propagators.inject(type(headers).__setitem__, headers)
-        return wrapped(*args, **kwargs)
-
 
 def unwrap(obj, attr):
     function = getattr(obj, attr, None)

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

@@ -25,8 +25,8 @@
     mock_sqs,
 )
 
-from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry import propagators
+from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase