NH-152875 Re-add URL_QUERY check to sampler attributes collection; remove dead helper

pyproject.toml

@@ -75,8 +75,6 @@ packages = [
   "solarwinds_apm",
   "solarwinds_apm.api",
   "solarwinds_apm.oboe",
-  "solarwinds_apm.semconv",
-  "solarwinds_apm.semconv.trace",
   "solarwinds_apm.trace",
 ]
 

solarwinds_apm/oboe/sampler.py

@@ -26,6 +26,7 @@
 from opentelemetry.semconv.attributes.server_attributes import SERVER_ADDRESS
 from opentelemetry.semconv.attributes.url_attributes import (
     URL_PATH,
+    URL_QUERY,
     URL_SCHEME,
 )
 from opentelemetry.trace import Link, SpanKind, TraceState, get_current_span
@@ -83,8 +84,15 @@ def http_span_metadata(kind: SpanKind, attributes: Attributes):
             SERVER_ADDRESS, attributes.get(NET_HOST_NAME, "localhost")
         )
     )
-    path = str(attributes.get(URL_PATH, attributes.get(HTTP_TARGET, "")))
+    path = attributes.get(URL_PATH)
+    query = attributes.get(URL_QUERY)
+    if path is None and query is None:
+        path = attributes.get(HTTP_TARGET, "")
+    path = str(path or "")
+    query = str(query or "")
     url = f"{scheme}://{hostname}{path}"
+    if query:
+        url += f"?{query}"
     return {
         "http": True,
         "method": method,

tests/unit/test_oboe/test_sampler.py

@@ -29,6 +29,7 @@
 from opentelemetry.semconv.attributes.server_attributes import SERVER_ADDRESS
 from opentelemetry.semconv.attributes.url_attributes import (
     URL_PATH,
+    URL_QUERY,
     URL_SCHEME,
 )
 from opentelemetry.trace import SpanKind
@@ -145,6 +146,35 @@ def test_handles_http_server_spans_properly(self):
             "url": "https://solarwinds.com",
         }
 
+    def test_handles_http_server_span_with_query_only(self):
+        span = {
+            "kind": SpanKind.SERVER,
+            "attributes": {
+                HTTP_REQUEST_METHOD: "GET",
+                URL_SCHEME: "https",
+                SERVER_ADDRESS: "solarwinds.com",
+                URL_QUERY: "page=2",
+            },
+        }
+        output = http_span_metadata(span["kind"], span["attributes"])
+        assert output["path"] == ""
+        assert output["url"] == "https://solarwinds.com?page=2"
+
+    def test_handles_http_server_span_with_path_and_query(self):
+        span = {
+            "kind": SpanKind.SERVER,
+            "attributes": {
+                HTTP_REQUEST_METHOD: "GET",
+                URL_SCHEME: "https",
+                SERVER_ADDRESS: "solarwinds.com",
+                URL_PATH: "/search",
+                URL_QUERY: "page=2",
+            },
+        }
+        output = http_span_metadata(span["kind"], span["attributes"])
+        assert output["path"] == "/search"
+        assert output["url"] == "https://solarwinds.com/search?page=2"
+
     def test_handles_legacy_http_server_spans_properly(self):
         span = {
             "kind": SpanKind.SERVER,