WSGI enrich active_requests counter with Labeler attrs

Author: tammy-baylis-swi

instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py

@@ -738,6 +738,9 @@ def __call__(
             req_attrs,
             self._sem_conv_opt_in_mode,
         )
+        active_requests_count_attrs = enrich_metric_attributes(
+            active_requests_count_attrs
+        )
 
         span, token = _start_internal_or_server_span(
             tracer=self.tracer,

instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py

@@ -159,6 +159,14 @@ def error_wsgi_unhandled_override_attrs(environ, start_response):
     raise ValueError
 
 
+def error_wsgi_unhandled_override_attrs_new_semconv(environ, start_response):
+    labeler = get_labeler()
+    labeler.add("custom_attr", "test_value")
+    labeler.add("http.request.method", "POST")
+    assert isinstance(environ, dict)
+    raise ValueError
+
+
 def wsgi_with_custom_response_headers(environ, start_response):
     assert isinstance(environ, dict)
     start_response(
@@ -471,6 +479,82 @@ def test_wsgi_metrics(self):
         self.assertTrue(number_data_point_seen and histogram_data_point_seen)
 
     def test_wsgi_metrics_custom_attributes_skip_override_old_semconv(self):
+        labeler = get_labeler()
+        labeler.add("custom_attr", "test_value")
+        labeler.add("http.method", "POST")
+
+        app = otel_wsgi.OpenTelemetryMiddleware(error_wsgi_unhandled)
+        self.assertRaises(ValueError, app, self.environ, self.start_response)
+
+        metrics = self.get_sorted_metrics(SCOPE)
+        active_requests_point_seen = False
+        histogram_point_seen = False
+
+        for metric in metrics:
+            if metric.name == "http.server.active_requests":
+                data_points = list(metric.data.data_points)
+                self.assertEqual(len(data_points), 1)
+                point = data_points[0]
+                self.assertIsInstance(point, NumberDataPoint)
+                self.assertEqual(point.attributes[HTTP_METHOD], "GET")
+                self.assertEqual(point.attributes["custom_attr"], "test_value")
+                active_requests_point_seen = True
+                continue
+
+            if metric.name != "http.server.duration":
+                continue
+
+            data_points = list(metric.data.data_points)
+            self.assertEqual(len(data_points), 1)
+            point = data_points[0]
+            self.assertIsInstance(point, HistogramDataPoint)
+            self.assertEqual(point.attributes[HTTP_METHOD], "GET")
+            self.assertNotIn("custom_attr", point.attributes)
+            histogram_point_seen = True
+
+        self.assertTrue(active_requests_point_seen)
+        self.assertTrue(histogram_point_seen)
+
+    def test_wsgi_metrics_custom_attributes_skip_override_new_semconv(self):
+        labeler = get_labeler()
+        labeler.add("custom_attr", "test_value")
+        labeler.add("http.request.method", "POST")
+
+        app = otel_wsgi.OpenTelemetryMiddleware(error_wsgi_unhandled)
+        self.assertRaises(ValueError, app, self.environ, self.start_response)
+
+        metrics = self.get_sorted_metrics(SCOPE)
+        active_requests_point_seen = False
+        histogram_point_seen = False
+
+        for metric in metrics:
+            if metric.name == "http.server.active_requests":
+                data_points = list(metric.data.data_points)
+                self.assertEqual(len(data_points), 1)
+                point = data_points[0]
+                self.assertIsInstance(point, NumberDataPoint)
+                self.assertEqual(point.attributes[HTTP_REQUEST_METHOD], "GET")
+                self.assertEqual(point.attributes["custom_attr"], "test_value")
+                active_requests_point_seen = True
+                continue
+
+            if metric.name != "http.server.request.duration":
+                continue
+
+            data_points = list(metric.data.data_points)
+            self.assertEqual(len(data_points), 1)
+            point = data_points[0]
+            self.assertIsInstance(point, HistogramDataPoint)
+            self.assertEqual(point.attributes[HTTP_REQUEST_METHOD], "GET")
+            self.assertNotIn("custom_attr", point.attributes)
+            histogram_point_seen = True
+
+        self.assertTrue(active_requests_point_seen)
+        self.assertTrue(histogram_point_seen)
+
+    def test_wsgi_duration_metrics_custom_attributes_skip_override_old_semconv(
+        self,
+    ):
         app = otel_wsgi.OpenTelemetryMiddleware(
             error_wsgi_unhandled_override_attrs
         )
@@ -493,6 +577,31 @@ def test_wsgi_metrics_custom_attributes_skip_override_old_semconv(self):
 
         self.assertTrue(histogram_point_seen)
 
+    def test_wsgi_duration_metrics_custom_attributes_skip_override_new_semconv(
+        self,
+    ):
+        app = otel_wsgi.OpenTelemetryMiddleware(
+            error_wsgi_unhandled_override_attrs_new_semconv
+        )
+        self.assertRaises(ValueError, app, self.environ, self.start_response)
+
+        metrics = self.get_sorted_metrics(SCOPE)
+        histogram_point_seen = False
+
+        for metric in metrics:
+            if metric.name != "http.server.request.duration":
+                continue
+
+            data_points = list(metric.data.data_points)
+            self.assertEqual(len(data_points), 1)
+            point = data_points[0]
+            self.assertIsInstance(point, HistogramDataPoint)
+            self.assertEqual(point.attributes[HTTP_REQUEST_METHOD], "GET")
+            self.assertEqual(point.attributes["custom_attr"], "test_value")
+            histogram_point_seen = True
+
+        self.assertTrue(histogram_point_seen)
+
     def test_wsgi_metrics_exemplars_expected_old_semconv(self):  # type: ignore[func-returns-value]
         """Failing test asserting exemplars should be present for duration histogram (old semconv)."""
         app = otel_wsgi.OpenTelemetryMiddleware(simple_wsgi)