Add http.target in metric attribute

Author: GonzaloGuasch

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `opentelemetry-instrumentation-flask` Add `http.route` to metric attributes
+- `opentelemetry-instrumentation-flask` Add `http.route` and `http.target` to metric attributes
   ([#2621](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2621))
 - `opentelemetry-instrumentation-pyramid` Record exceptions raised when serving a request
   ([#2622](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2622))

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

@@ -266,6 +266,9 @@ def response_hook(span: Span, status: str, response_headers: List):
 )
 from opentelemetry.instrumentation.utils import _start_internal_or_server_span
 from opentelemetry.metrics import get_meter
+from opentelemetry.semconv._incubating.attributes.http_attributes import (
+    HTTP_TARGET,
+)
 from opentelemetry.semconv.attributes.http_attributes import HTTP_ROUTE
 from opentelemetry.semconv.metrics import MetricInstruments
 from opentelemetry.semconv.metrics.http_metrics import (
@@ -399,6 +402,9 @@ def _start_response(status, response_headers, *args, **kwargs):
                 duration_attrs_old[HTTP_ROUTE] = wrapped_app_environ.get(
                     _ENVIRON_REQUEST_ROUTE_KEY
                 )
+                duration_attrs_old[HTTP_TARGET] = wrapped_app_environ.get(
+                    _ENVIRON_REQUEST_ROUTE_KEY
+                )
 
             duration_histogram_old.record(
                 max(round(duration_s * 1000), 0), duration_attrs_old
@@ -412,6 +418,9 @@ def _start_response(status, response_headers, *args, **kwargs):
                 duration_attrs_new[HTTP_ROUTE] = wrapped_app_environ.get(
                     _ENVIRON_REQUEST_ROUTE_KEY
                 )
+                duration_attrs_new[HTTP_TARGET] = wrapped_app_environ.get(
+                    _ENVIRON_REQUEST_ROUTE_KEY
+                )
 
             duration_histogram_new.record(
                 max(duration_s, 0), duration_attrs_new

instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py

@@ -87,6 +87,10 @@ def expected_attributes_new(override_attributes):
 
 _server_duration_attrs_old_copy = _server_duration_attrs_old.copy()
 _server_duration_attrs_old_copy.append("http.route")
+_server_duration_attrs_old_copy.append("http.target")
+
+_server_duration_attrs_new_copy = _server_duration_attrs_new.copy()
+_server_duration_attrs_new_copy.append("http.target")
 
 _expected_metric_names_old = [
     "http.server.active_requests",
@@ -102,7 +106,7 @@ def expected_attributes_new(override_attributes):
 }
 _recommended_metrics_attrs_new = {
     "http.server.active_requests": _server_active_requests_count_attrs_new,
-    "http.server.request.duration": _server_duration_attrs_new,
+    "http.server.request.duration": _server_duration_attrs_new_copy,
 }
 _server_active_requests_count_attrs_both = (
     _server_active_requests_count_attrs_old
@@ -113,7 +117,7 @@ def expected_attributes_new(override_attributes):
 _recommended_metrics_attrs_both = {
     "http.server.active_requests": _server_active_requests_count_attrs_both,
     "http.server.duration": _server_duration_attrs_old_copy,
-    "http.server.request.duration": _server_duration_attrs_new,
+    "http.server.request.duration": _server_duration_attrs_new_copy,
 }
 
 
@@ -574,6 +578,7 @@ def test_basic_metric_success(self):
         expected_duration_attributes = {
             "http.method": "GET",
             "http.route": "/hello/<int:helloid>",
+            "http.target": "/hello/<int:helloid>",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
@@ -600,6 +605,7 @@ def test_basic_metric_success_new_semconv(self):
             "http.request.method": "GET",
             "url.scheme": "http",
             "http.route": "/hello/<int:helloid>",
+            "http.target": "/hello/<int:helloid>",
             "network.protocol.version": "1.1",
             "http.response.status_code": 200,
         }