Skip to content

Commit c5107e5

Browse files
blarghmateyCopilot
andcommitted
Address PR review comments: add wrapt 2.0.0+ comments and fix CHANGELOG
- Add '# wrapt 2.0.0+' comment above BaseObjectProxy import in all try/except compat shim blocks to clarify why the pattern is used - Fix CHANGELOG.md PR link from #XXXX to open-telemetry#4203 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a6adfd8 commit c5107e5

File tree

8 files changed

+8
-1
lines changed

8 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
### Added
1717

1818
- `opentelemetry-instrumentation`: Add support for wrapt 2.x
19-
([#XXXX](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/XXXX))
19+
([#4203](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4203))
2020
- Add Python 3.14 support
2121
([#4193](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4193))
2222
- `opentelemetry-instrumentation-asgi`: Add exemplars for `http.server.request.duration` and `http.server.duration` metrics

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from asyncpg import Connection, Record, cursor
66

77
try:
8+
# wrapt 2.0.0+
89
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
910
except ImportError:
1011
from wrapt import ObjectProxy as BaseObjectProxy

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
from wrapt import wrap_function_wrapper
177177

178178
try:
179+
# wrapt 2.0.0+
179180
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
180181
except ImportError:
181182
from wrapt import ObjectProxy as BaseObjectProxy

instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_aio_server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import grpc.aio
1717

1818
try:
19+
# wrapt 2.0.0+
1920
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2021
except ImportError:
2122
from wrapt import ObjectProxy as BaseObjectProxy

instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import respx
2525

2626
try:
27+
# wrapt 2.0.0+
2728
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2829
except ImportError:
2930
from wrapt import ObjectProxy as BaseObjectProxy

instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from pika.spec import Basic, BasicProperties
1010

1111
try:
12+
# wrapt 2.0.0+
1213
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
1314
except ImportError:
1415
from wrapt import ObjectProxy as BaseObjectProxy

opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from typing import Any, Dict, Generator, Sequence
2222

2323
try:
24+
# wrapt 2.0.0+
2425
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2526
except ImportError:
2627
from wrapt import ObjectProxy as BaseObjectProxy

opentelemetry-instrumentation/tests/test_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from wrapt import wrap_function_wrapper
1919

2020
try:
21+
# wrapt 2.0.0+
2122
from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
2223
except ImportError:
2324
from wrapt import ObjectProxy as BaseObjectProxy

0 commit comments

Comments
 (0)