Skip to content
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

Request ASGI attributes passed to Sampler #1762

Merged
merged 7 commits into from
Apr 28, 2023
Merged

Request ASGI attributes passed to Sampler #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d17ca4c
Request ASGI attributes passed to Sampler
tammy-baylis-swi Apr 17, 2023
31298d1
Update changelog
tammy-baylis-swi Apr 18, 2023
f625e0d
Merge branch 'main' into asgi-attributes-available-in-sampler
srikanthccv Apr 19, 2023
249d1a0
Merge branch 'main' into asgi-attributes-available-in-sampler
srikanthccv Apr 23, 2023
7d91b86
aiohttp-client test http.url
tammy-baylis-swi Apr 24, 2023
fae0e38
Merge branch 'main' into asgi-attributes-available-in-sampler
shalevr Apr 25, 2023
ff5b849
Merge branch 'main' into asgi-attributes-available-in-sampler
srikanthccv Apr 28, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#1733](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1733))
- Make Django request span attributes available for `start_span`.
([#1730](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1730))
- Make ASGI request span attributes available for `start_span`.
([#1762](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1762))

### Fixed

Expand Down
5 changes: 3 additions & 2 deletions ...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,15 +531,16 @@ async def __call__(self, scope, receive, send):

span_name, additional_attributes = self.default_span_details(scope)

attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
span, token = _start_internal_or_server_span(
tracer=self.tracer,
span_name=span_name,
start_time=None,
context_carrier=scope,
context_getter=asgi_getter,
attributes=attributes,
)
attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
active_requests_count_attrs = _parse_active_request_count_attrs(
attributes
)
Expand Down