HTTP transition for wsgi

CHANGELOG.md

@@ -6,9 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
-- `opentelemetry-sdk-extension-aws` Register AWS resource detectors under the
-  `opentelemetry_resource_detector` entry point
-  ([#2382](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2382))
 
 ### Breaking changes
 
@@ -17,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-sdk-extension-aws` Register AWS resource detectors under the
+  `opentelemetry_resource_detector` entry point
+  ([#2382](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2382))
+- `opentelemetry-instrumentation-wsgi` Implement new semantic convention opt-in with stable http semantic conventions
+  ([#2425](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2425))
 - `opentelemetry-instrumentation-threading` Initial release for threading
   ([#2253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2253))
 

instrumentation/opentelemetry-instrumentation-falcon/tests/test_falcon.py

@@ -16,7 +16,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
-from falcon import __version__ as _falcon_verison
+from falcon import __version__ as _falcon_version
 from falcon import testing
 from packaging import version as package_version
 
@@ -27,9 +27,9 @@
     get_global_response_propagator,
     set_global_response_propagator,
 )
-from opentelemetry.instrumentation.wsgi import (
-    _active_requests_count_attrs,
-    _duration_attrs,
+from opentelemetry.instrumentation._semconv import (
+    _server_active_requests_count_attrs_old,
+    _server_duration_attrs_old
 )
 from opentelemetry.sdk.metrics.export import (
     HistogramDataPoint,
@@ -53,8 +53,8 @@
     "http.server.duration",
 ]
 _recommended_attrs = {
-    "http.server.active_requests": _active_requests_count_attrs,
-    "http.server.duration": _duration_attrs,
+    "http.server.active_requests": _server_active_requests_count_attrs_old,
+    "http.server.duration": _server_duration_attrs_old,
 }
 
 
@@ -125,7 +125,7 @@ def _test_method(self, method):
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_HOST: "falconframework.org",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.NET_PEER_PORT: "65133",
+                SpanAttributes.NET_PEER_PORT: 65133,
                 SpanAttributes.HTTP_FLAVOR: "1.1",
                 "falcon.resource": "HelloWorldResource",
                 SpanAttributes.HTTP_STATUS_CODE: 201,
@@ -156,7 +156,7 @@ def test_404(self):
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_HOST: "falconframework.org",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.NET_PEER_PORT: "65133",
+                SpanAttributes.NET_PEER_PORT: 65133,
                 SpanAttributes.HTTP_FLAVOR: "1.1",
                 SpanAttributes.HTTP_STATUS_CODE: 404,
             },
@@ -193,7 +193,7 @@ def test_500(self):
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_HOST: "falconframework.org",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.NET_PEER_PORT: "65133",
+                SpanAttributes.NET_PEER_PORT: 65133,
                 SpanAttributes.HTTP_FLAVOR: "1.1",
                 SpanAttributes.HTTP_STATUS_CODE: 500,
             },
@@ -226,7 +226,7 @@ def test_url_template(self):
                 SpanAttributes.NET_HOST_PORT: 80,
                 SpanAttributes.HTTP_HOST: "falconframework.org",
                 SpanAttributes.HTTP_TARGET: "/",
-                SpanAttributes.NET_PEER_PORT: "65133",
+                SpanAttributes.NET_PEER_PORT: 65133,
                 SpanAttributes.HTTP_FLAVOR: "1.1",
                 "falcon.resource": "UserResource",
                 SpanAttributes.HTTP_STATUS_CODE: 200,
@@ -336,6 +336,7 @@ def test_falcon_metric_values(self):
             "http.flavor": "1.1",
             "http.server_name": "falconframework.org",
             "net.host.port": 80,
+            "net.host.name": "falconframework.org",
             "http.status_code": 404,
         }
         expected_requests_count_attributes = {
@@ -344,6 +345,8 @@ def test_falcon_metric_values(self):
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "falconframework.org",
+            "net.host.name": "falconframework.org",
+            "net.host.port": 80,
         }
         start = default_timer()
         self.client().simulate_get("/hello/756")
@@ -523,7 +526,7 @@ def test_custom_request_header_not_added_in_internal_span(self):
                 self.assertNotIn(key, span.attributes)
 
     @pytest.mark.skipif(
-        condition=package_version.parse(_falcon_verison)
+        condition=package_version.parse(_falcon_version)
         < package_version.parse("2.0.0"),
         reason="falcon<2 does not implement custom response headers",
     )
@@ -558,7 +561,7 @@ def test_custom_response_header_added_in_server_span(self):
             self.assertNotIn(key, span.attributes)
 
     @pytest.mark.skipif(
-        condition=package_version.parse(_falcon_verison)
+        condition=package_version.parse(_falcon_version)
         < package_version.parse("2.0.0"),
         reason="falcon<2 does not implement custom response headers",
     )

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

@@ -18,17 +18,17 @@
 from flask import Flask, request
 
 from opentelemetry import trace
+from opentelemetry.instrumentation._semconv import (
+    _server_duration_attrs_old,
+    _server_active_requests_count_attrs_old,
+)
 from opentelemetry.instrumentation.flask import FlaskInstrumentor
 from opentelemetry.instrumentation.propagators import (
     TraceResponsePropagator,
     get_global_response_propagator,
     set_global_response_propagator,
 )
-from opentelemetry.instrumentation.wsgi import (
-    OpenTelemetryMiddleware,
-    _active_requests_count_attrs,
-    _duration_attrs,
-)
+from opentelemetry.instrumentation.wsgi import OpenTelemetryMiddleware
 from opentelemetry.sdk.metrics.export import (
     HistogramDataPoint,
     NumberDataPoint,
@@ -54,6 +54,7 @@ def expected_attributes(override_attributes):
         SpanAttributes.HTTP_SERVER_NAME: "localhost",
         SpanAttributes.HTTP_SCHEME: "http",
         SpanAttributes.NET_HOST_PORT: 80,
+        SpanAttributes.NET_HOST_NAME: "localhost",
         SpanAttributes.HTTP_HOST: "localhost",
         SpanAttributes.HTTP_TARGET: "/",
         SpanAttributes.HTTP_FLAVOR: "1.1",
@@ -69,8 +70,8 @@ def expected_attributes(override_attributes):
     "http.server.duration",
 ]
 _recommended_attrs = {
-    "http.server.active_requests": _active_requests_count_attrs,
-    "http.server.duration": _duration_attrs,
+    "http.server.active_requests": _server_active_requests_count_attrs_old,
+    "http.server.duration": _server_duration_attrs_old,
 }
 
 
@@ -358,13 +359,16 @@ def test_basic_metric_success(self):
             "http.server_name": "localhost",
             "net.host.port": 80,
             "http.status_code": 200,
+            "net.host.name": "localhost",
         }
         expected_requests_count_attributes = {
             "http.method": "GET",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "localhost",
+            "net.host.name": "localhost",
+            "net.host.port": 80,
         }
         self._assert_basic_metric(
             expected_duration_attributes,
@@ -374,20 +378,23 @@ def test_basic_metric_success(self):
     def test_basic_metric_nonstandard_http_method_success(self):
         self.client.open("/hello/756", method="NONSTANDARD")
         expected_duration_attributes = {
-            "http.method": "UNKNOWN",
+            "http.method": "_OTHER",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "localhost",
             "net.host.port": 80,
             "http.status_code": 405,
+            "net.host.name": "localhost",
         }
         expected_requests_count_attributes = {
-            "http.method": "UNKNOWN",
+            "http.method": "_OTHER",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "localhost",
+            "net.host.name": "localhost",
+            "net.host.port": 80,
         }
         self._assert_basic_metric(
             expected_duration_attributes,
@@ -410,13 +417,16 @@ def test_basic_metric_nonstandard_http_method_allowed_success(self):
             "http.server_name": "localhost",
             "net.host.port": 80,
             "http.status_code": 405,
+            "net.host.name": "localhost",
         }
         expected_requests_count_attributes = {
             "http.method": "NONSTANDARD",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "localhost",
+            "net.host.name": "localhost",
+            "net.host.port": 80,
         }
         self._assert_basic_metric(
             expected_duration_attributes,

instrumentation/opentelemetry-instrumentation-pyramid/tests/test_automatic.py

@@ -18,6 +18,10 @@
 from pyramid.config import Configurator
 
 from opentelemetry import trace
+from opentelemetry.instrumentation._semconv import (
+    _server_active_requests_count_attrs_old,
+    _server_duration_attrs_old,
+)
 from opentelemetry.instrumentation.pyramid import PyramidInstrumentor
 from opentelemetry.sdk.metrics.export import (
     HistogramDataPoint,
@@ -31,8 +35,6 @@
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE,
-    _active_requests_count_attrs,
-    _duration_attrs,
 )
 
 # pylint: disable=import-error
@@ -43,8 +45,8 @@
     "http.server.duration",
 ]
 _recommended_attrs = {
-    "http.server.active_requests": _active_requests_count_attrs,
-    "http.server.duration": _duration_attrs,
+    "http.server.active_requests": _server_active_requests_count_attrs_old,
+    "http.server.duration": _server_duration_attrs_old,
 }
 
 
@@ -213,13 +215,16 @@ def test_basic_metric_success(self):
             "http.server_name": "localhost",
             "net.host.port": 80,
             "http.status_code": 200,
+            "net.host.name": "localhost",
         }
         expected_requests_count_attributes = {
             "http.method": "GET",
             "http.host": "localhost",
             "http.scheme": "http",
             "http.flavor": "1.1",
             "http.server_name": "localhost",
+            "net.host.name": "localhost",
+            "net.host.port": 80,
         }
         metrics_list = self.memory_metrics_reader.get_metrics_data()
         for metric in (

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

@@ -37,6 +37,7 @@ def expected_attributes(override_attributes):
         SpanAttributes.HTTP_SERVER_NAME: "localhost",
         SpanAttributes.HTTP_SCHEME: "http",
         SpanAttributes.NET_HOST_PORT: 80,
+        SpanAttributes.NET_HOST_NAME: "localhost",
         SpanAttributes.HTTP_HOST: "localhost",
         SpanAttributes.HTTP_TARGET: "/",
         SpanAttributes.HTTP_FLAVOR: "1.1",

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

@@ -63,18 +63,20 @@
     _SPAN_ATTRIBUTES_ERROR_TYPE,
     _SPAN_ATTRIBUTES_NETWORK_PEER_ADDRESS,
     _SPAN_ATTRIBUTES_NETWORK_PEER_PORT,
-    _filter_duration_attrs,
+    _client_duration_attrs_new,
+    _client_duration_attrs_old,
+    _filter_semconv_duration_attrs,
     _get_schema_url,
     _OpenTelemetrySemanticConventionStability,
     _OpenTelemetryStabilityMode,
     _OpenTelemetryStabilitySignalType,
     _report_new,
     _report_old,
-    _set_http_hostname,
+    _set_http_host,
     _set_http_method,
-    _set_http_net_peer_name,
+    _set_http_net_peer_name_client,
     _set_http_network_protocol_version,
-    _set_http_port,
+    _set_http_peer_port_client,
     _set_http_scheme,
     _set_http_status_code,
     _set_http_url,
@@ -174,14 +176,14 @@ def get_or_create_headers():
                     metric_labels, parsed_url.scheme, sem_conv_opt_in_mode
                 )
             if parsed_url.hostname:
-                _set_http_hostname(
+                _set_http_host(
                     metric_labels, parsed_url.hostname, sem_conv_opt_in_mode
                 )
-                _set_http_net_peer_name(
+                _set_http_net_peer_name_client(
                     metric_labels, parsed_url.hostname, sem_conv_opt_in_mode
                 )
                 if _report_new(sem_conv_opt_in_mode):
-                    _set_http_hostname(
+                    _set_http_host(
                         span_attributes,
                         parsed_url.hostname,
                         sem_conv_opt_in_mode,
@@ -191,11 +193,11 @@ def get_or_create_headers():
                         _SPAN_ATTRIBUTES_NETWORK_PEER_ADDRESS
                     ] = parsed_url.hostname
             if parsed_url.port:
-                _set_http_port(
+                _set_http_peer_port_client(
                     metric_labels, parsed_url.port, sem_conv_opt_in_mode
                 )
                 if _report_new(sem_conv_opt_in_mode):
-                    _set_http_port(
+                    _set_http_peer_port_client(
                         span_attributes, parsed_url.port, sem_conv_opt_in_mode
                     )
                     # Use semconv library when available
@@ -284,16 +286,22 @@ def get_or_create_headers():
                 ).__qualname__
 
             if duration_histogram_old is not None:
-                duration_attrs_old = _filter_duration_attrs(
-                    metric_labels, _OpenTelemetryStabilityMode.DEFAULT
+                duration_attrs_old = _filter_semconv_duration_attrs(
+                    metric_labels,
+                    _client_duration_attrs_old,
+                    _client_duration_attrs_new,
+                    _OpenTelemetryStabilityMode.DEFAULT
                 )
                 duration_histogram_old.record(
                     max(round(elapsed_time * 1000), 0),
                     attributes=duration_attrs_old,
                 )
             if duration_histogram_new is not None:
-                duration_attrs_new = _filter_duration_attrs(
-                    metric_labels, _OpenTelemetryStabilityMode.HTTP
+                duration_attrs_new = _filter_semconv_duration_attrs(
+                    metric_labels,
+                    _client_duration_attrs_old,
+                    _client_duration_attrs_new,
+                    _OpenTelemetryStabilityMode.HTTP
                 )
                 duration_histogram_new.record(
                     elapsed_time, attributes=duration_attrs_new
@@ -341,7 +349,10 @@ def get_default_span_name(method):
     Returns:
         span name
     """
-    return sanitize_method(method.upper().strip())
+    method = sanitize_method(method.upper().strip())
+    if method == "_OTHER":
+        return "HTTP"
+    return method
 
 
 class RequestsInstrumentor(BaseInstrumentor):