django: Fix carrier usage on ASGI requests #767
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamantike
force-pushed
the
django-fix-carrier-extract
branch
from
742101b
to
157c260
Compare
|
would be nice to add a small test case so we detect breakage with ASGI context extraction. |
owais
approved these changes
Oct 22, 2021
|
Happy to provide a test, but didn't find an easy way to do it, without adding a propagator as dependency, or mocking attach/extract and validating what is received there. If you have a better test scenario in mind, I can definitely implement it and add it to this PR. |
|
@owais, I was able to add a test by taking advantage of how the default propagator works, so we check the provided |
|
propagator as test dep sounds fine. I think all instrumentations that propagate context should do this if they don't already. |
oxeye-nikolay
approved these changes
Oct 24, 2021
For ASGI requests, we must use `request.scope` instead of `request.META`. This is because `ASGIGetter` retrieves the `headers` key from the carrier [0], which is only present in `request.scope`. [0] https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py#L133
adamantike
force-pushed
the
django-fix-carrier-extract
branch
from
14cca2e
to
22c8b1f
Compare
owais
approved these changes
Oct 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
For ASGI requests, we must use
request.scopeinstead ofrequest.META. This is becauseASGIGetterretrieves theheaderskey from the carrier [0], which is only present inrequest.scope.[0] https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py#L133
Type of change
How Has This Been Tested?
awspropagator and requests including header:X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793; Parent=53995c3f42cd8ad8; Sampled=1Does This PR Require a Core Repo Change?
Checklist: