Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#3664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3664))
- `opentelemetry-instrumentation-fastapi`: Fix memory leak in `uninstrument_app()` by properly removing apps from the tracking set
([#3688](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3688)
- `opentelemetry-instrumentation-tornado` Fix server (request) duration metric calculation
- `opentelemetry-instrumentation-tornado`: Fix server (request) duration metric calculation
([#3679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3679))
- `opentelemetry-instrumentation-tornado`: Fix to properly skip all server telemetry when URL excluded.
([#3680](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3680))
- `opentelemetry-instrumentation`: Avoid calls to `context.detach` with `None` token.
([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
- `opentelemetry-instrumentation-starlette`/`opentelemetry-instrumentation-fastapi`: Fixes a crash when host-based routing is used
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,14 @@ def _wrap(cls, method_name, wrapper):
def _prepare(
tracer, server_histograms, request_hook, func, handler, args, kwargs
):
otel_handler_state = {_START_TIME: default_timer()}
request = handler.request
otel_handler_state = {
_START_TIME: default_timer(),
"exclude_request": _excluded_urls.url_disabled(request.uri),
}
setattr(handler, _HANDLER_STATE_KEY, otel_handler_state)

request = handler.request
if _excluded_urls.url_disabled(request.uri):
if otel_handler_state["exclude_request"]:
return func(*args, **kwargs)

_record_prepare_metrics(server_histograms, handler)
Expand Down Expand Up @@ -625,6 +628,8 @@ def _record_prepare_metrics(server_histograms, handler):

def _record_on_finish_metrics(server_histograms, handler, error=None):
otel_handler_state = getattr(handler, _HANDLER_STATE_KEY, None) or {}
if otel_handler_state.get("exclude_request"):
return
start_time = otel_handler_state.get(_START_TIME, None) or default_timer()
elapsed_time = round((default_timer() - start_time) * 1000)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,16 @@ def test_metric_uninstrument(self):
for point in list(metric.data.data_points):
if isinstance(point, HistogramDataPoint):
self.assertEqual(point.count, 1)

def test_exclude_lists(self):
def test_excluded(path):
self.fetch(path)

# Verify no server metrics written (only client ones should exist)
metrics = self.get_sorted_metrics()
for metric in metrics:
self.assertTrue("http.server" not in metric.name, metric)
self.assertEqual(len(metrics), 3, metrics)

test_excluded("/healthz")
test_excluded("/ping")