Fixes

Author: tammy-baylis-swi

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

@@ -374,10 +374,6 @@ def _wrapped_app(wrapped_app_environ, start_response):
         attributes = otel_wsgi.collect_request_attributes(
             wrapped_app_environ, sem_conv_opt_in_mode
         )
-        # Enhance attributes with custom labeler attributes
-        attributes = enhance_metric_attributes(
-            attributes, wrapped_app_environ, "request"
-        )
         active_requests_count_attrs = (
             otel_wsgi._parse_active_request_count_attrs(
                 attributes,
@@ -445,6 +441,11 @@ def _start_response(status, response_headers, *args, **kwargs):
                     request_route
                 )
 
+            # Enhance attributes with any custom labeler attributes
+            duration_attrs_old = enhance_metric_attributes(
+                duration_attrs_old
+            )
+
             duration_histogram_old.record(
                 max(round(duration_s * 1000), 0), duration_attrs_old
             )
@@ -456,6 +457,11 @@ def _start_response(status, response_headers, *args, **kwargs):
             if request_route:
                 duration_attrs_new[HTTP_ROUTE] = str(request_route)
 
+            # Enhance attributes with any custom labeler attributes
+            duration_attrs_new = enhance_metric_attributes(
+                duration_attrs_new
+            )
+
             duration_histogram_new.record(
                 max(duration_s, 0), duration_attrs_new
             )
@@ -485,7 +491,7 @@ def _before_request():
         )
         # Enhance attributes with custom labeler attributes
         attributes = enhance_metric_attributes(
-            attributes, flask_request_environ, "request"
+            attributes
         )
         if flask.request.url_rule:
             # For 404 that result from no route found, etc, we

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_labeler/example.py

@@ -50,7 +50,3 @@ def user_profile(user_id):
     })
 
     return f"Got user profile for {user_id}"
-
-
-if __name__ == "__main__":
-    app.run(debug=True, port=5000, host='0.0.0.0')