opentelemetry-instrumentation-requests 0.43b0__tar.gz → 0.45b0__tar.gz

{opentelemetry_instrumentation_requests-0.43b0 → opentelemetry_instrumentation_requests-0.45b0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-requests
-Version: 0.43b0
+Version: 0.45b0
 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>
@@ -11,22 +11,17 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.43b0
-Requires-Dist: opentelemetry-semantic-conventions==0.43b0
-Requires-Dist: opentelemetry-util-http==0.43b0
+Requires-Dist: opentelemetry-instrumentation==0.45b0
+Requires-Dist: opentelemetry-semantic-conventions==0.45b0
+Requires-Dist: opentelemetry-util-http==0.45b0
 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.43b0; extra == 'test'
 Description-Content-Type: text/x-rst
 
 OpenTelemetry Requests Instrumentation

{opentelemetry_instrumentation_requests-0.43b0 → opentelemetry_instrumentation_requests-0.45b0}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "OpenTelemetry requests instrumentation"
 readme = "README.rst"
 license = "Apache-2.0"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
   { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
 ]
@@ -18,7 +18,6 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -26,20 +25,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.43b0",
-  "opentelemetry-semantic-conventions == 0.43b0",
-  "opentelemetry-util-http == 0.43b0",
+  "opentelemetry-instrumentation == 0.45b0",
+  "opentelemetry-semantic-conventions == 0.45b0",
+  "opentelemetry-util-http == 0.45b0",
 ]
 
 [project.optional-dependencies]
 instruments = [
   "requests ~= 2.0",
 ]
-test = [
-  "opentelemetry-instrumentation-requests[instruments]",
-  "httpretty ~= 1.0",
-  "opentelemetry-test-utils == 0.43b0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 requests = "opentelemetry.instrumentation.requests:RequestsInstrumentor"

{opentelemetry_instrumentation_requests-0.43b0 → opentelemetry_instrumentation_requests-0.45b0}/src/opentelemetry/instrumentation/requests/__init__.py

@@ -58,10 +58,6 @@ from requests.models import PreparedRequest, Response
 from requests.sessions import Session
 from requests.structures import CaseInsensitiveDict
 
-from opentelemetry import context
-
-# FIXME: fix the importing of this private attribute when the location of the _SUPPRESS_HTTP_INSTRUMENTATION_KEY is defined.
-from opentelemetry.context import _SUPPRESS_HTTP_INSTRUMENTATION_KEY
 from opentelemetry.instrumentation._semconv import (
     _METRIC_ATTRIBUTES_CLIENT_DURATION_NAME,
     _SPAN_ATTRIBUTES_ERROR_TYPE,
@@ -87,8 +83,9 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.requests.package import _instruments
 from opentelemetry.instrumentation.requests.version import __version__
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
     http_status_to_status_code,
+    is_http_instrumentation_enabled,
+    suppress_http_instrumentation,
 )
 from opentelemetry.metrics import Histogram, get_meter
 from opentelemetry.propagate import inject
@@ -108,7 +105,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
@@ -149,9 +146,7 @@ def _instrument(
             )
             return request.headers
 
-        if context.get_value(
-            _SUPPRESS_INSTRUMENTATION_KEY
-        ) or context.get_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY):
+        if not is_http_instrumentation_enabled():
             return wrapped_send(self, request, **kwargs)
 
         # See
@@ -220,20 +215,19 @@ def _instrument(
             headers = get_or_create_headers()
             inject(headers)
 
-            token = context.attach(
-                context.set_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY, True)
-            )
-
-            start_time = default_timer()
-
-            try:
-                result = wrapped_send(self, request, **kwargs)  # *** PROCEED
-            except Exception as exc:  # pylint: disable=W0703
-                exception = exc
-                result = getattr(exc, "response", None)
-            finally:
-                elapsed_time = max(default_timer() - start_time, 0)
-                context.detach(token)
+            with suppress_http_instrumentation():
+                start_time = default_timer()
+                try:
+                    result = wrapped_send(
+                        self, request, **kwargs
+                    )  # *** PROCEED
+                except Exception as exc:  # pylint: disable=W0703
+                    exception = exc
+                    result = getattr(exc, "response", None)
+                finally:
+                    elapsed_time = max(
+                        round((default_timer() - start_time) * 1000), 0
+                    )
 
             if isinstance(result, Response):
                 span_attributes = {}

{opentelemetry_instrumentation_requests-0.43b0 → opentelemetry_instrumentation_requests-0.45b0}/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.43b0"
+__version__ = "0.45b0"

{opentelemetry_instrumentation_requests-0.43b0 → opentelemetry_instrumentation_requests-0.45b0}/tests/test_requests_integration.py

@@ -21,10 +21,7 @@ from requests.adapters import BaseAdapter
 from requests.models import Response
 
 import opentelemetry.instrumentation.requests
-from opentelemetry import context, trace
-
-# FIXME: fix the importing of this private attribute when the location of the _SUPPRESS_HTTP_INSTRUMENTATION_KEY is defined.
-from opentelemetry.context import _SUPPRESS_HTTP_INSTRUMENTATION_KEY
+from opentelemetry import trace
 from opentelemetry.instrumentation._semconv import (
     _OTEL_SEMCONV_STABILITY_OPT_IN_KEY,
     _SPAN_ATTRIBUTES_ERROR_TYPE,
@@ -33,7 +30,10 @@ from opentelemetry.instrumentation._semconv import (
     _OpenTelemetrySemanticConventionStability,
 )
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import (
+    suppress_http_instrumentation,
+    suppress_instrumentation,
+)
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.sdk import resources
 from opentelemetry.semconv.trace import SpanAttributes
@@ -397,26 +397,16 @@ class RequestsIntegrationTestBase(abc.ABC):
         self.assert_span()
 
     def test_suppress_instrumentation(self):
-        token = context.attach(
-            context.set_value(_SUPPRESS_INSTRUMENTATION_KEY, True)
-        )
-        try:
+        with suppress_instrumentation():
             result = self.perform_request(self.URL)
             self.assertEqual(result.text, "Hello!")
-        finally:
-            context.detach(token)
 
         self.assert_span(num_spans=0)
 
     def test_suppress_http_instrumentation(self):
-        token = context.attach(
-            context.set_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY, True)
-        )
-        try:
+        with suppress_http_instrumentation():
             result = self.perform_request(self.URL)
             self.assertEqual(result.text, "Hello!")
-        finally:
-            context.detach(token)
 
         self.assert_span(num_spans=0)