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.

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

feat(instrumentation/asgi): add target to metrics #1323

Merged
merged 12 commits into from
Oct 22, 2022
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `opentelemetry-instrumentation-grpc` add supports to filter requests to instrument. ([#1241](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1241))
- Flask sqlalchemy psycopg2 integration
([#1224](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1224))
- `opentelemetry-instrumentation-asgi` metrics record target attribute (FastAPI only)
srikanthccv marked this conversation as resolved.
Show resolved Hide resolved
([#1323](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1323))
- Add metric instrumentation in fastapi
([#1199](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1199))
- Add metric instrumentation in Pyramid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,34 @@ def get_default_span_details(scope: dict) -> Tuple[str, dict]:
return span_name, {}


def _collect_target_attribute(
scope: typing.Dict[str, typing.Any]
) -> typing.Optional[str]:
"""
Returns the target path as defined by the Semantic Conventions.

This value is suitable to use in metrics as it should replace concrete
values with a parameterized name. Example: /api/users/{user_id}

Refer to the specification
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#parameterized-attributes

Note: this function requires specific code for each framework, as there's no
standard attribute to use.
"""
# FastAPI
root_path = scope.get("root_path", "")

route = scope.get("route")
if not route:
return None
sk- marked this conversation as resolved.
Show resolved Hide resolved
path_format = getattr(route, "path_format", None)
if path_format:
return f"{root_path}{path_format}"

return None


class OpenTelemetryMiddleware:
"""The ASGI application middleware.

Expand Down Expand Up @@ -453,6 +481,12 @@ async def __call__(self, scope, receive, send):
attributes
)
duration_attrs = _parse_duration_attrs(attributes)

target = _collect_target_attribute(scope)
if target:
active_requests_count_attrs[SpanAttributes.HTTP_TARGET] = target
duration_attrs[SpanAttributes.HTTP_TARGET] = target

if scope["type"] == "http":
self.active_requests_counter.add(1, active_requests_count_attrs)
try:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,37 @@ def test_basic_metric_success(self):
)
self.assertEqual(point.value, 0)

def test_metric_target_attribute(self):
expected_target = "/api/user/{id}"

class TestRoute:
path_format = expected_target

self.scope["route"] = TestRoute()
app = otel_asgi.OpenTelemetryMiddleware(simple_asgi)
self.seed_app(app)
self.send_default_request()

metrics_list = self.memory_metrics_reader.get_metrics_data()
assertions = 0
for resource_metric in metrics_list.resource_metrics:
for scope_metrics in resource_metric.scope_metrics:
for metric in scope_metrics.metrics:
for point in metric.data.data_points:
if isinstance(point, HistogramDataPoint):
self.assertEqual(
point.attributes["http.target"],
expected_target,
)
assertions += 1
elif isinstance(point, NumberDataPoint):
self.assertEqual(
point.attributes["http.target"],
expected_target,
)
assertions += 1
self.assertEqual(assertions, 2)

def test_no_metric_for_websockets(self):
self.scope = {
"type": "websocket",
Expand Down Expand Up @@ -705,6 +736,36 @@ def test_credential_removal(self):
attrs[SpanAttributes.HTTP_URL], "http://httpbin.org/status/200"
)

def test_collect_target_attribute_missing(self):
self.assertIsNone(otel_asgi._collect_target_attribute(self.scope))

def test_collect_target_attribute_fastapi(self):
class TestRoute:
path_format = "/api/users/{user_id}"

self.scope["route"] = TestRoute()
self.assertEqual(
otel_asgi._collect_target_attribute(self.scope),
"/api/users/{user_id}",
)

def test_collect_target_attribute_fastapi_mounted(self):
class TestRoute:
path_format = "/users/{user_id}"

self.scope["route"] = TestRoute()
self.scope["root_path"] = "/api/v2"
self.assertEqual(
otel_asgi._collect_target_attribute(self.scope),
"/api/v2/users/{user_id}",
)

def test_collect_target_attribute_fastapi_starlette_invalid(self):
self.scope["route"] = object()
self.assertIsNone(
otel_asgi._collect_target_attribute(self.scope), None
sk- marked this conversation as resolved.
Show resolved Hide resolved
)


class TestWrappedApplication(AsgiTestBase):
def test_mark_span_internal_in_presence_of_span_from_other_framework(self):
Expand Down