Skip to content

fix propagation of http headers #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toumorokoshi merged 2 commits into from
May 27, 2020
Merged

fix propagation of http headers #709

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a00d200
fix propagation of traceparent in aiohttp_client
ecourreges-orange May 22, 2020
650b758
Merge branch 'master' into master
toumorokoshi May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions ext/opentelemetry-ext-aiohttp-client/tests/test_aiohttp_client_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
⚡