opentelemetry-instrumentation-requests 0.44b0__tar.gz → 0.46b0__tar.gz

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-requests
-Version: 0.44b0
+Version: 0.46b0
 Summary: OpenTelemetry requests instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-requests
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -17,15 +17,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.44b0
-Requires-Dist: opentelemetry-semantic-conventions==0.44b0
-Requires-Dist: opentelemetry-util-http==0.44b0
+Requires-Dist: opentelemetry-instrumentation==0.46b0
+Requires-Dist: opentelemetry-semantic-conventions==0.46b0
+Requires-Dist: opentelemetry-util-http==0.46b0
 Provides-Extra: instruments
 Requires-Dist: requests~=2.0; extra == 'instruments'
-Provides-Extra: test
-Requires-Dist: httpretty~=1.0; extra == 'test'
-Requires-Dist: opentelemetry-instrumentation-requests[instruments]; extra == 'test'
-Requires-Dist: opentelemetry-test-utils==0.44b0; extra == 'test'
 Description-Content-Type: text/x-rst
 
 OpenTelemetry Requests Instrumentation

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/pyproject.toml

@@ -25,20 +25,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.44b0",
-  "opentelemetry-semantic-conventions == 0.44b0",
-  "opentelemetry-util-http == 0.44b0",
+  "opentelemetry-instrumentation == 0.46b0",
+  "opentelemetry-semantic-conventions == 0.46b0",
+  "opentelemetry-util-http == 0.46b0",
 ]
 
 [project.optional-dependencies]
 instruments = [
   "requests ~= 2.0",
 ]
-test = [
-  "opentelemetry-instrumentation-requests[instruments]",
-  "httpretty ~= 1.0",
-  "opentelemetry-test-utils == 0.44b0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 requests = "opentelemetry.instrumentation.requests:RequestsInstrumentor"

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/src/opentelemetry/instrumentation/requests/__init__.py

@@ -63,18 +63,20 @@ from opentelemetry.instrumentation._semconv import (
     _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,
+    _HTTPStabilityMode,
     _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,
@@ -105,7 +107,7 @@ from opentelemetry.util.http.httplib import set_ip_on_next_http_connection
 _excluded_urls_from_env = get_excluded_urls("REQUESTS")
 
 _RequestHookT = Optional[Callable[[Span, PreparedRequest], None]]
-_ResponseHookT = Optional[Callable[[Span, PreparedRequest], None]]
+_ResponseHookT = Optional[Callable[[Span, PreparedRequest, Response], None]]
 
 
 # pylint: disable=unused-argument
@@ -117,7 +119,7 @@ def _instrument(
     request_hook: _RequestHookT = None,
     response_hook: _ResponseHookT = None,
     excluded_urls: ExcludeList = None,
-    sem_conv_opt_in_mode: _OpenTelemetryStabilityMode = _OpenTelemetryStabilityMode.DEFAULT,
+    sem_conv_opt_in_mode: _HTTPStabilityMode = _HTTPStabilityMode.DEFAULT,
 ):
     """Enables tracing of all requests calls that go through
     :code:`requests.session.Session.request` (this includes
@@ -170,38 +172,40 @@ def _instrument(
         try:
             parsed_url = urlparse(url)
             if parsed_url.scheme:
-                _set_http_scheme(
-                    metric_labels, parsed_url.scheme, sem_conv_opt_in_mode
-                )
+                if _report_old(sem_conv_opt_in_mode):
+                    # TODO: Support opt-in for url.scheme in new semconv
+                    _set_http_scheme(
+                        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,
                     )
                     # Use semconv library when available
-                    span_attributes[
-                        _SPAN_ATTRIBUTES_NETWORK_PEER_ADDRESS
-                    ] = parsed_url.hostname
+                    span_attributes[_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
-                    span_attributes[
-                        _SPAN_ATTRIBUTES_NETWORK_PEER_PORT
-                    ] = parsed_url.port
+                    span_attributes[_SPAN_ATTRIBUTES_NETWORK_PEER_PORT] = (
+                        parsed_url.port
+                    )
         except ValueError:
             pass
 
@@ -225,9 +229,7 @@ def _instrument(
                     exception = exc
                     result = getattr(exc, "response", None)
                 finally:
-                    elapsed_time = max(
-                        round((default_timer() - start_time) * 1000), 0
-                    )
+                    elapsed_time = max(default_timer() - start_time, 0)
 
             if isinstance(result, Response):
                 span_attributes = {}
@@ -284,16 +286,22 @@ def _instrument(
                 ).__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,
+                    _HTTPStabilityMode.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,
+                    _HTTPStabilityMode.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):
@@ -402,9 +413,11 @@ class RequestsInstrumentor(BaseInstrumentor):
             duration_histogram_new,
             request_hook=kwargs.get("request_hook"),
             response_hook=kwargs.get("response_hook"),
-            excluded_urls=_excluded_urls_from_env
-            if excluded_urls is None
-            else parse_excluded_urls(excluded_urls),
+            excluded_urls=(
+                _excluded_urls_from_env
+                if excluded_urls is None
+                else parse_excluded_urls(excluded_urls)
+            ),
             sem_conv_opt_in_mode=semconv_opt_in_mode,
         )
 

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/src/opentelemetry/instrumentation/requests/package.py

@@ -16,3 +16,5 @@
 _instruments = ("requests ~= 2.0",)
 
 _supports_metrics = True
+
+_semconv_status = "migration"

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/src/opentelemetry/instrumentation/requests/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.44b0"
+__version__ = "0.46b0"

{opentelemetry_instrumentation_requests-0.44b0 → opentelemetry_instrumentation_requests-0.46b0}/tests/test_requests_integration.py

@@ -23,10 +23,10 @@ from requests.models import Response
 import opentelemetry.instrumentation.requests
 from opentelemetry import trace
 from opentelemetry.instrumentation._semconv import (
-    _OTEL_SEMCONV_STABILITY_OPT_IN_KEY,
     _SPAN_ATTRIBUTES_ERROR_TYPE,
     _SPAN_ATTRIBUTES_NETWORK_PEER_ADDRESS,
     _SPAN_ATTRIBUTES_NETWORK_PEER_PORT,
+    OTEL_SEMCONV_STABILITY_OPT_IN,
     _OpenTelemetrySemanticConventionStability,
 )
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
@@ -88,7 +88,7 @@ class RequestsIntegrationTestBase(abc.ABC):
             "os.environ",
             {
                 "OTEL_PYTHON_REQUESTS_EXCLUDED_URLS": "http://localhost/env_excluded_arg/123,env_excluded_noarg",
-                _OTEL_SEMCONV_STABILITY_OPT_IN_KEY: sem_conv_mode,
+                OTEL_SEMCONV_STABILITY_OPT_IN: sem_conv_mode,
             },
         )
 
@@ -524,7 +524,6 @@ class RequestsIntegrationTestBase(abc.ABC):
             self.perform_request(url_with_port)
 
         span = self.assert_span()
-        print(span.attributes)
         self.assertEqual(
             span.attributes,
             {
@@ -671,7 +670,7 @@ class TestRequestsIntergrationMetric(TestBase):
         self.env_patch = mock.patch.dict(
             "os.environ",
             {
-                _OTEL_SEMCONV_STABILITY_OPT_IN_KEY: sem_conv_mode,
+                OTEL_SEMCONV_STABILITY_OPT_IN: sem_conv_mode,
             },
         )
         self.env_patch.start()