Add support for wrapt 2.x

CHANGELOG.md

@@ -10,11 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 > Use [this search for a list of all CHANGELOG.md files in this repo](https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-python-contrib+path%3A**%2FCHANGELOG.md&type=code).
 
 ## Unreleased
-
+  
 ### Added
 
 - `opentelemetry-instrumentation-confluent-kafka`: Loosen confluent-kafka upper bound to <3.0.0
   ([#4289](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4289))
+- `opentelemetry-instrumentation`: Add support for wrapt 2.x
+  ([#4203](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4203))
 
 ### Fixed
 

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.5",
   "opentelemetry-instrumentation == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
   "opentelemetry-util-http == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "opentelemetry-instrumentation == 0.62b0.dev",
     "opentelemetry-semantic-conventions == 0.62b0.dev",
     "opentelemetry-util-http == 0.62b0.dev",
-    "wrapt >= 1.0.0, < 2.0.0",
+    "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-instrumentation-dbapi == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py

@@ -11,7 +11,7 @@
 from opentelemetry.trace import SpanKind
 
 
-# pylint: disable=abstract-method
+# pylint: disable=abstract-method,no-member
 class AsyncProxyObject(wrapt.ObjectProxy):
     def __aiter__(self):
         return self.__wrapped__.__aiter__()
@@ -54,7 +54,7 @@ async def wrapped_pool(self, create_pool_method, args, kwargs):
 def get_traced_connection_proxy(
     connection, db_api_integration, *args, **kwargs
 ):
-    # pylint: disable=abstract-method
+    # pylint: disable=abstract-method,no-member
     class TracedConnectionProxy(AsyncProxyObject):
         # pylint: disable=unused-argument
         def __init__(self, connection, *args, **kwargs):
@@ -73,7 +73,7 @@ async def _cursor(self, *args, **kwargs):
 
 
 def get_traced_pool_proxy(pool, db_api_integration, *args, **kwargs):
-    # pylint: disable=abstract-method
+    # pylint: disable=abstract-method,no-member
     class TracedPoolProxy(AsyncProxyObject):
         # pylint: disable=unused-argument
         def __init__(self, pool, *args, **kwargs):
@@ -125,7 +125,7 @@ async def traced_execution(
 def get_traced_cursor_proxy(cursor, db_api_integration, *args, **kwargs):
     _traced_cursor = AsyncCursorTracer(db_api_integration)
 
-    # pylint: disable=abstract-method
+    # pylint: disable=abstract-method,no-member
     class AsyncCursorTracerProxy(AsyncProxyObject):
         # pylint: disable=unused-argument
         def __init__(self, cursor, *args, **kwargs):

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements-wrapt1.txt

@@ -0,0 +1,2 @@
+-r test-requirements.txt
+wrapt==1.17.3

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements-wrapt2.txt

@@ -0,0 +1,2 @@
+-r test-requirements.txt
+wrapt==2.1.2

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

@@ -1,7 +1,6 @@
 aiopg==1.4.0
 asgiref==3.8.1
 async-timeout==4.0.3
-Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
@@ -10,7 +9,6 @@ py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.12.2
-wrapt==1.16.0
 zipp==3.19.2
 -e opentelemetry-instrumentation
 -e instrumentation/opentelemetry-instrumentation-dbapi

instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py

@@ -472,7 +472,7 @@ def test_instrument_connection(self):
         connection2 = wrappers.instrument_connection(
             self.tracer, connection, "-"
         )
-        self.assertIs(connection2.__wrapped__, connection)
+        self.assertIs(connection2.__wrapped__, connection)  # pylint: disable=no-member
 
     def test_uninstrument_connection(self):
         connection = mock.Mock()
@@ -482,7 +482,7 @@ def test_uninstrument_connection(self):
         connection2 = wrappers.instrument_connection(
             self.tracer, connection, "-"
         )
-        self.assertIs(connection2.__wrapped__, connection)
+        self.assertIs(connection2.__wrapped__, connection)  # pylint: disable=no-member
 
         connection3 = wrappers.uninstrument_connection(connection2)
         self.assertIs(connection3, connection)

instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.14",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements-wrapt1.txt

@@ -0,0 +1,2 @@
+-r test-requirements.txt
+wrapt==1.17.3

instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements-wrapt2.txt

@@ -0,0 +1,2 @@
+-r test-requirements.txt
+wrapt==2.1.2

instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt

@@ -1,15 +1,13 @@
 asgiref==3.8.1
 async-timeout==4.0.3
 asyncpg==0.30.0
-Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.12.2
-wrapt==1.16.0
 zipp==3.19.2
 -e opentelemetry-instrumentation
 -e instrumentation/opentelemetry-instrumentation-asyncpg

instrumentation/opentelemetry-instrumentation-asyncpg/tests/test_asyncpg_wrapper.py

@@ -3,7 +3,12 @@
 
 import pytest
 from asyncpg import Connection, Record, cursor
-from wrapt import ObjectProxy
+
+try:
+    # wrapt 2.0.0+
+    from wrapt import BaseObjectProxy  # pylint: disable=no-name-in-module
+except ImportError:
+    from wrapt import ObjectProxy as BaseObjectProxy
 
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
@@ -50,7 +55,7 @@ def assert_wrapped(assert_fnc):
                 for method_name in methods:
                     method = getattr(cls, method_name, None)
                     assert_fnc(
-                        isinstance(method, ObjectProxy),
+                        isinstance(method, BaseObjectProxy),
                         f"{method} isinstance {type(method)}",
                     )
 

instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
   "opentelemetry-propagator-aws-xray ~= 1.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py

@@ -20,7 +20,12 @@
 from typing import Any, Callable, Dict, Iterator, Sequence, Union
 
 from botocore.eventstream import EventStream, EventStreamError
-from wrapt import ObjectProxy
+
+try:
+    # wrapt 2.0.0+
+    from wrapt import BaseObjectProxy  # pylint: disable=no-name-in-module
+except ImportError:
+    from wrapt import ObjectProxy as BaseObjectProxy
 
 from opentelemetry._logs import LogRecord
 from opentelemetry.context import get_current
@@ -37,7 +42,7 @@
 
 
 # pylint: disable=abstract-method
-class ConverseStreamWrapper(ObjectProxy):
+class ConverseStreamWrapper(BaseObjectProxy):
     """Wrapper for botocore.eventstream.EventStream"""
 
     def __init__(
@@ -61,7 +66,7 @@ def __init__(
 
     def __iter__(self):
         try:
-            for event in self.__wrapped__:
+            for event in self.__wrapped__:  # pylint: disable=no-member
                 self._process_event(event)
                 yield event
         except EventStreamError as exc:
@@ -143,7 +148,7 @@ def _process_event(self, event):
             return
 
     def close(self):
-        self.__wrapped__.close()
+        self.__wrapped__.close()  # pylint: disable=no-member
         # Treat the stream as done to ensure the span end.
         self._complete_stream(self._response)
 
@@ -157,7 +162,7 @@ def _handle_stream_error(self, exc):
 
 
 # pylint: disable=abstract-method
-class InvokeModelWithResponseStreamWrapper(ObjectProxy):
+class InvokeModelWithResponseStreamWrapper(BaseObjectProxy):
     """Wrapper for botocore.eventstream.EventStream"""
 
     def __init__(
@@ -183,7 +188,7 @@ def __init__(
         self._ended = False
 
     def close(self):
-        self.__wrapped__.close()
+        self.__wrapped__.close()  # pylint: disable=no-member
         # Treat the stream as done to ensure the span end.
         self._stream_done_callback(self._response, self._ended)
 
@@ -197,7 +202,7 @@ def _handle_stream_error(self, exc):
 
     def __iter__(self):
         try:
-            for event in self.__wrapped__:
+            for event in self.__wrapped__:  # pylint: disable=no-member
                 self._process_event(event)
                 yield event
         except EventStreamError as exc:

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-0-wrapt1.txt

@@ -0,0 +1,2 @@
+-r test-requirements-0.txt
+wrapt==1.17.3

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-0-wrapt2.txt

@@ -0,0 +1,2 @@
+-r test-requirements-0.txt
+wrapt==2.1.2

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-0.txt

@@ -6,7 +6,6 @@ certifi==2024.7.4
 cffi==1.17.0
 charset-normalizer==3.3.2
 cryptography==43.0.1
-Deprecated==1.2.14
 docker==7.0.0
 idna==3.7
 iniconfig==2.0.0
@@ -31,7 +30,6 @@ tomli==2.0.1
 typing_extensions==4.12.2
 urllib3==1.26.19
 Werkzeug==3.0.6
-wrapt==1.16.0
 xmltodict==0.13.0
 zipp==3.19.2
 -e opentelemetry-instrumentation

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-1-wrapt1.txt

@@ -0,0 +1,2 @@
+-r test-requirements-1.txt
+wrapt==1.17.3

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-1-wrapt2.txt

@@ -0,0 +1,2 @@
+-r test-requirements-1.txt
+wrapt==2.1.2

instrumentation/opentelemetry-instrumentation-botocore/test-requirements-1.txt

@@ -6,7 +6,6 @@ certifi==2024.7.4
 cffi==1.17.0
 charset-normalizer==3.3.2
 cryptography==43.0.1
-Deprecated==1.2.14
 docker==7.0.0
 idna==3.7
 iniconfig==2.0.0
@@ -31,7 +30,6 @@ tomli==2.0.1
 typing_extensions==4.12.2
 urllib3==1.26.19
 Werkzeug==3.0.6
-wrapt==1.16.0
 xmltodict==0.13.0
 zipp==3.19.2
 -e opentelemetry-instrumentation

instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-click/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-api ~= 1.12",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.62b0.dev",
   "opentelemetry-semantic-conventions == 0.62b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
 ]
 
 [project.optional-dependencies]