aiohttp_client: fix propagation of traceparent in aiohttp_client (open-telemetry#709)

ecourreges-orange · toumorokoshi · web-flow · commit bc3ee8081e33 · 2020-05-26T22:38:42.000-07:00
Fix propagation of aiohttp client traces, which were not properly injected previously.

Co-authored-by: Yusuke Tsutsumi &lt;yusuke@tsutsumi.io&gt;
diff --git a/ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/__init__.py b/ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/__init__.py
@@ -175,9 +175,7 @@ async def on_request_start(
             trace.propagation.set_span_in_context(trace_config_ctx.span)
         )
 
-        propagators.inject(
-            tracer, type(params.headers).__setitem__, params.headers
-        )
+        propagators.inject(type(params.headers).__setitem__, params.headers)
 
     async def on_request_end(
         unused_session: aiohttp.ClientSession,
diff --git a/ext/opentelemetry-ext-aiohttp-client/tests/test_aiohttp_client_integration.py b/ext/opentelemetry-ext-aiohttp-client/tests/test_aiohttp_client_integration.py
@@ -71,7 +71,8 @@ def _http_request(
         """Helper to start an aiohttp test server and send an actual HTTP request to it."""
 
         async def do_request():
-            async def default_handler(unused_request):
+            async def default_handler(request):
+                assert "traceparent" in request.headers
                 return aiohttp.web.Response(status=int(status_code))
 
             handler = request_handler or default_handler
@@ -281,8 +282,9 @@ async def do_request(url):
             self.memory_exporter.clear()
 
     def test_timeout(self):
-        async def request_handler(unused_request):
+        async def request_handler(request):
             await asyncio.sleep(1)
+            assert "traceparent" in request.headers
             return aiohttp.web.Response()
 
         host, port = self._http_request(
@@ -312,6 +314,7 @@ def test_too_many_redirects(self):
         async def request_handler(request):
             # Create a redirect loop.
             location = request.url
+            assert "traceparent" in request.headers
             raise aiohttp.web.HTTPFound(location=location)
 
         host, port = self._http_request(

Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,7 @@ async def on_request_start(`
`175`	`175`	`trace.propagation.set_span_in_context(trace_config_ctx.span)`
`176`	`176`	`)`
`177`	`177`
`178`		`- propagators.inject(`
`179`		`- tracer, type(params.headers).__setitem__, params.headers`
`180`		`- )`
	`178`	`+ propagators.inject(type(params.headers).__setitem__, params.headers)`
`181`	`179`
`182`	`180`	`async def on_request_end(`
`183`	`181`	`unused_session: aiohttp.ClientSession,`