Merge branch 'main' into genai-utils/agent-invocation

Author: etserend

CHANGELOG.md

@@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4341](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4341))
 - `opentelemetry-instrumentation-flask`: Stop reading the deprecated (from 3.1) `flask.__version__` attribute; resolve the Flask version via `importlib.metadata`
   ([#4422](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4422))
+- `opentelemetry-instrumentation-celery`: Coerce non-string values to strings in `CeleryGetter.get()` to prevent `TypeError` in `TraceState.from_header()` when Celery request attributes contain ints
+  ([#4360](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4360))
+- `opentelemetry-instrumentation-aiohttp-server`: Use `canonical` attribute of the `Resource` as a span name
+  ([#3896](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3896))
 
 ### Breaking changes
 
@@ -53,8 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- `opentelemetry-instrumentation-celery`: Coerce non-string values to strings in `CeleryGetter.get()` to prevent `TypeError` in `TraceState.from_header()` when Celery request attributes contain ints
-  ([#4360](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4360))
 - `opentelemetry-docker-tests`: Replace deprecated `SpanAttributes` from `opentelemetry.semconv.trace` with `opentelemetry.semconv._incubating.attributes`
  ([#4339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4339))
 - `opentelemetry-instrumentation-confluent-kafka`: Skip `recv` span creation when `poll()` returns no message or `consume()` returns an empty list, avoiding empty spans on idle polls

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py

@@ -252,14 +252,21 @@ def _parse_duration_attrs(
 
 
 def get_default_span_name(request: web.Request) -> str:
-    """Default implementation for get_default_span_details
+    """Returns the span name.
     Args:
         request: the request object itself.
     Returns:
-        The span name.
+        The span name as "{method} {canonical_name}" of a resource if possible or just "{method}".
     """
-    span_name = request.path.strip() or f"HTTP {request.method}"
-    return span_name
+    try:
+        resource = request.match_info.route.resource
+        path = resource.canonical
+    except AttributeError:
+        path = ""
+
+    if path:
+        return f"{request.method} {path}"
+    return f"{request.method}"
 
 
 def _get_view_func(request: web.Request) -> str:

instrumentation/opentelemetry-instrumentation-aiohttp-server/tests/test_aiohttp_server_integration.py

@@ -143,7 +143,15 @@ async def fixture_server_fixture(tracer, aiohttp_server, suppress):
     AioHttpServerInstrumentor().instrument(tracer_provider=tracer_provider)
 
     app = aiohttp.web.Application()
-    app.add_routes([aiohttp.web.get("/test-path", default_handler)])
+    app.add_routes(
+        [
+            aiohttp.web.get("/test-path", default_handler),
+            aiohttp.web.get("/test-path/{url_param}", default_handler),
+            aiohttp.web.get(
+                "/object/{object_id}/action/{another_param}", default_handler
+            ),
+        ]
+    )
     if suppress:
         with suppress_http_instrumentation():
             server = await aiohttp_server(app)
@@ -198,6 +206,60 @@ async def test_status_code_instrumentation(
     assert url == span.attributes[HTTP_TARGET]
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "span_name, example_paths",
+    [
+        (
+            "GET /test-path/{url_param}",
+            (
+                "/test-path/foo",
+                "/test-path/bar",
+            ),
+        ),
+        (
+            "GET /object/{object_id}/action/{another_param}",
+            (
+                "/object/1/action/bar",
+                "/object/234/action/baz",
+            ),
+        ),
+        (
+            "GET",
+            (
+                "/i/dont/exist",
+                "/me-neither",
+            ),
+        ),
+    ],
+)
+async def test_url_params_instrumentation(
+    tracer,
+    server_fixture,
+    aiohttp_client,
+    span_name,
+    example_paths,
+):
+    _, memory_exporter = tracer
+    server, _ = server_fixture
+
+    assert len(memory_exporter.get_finished_spans()) == 0
+
+    client = await aiohttp_client(server)
+    for path in example_paths:
+        await client.get(path)
+
+    assert len(memory_exporter.get_finished_spans()) == 2
+
+    for request_path, span in zip(
+        example_paths, memory_exporter.get_finished_spans()
+    ):
+        assert span_name == span.name
+        assert request_path == span.attributes[HTTP_TARGET]
+        full_url = f"http://{server.host}:{server.port}{request_path}"
+        assert full_url == span.attributes[HTTP_URL]
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("suppress", [True])
 async def test_suppress_instrumentation(