opentelemetry-instrumentation-aiohttp-client 0.43b0__tar.gz → 0.45b0__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-aiohttp-client
-Version: 0.43b0
+Version: 0.45b0
 Summary: OpenTelemetry aiohttp client instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-client
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -11,22 +11,18 @@ 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
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Provides-Extra: instruments
 Requires-Dist: aiohttp~=3.0; extra == 'instruments'
-Provides-Extra: test
-Requires-Dist: http-server-mock; extra == 'test'
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client[instruments]; extra == 'test'
 Description-Content-Type: text/x-rst
 
 OpenTelemetry aiohttp client Integration

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

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "OpenTelemetry aiohttp client 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,9 +25,9 @@ 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",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -36,10 +35,6 @@ dependencies = [
 instruments = [
   "aiohttp ~= 3.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiohttp-client[instruments]",
-  "http-server-mock"
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiohttp-client = "opentelemetry.instrumentation.aiohttp_client:AioHttpClientInstrumentor"

{opentelemetry_instrumentation_aiohttp_client-0.43b0 → opentelemetry_instrumentation_aiohttp_client-0.45b0}/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -94,8 +94,8 @@ from opentelemetry.instrumentation.aiohttp_client.package import _instruments
 from opentelemetry.instrumentation.aiohttp_client.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
     http_status_to_status_code,
+    is_instrumentation_enabled,
     unwrap,
 )
 from opentelemetry.propagate import inject
@@ -179,7 +179,7 @@ def create_trace_config(
         trace_config_ctx: types.SimpleNamespace,
         params: aiohttp.TraceRequestStartParams,
     ):
-        if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
+        if not is_instrumentation_enabled():
             trace_config_ctx.span = None
             return
 
@@ -282,7 +282,7 @@ def _instrument(
 
     # pylint:disable=unused-argument
     def instrumented_init(wrapped, instance, args, kwargs):
-        if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
+        if not is_instrumentation_enabled():
             return wrapped(*args, **kwargs)
 
         client_trace_configs = list(kwargs.get("trace_configs") or [])

{opentelemetry_instrumentation_aiohttp_client-0.43b0 → opentelemetry_instrumentation_aiohttp_client-0.45b0}/src/opentelemetry/instrumentation/aiohttp_client/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_aiohttp_client-0.43b0 → opentelemetry_instrumentation_aiohttp_client-0.45b0}/tests/test_aiohttp_client_integration.py

@@ -27,13 +27,12 @@ import yarl
 from http_server_mock import HttpServerMock
 from pkg_resources import iter_entry_points
 
-from opentelemetry import context
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation import aiohttp_client
 from opentelemetry.instrumentation.aiohttp_client import (
     AioHttpClientInstrumentor,
 )
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import suppress_instrumentation
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import Span, StatusCode
@@ -512,25 +511,17 @@ class TestAioHttpClientInstrumentor(TestBase):
         self.assert_spans(1)
 
     def test_suppress_instrumentation(self):
-        token = context.attach(
-            context.set_value(_SUPPRESS_INSTRUMENTATION_KEY, True)
-        )
-        try:
+        with suppress_instrumentation():
             run_with_test_server(
                 self.get_default_request(), self.URL, self.default_handler
             )
-        finally:
-            context.detach(token)
         self.assert_spans(0)
 
     @staticmethod
     async def suppressed_request(server: aiohttp.test_utils.TestServer):
         async with aiohttp.test_utils.TestClient(server) as client:
-            token = context.attach(
-                context.set_value(_SUPPRESS_INSTRUMENTATION_KEY, True)
-            )
-            await client.get(TestAioHttpClientInstrumentor.URL)
-            context.detach(token)
+            with suppress_instrumentation():
+                await client.get(TestAioHttpClientInstrumentor.URL)
 
     def test_suppress_instrumentation_after_creation(self):
         run_with_test_server(