opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-29 21:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add http.target to Django duration metric attributes (#2624)

Browse Source
This commit is contained in:
Alex Hall
2024-07-16 20:06:59 +02:00
committed by GitHub
parent 7e48ee7254
commit f8f58ee411
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2652](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2652)) ([#2652](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2652))
- `opentelemetry-instrumentation-aiohttp-client` Implement new semantic convention opt-in migration - `opentelemetry-instrumentation-aiohttp-client` Implement new semantic convention opt-in migration
([#2673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2673)) ([#2673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2673))
- `opentelemetry-instrumentation-django` Add `http.target` to Django duration metric attributes
([#2624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2624))
### Breaking changes ### Breaking changes

6
instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/otel_middleware.py
View File

@ -315,6 +315,12 @@ class _DjangoMiddleware(MiddlewareMixin):
route = getattr(match, "route", None) route = getattr(match, "route", None)
if route: if route:
span.set_attribute(SpanAttributes.HTTP_ROUTE, route) span.set_attribute(SpanAttributes.HTTP_ROUTE, route)
duration_attrs = request.META[
self._environ_duration_attr_key
]
# Metrics currently use the 1.11.0 schema, which puts the route in `http.target`.
# TODO: use `http.route` when the user sets `OTEL_SEMCONV_STABILITY_OPT_IN`.
duration_attrs[SpanAttributes.HTTP_TARGET] = route
def process_exception(self, request, exception): def process_exception(self, request, exception):
if self._excluded_urls.url_disabled(request.build_absolute_uri("?")): if self._excluded_urls.url_disabled(request.build_absolute_uri("?")):

3
instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py
View File

@ -480,7 +480,8 @@ class TestMiddleware(WsgiTestBase):
] ]
_recommended_attrs = { _recommended_attrs = {
"http.server.active_requests": _active_requests_count_attrs, "http.server.active_requests": _active_requests_count_attrs,
"http.server.duration": _duration_attrs, "http.server.duration": _duration_attrs
| {SpanAttributes.HTTP_TARGET},
} }
start = default_timer() start = default_timer()
for _ in range(3): for _ in range(3):