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/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-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__(
@@ -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__(

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]

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

@@ -173,9 +173,14 @@
 import re
 from typing import Any, Awaitable, Callable, Generic, TypeVar
 
-import wrapt
 from wrapt import wrap_function_wrapper
 
+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.dbapi.version import __version__
 from opentelemetry.instrumentation.sqlcommenter_utils import _add_sql_comment
@@ -372,7 +377,7 @@ def instrument_connection(
     Returns:
         An instrumented connection.
     """
-    if isinstance(connection, wrapt.ObjectProxy):
+    if isinstance(connection, BaseObjectProxy):
         _logger.warning("Connection already instrumented")
         return connection
 
@@ -407,7 +412,7 @@ def uninstrument_connection(
     Returns:
         An uninstrumented connection.
     """
-    if isinstance(connection, wrapt.ObjectProxy):
+    if isinstance(connection, BaseObjectProxy):
         return connection.__wrapped__
 
     _logger.warning("Connection is not instrumented")
@@ -566,14 +571,14 @@ def get_connection_attributes(self, connection: object) -> None:
 
 
 # pylint: disable=abstract-method
-class TracedConnectionProxy(wrapt.ObjectProxy, Generic[ConnectionT]):
+class TracedConnectionProxy(BaseObjectProxy, Generic[ConnectionT]):
     # pylint: disable=unused-argument
     def __init__(
         self,
         connection: ConnectionT,
         db_api_integration: DatabaseApiIntegration | None = None,
     ):
-        wrapt.ObjectProxy.__init__(self, connection)
+        BaseObjectProxy.__init__(self, connection)
         self._self_db_api_integration = db_api_integration
 
     def __getattribute__(self, name: str):
@@ -800,14 +805,14 @@ async def traced_execution_async(
 
 
 # pylint: disable=abstract-method
-class TracedCursorProxy(wrapt.ObjectProxy, Generic[CursorT]):
+class TracedCursorProxy(BaseObjectProxy, Generic[CursorT]):
     # pylint: disable=unused-argument
     def __init__(
         self,
         cursor: CursorT,
         db_api_integration: DatabaseApiIntegration,
     ):
-        wrapt.ObjectProxy.__init__(self, cursor)
+        BaseObjectProxy.__init__(self, cursor)
         self._self_cursor_tracer = CursorTracer[CursorT](db_api_integration)
 
     def execute(self, *args: Any, **kwargs: Any):

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

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

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

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

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

@@ -1,13 +1,11 @@
 asgiref==3.8.1
-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-dbapi

instrumentation/opentelemetry-instrumentation-elasticsearch/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-grpc/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-grpc/src/opentelemetry/instrumentation/grpc/_aio_server.py

@@ -14,7 +14,12 @@
 
 import grpc
 import grpc.aio
-import wrapt
+
+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.semconv._incubating.attributes.rpc_attributes import (
     RPC_GRPC_STATUS_CODE,
@@ -25,7 +30,7 @@
 
 
 # pylint:disable=abstract-method
-class _OpenTelemetryAioServicerContext(wrapt.ObjectProxy):
+class _OpenTelemetryAioServicerContext(BaseObjectProxy):
     def __init__(self, servicer_context, active_span):
         super().__init__(servicer_context)
         self._self_active_span = active_span

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

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

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

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