build: relax wrapt version constraint in pyproject.toml by Atry · Pull Request #3930 · open-telemetry/opentelemetry-python-contrib

Atry · 2025-11-09T19:58:46Z

Description

Relax the wrapt version constraint from < 2.0.0 to < 3.0.0 to allow compatibility with wrapt 2.x.

Background

The current constraint wrapt >= 1.0.0, < 2.0.0 unnecessarily prevents users from using wrapt 2.x. This is an unnecessary limitation because the APIs used by opentelemetry-instrumentation (wrap_function_wrapper and ObjectProxy) remain compatible in wrapt 2.x.

Changes

Updated the wrapt version constraint in the following packages:

opentelemetry-instrumentation
opentelemetry-processor-baggage
19 instrumentation packages:
- opentelemetry-instrumentation-aio-pika
- opentelemetry-instrumentation-aiohttp-client
- opentelemetry-instrumentation-aiohttp-server
- opentelemetry-instrumentation-aiopg
- opentelemetry-instrumentation-asyncio
- opentelemetry-instrumentation-boto3sqs
- opentelemetry-instrumentation-cassandra
- opentelemetry-instrumentation-click
- opentelemetry-instrumentation-confluent-kafka
- opentelemetry-instrumentation-dbapi
- opentelemetry-instrumentation-elasticsearch
- opentelemetry-instrumentation-grpc
- opentelemetry-instrumentation-httpx
- opentelemetry-instrumentation-jinja2
- opentelemetry-instrumentation-pika
- opentelemetry-instrumentation-pymemcache
- opentelemetry-instrumentation-pyramid
- opentelemetry-instrumentation-threading
- opentelemetry-instrumentation-urllib3

Type of change

New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Verified that uv lock --check passes (the locked wrapt version in uv.lock remains unchanged)
The change only relaxes upper bound constraints, so existing functionality is preserved

Does This PR Require a Core Repo Change?

No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

Followed the style guidelines of this project
Changelogs have been updated
Unit tests have been added
Documentation has been updated

linux-foundation-easycla · 2025-11-09T19:58:54Z

The committers listed above are authorized under a signed CLA.

✅ login: Atry / name: Yang, Bo (d35bd3d)

xrmx · 2025-11-11T13:00:34Z

We have to update all the entries, not just opentelemetry-instrumentation:

git grep wrapt.*2 | grep pyproject.toml
instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml:    "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-click/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-pika/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-redis/pyproject.toml:  "wrapt >= 1.12.1",
instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml:  "wrapt >= 1.11.2",
instrumentation/opentelemetry-instrumentation-threading/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
opentelemetry-instrumentation/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",
processor/opentelemetry-processor-baggage/pyproject.toml:  "wrapt >= 1.0.0, < 2.0.0",

Atry · 2025-12-06T19:17:10Z

@xrmx Updated. Would you mind reviewing it again?

Update all pyproject.toml files that had "wrapt >= 1.0.0, < 2.0.0" constraint to "wrapt >= 1.0.0, < 3.0.0" to allow wrapt 2.x. Updated packages: - opentelemetry-instrumentation - opentelemetry-processor-baggage - 20 instrumentation packages Also update uv.lock to use wrapt 2.0.1 for CI testing. This change only affects the development lockfile used for testing. End users are not affected as the version constraint allows both wrapt 1.x and 2.x - users can continue using whichever version their package manager resolves.

xrmx · 2025-12-11T08:44:36Z

CHANGELOG.md

 - `opentelemetry-instrumentation-redis`: add missing copyright header for opentelemetry-instrumentation-redis
  ([#3976](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3976))

+### Changed


This should be moved under unreleased and keep it under the Added chapter

xrmx

Please merge main and redo the uv.lock update since there's conflicts there

mariojonke · 2025-12-11T12:01:11Z

i believe the isinstance(func, ObjectProxy) in unwrap with wrapt v2 will now always return false.
this will likely break uninstrument in most instrumentors since this is where unwrap is mostly used.

it would probably be good to adapt some of the test requirements files to run the tests also with wrapt v2

xrmx · 2025-12-11T14:58:57Z

Indeed it needs fixes:

diff --git a/opentelemetry-instrumentation/pyproject.toml b/opentelemetry-instrumentation/pyproject.toml
index 0e5820e0d..147f42163 100644
--- a/opentelemetry-instrumentation/pyproject.toml
+++ b/opentelemetry-instrumentation/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.4",
   "opentelemetry-semantic-conventions == 0.61b0.dev",
-  "wrapt >= 1.0.0, < 2.0.0",
+  "wrapt >= 1.0.0, < 3.0.0",
   "packaging >= 18.0",
 ]
 
diff --git a/opentelemetry-instrumentation/test-requirements.txt b/opentelemetry-instrumentation/test-requirements.txt
index 58c09a950..86462950c 100644
--- a/opentelemetry-instrumentation/test-requirements.txt
+++ b/opentelemetry-instrumentation/test-requirements.txt
@@ -1,5 +1,4 @@
 asgiref==3.8.1
-Deprecated==1.2.14
 gevent==25.5.1
 iniconfig==2.0.0
 packaging==24.0
@@ -8,6 +7,6 @@ py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.12.2
-wrapt==1.16.0
+wrapt==2.0.0
 zipp==3.19.2
 -e opentelemetry-instrumentation

gets 5 test failures.

Other users of ObjectProxy other than opentelemetry-instrumentation are:

opentelemetry-instrumentation-dbapi
instrumentation/opentelemetry-instrumentation-botocore
instrumentation/opentelemetry-instrumentation-aiopg
instrumentation/opentelemetry-instrumentation-grpc
instrumentation/opentelemetry-instrumentation-pika

blarghmatey · 2026-01-12T16:29:31Z

What's the status of this work? It is currently a blocker for me being able to use this SDK for one of my applications.

xrmx · 2026-02-12T09:05:27Z

@blarghmatey the status of this work is that we two incomplete PRs open, feel free to open a third one with proper tests

blarghmatey · 2026-02-13T14:44:58Z

@xrmx thank you for the follow-up. I'll try to get something opened shortly to address the needs. I appreciate all of the hard work from you and the other Python OTel maintainers!

- Update wrapt version constraint from '>=1.0.0, <2.0.0' to '>=1.0.0' in all affected packages - Replace ObjectProxy with BaseObjectProxy where iteration support is not needed - Add fallback import for wrapt 1.x compatibility (ObjectProxy as BaseObjectProxy) - Keep ObjectProxy usage in classes that implement __iter__ (botocore, aiopg) - Update CHANGELOG.md This change maintains backward compatibility with wrapt 1.x while enabling support for wrapt 2.x. BaseObjectProxy is the new base class in wrapt 2.x, while ObjectProxy is now a subclass that adds __iter__() support. Fixes open-telemetry#3903 Related to open-telemetry#3930 and open-telemetry#4082

blarghmatey · 2026-02-13T17:48:06Z

@xrmx when you have time I opened #4203

I'm happy to address any feedback or changes that you identify. Thanks!

- Update wrapt version constraint from '>=1.0.0, <2.0.0' to '>=1.0.0' in all affected packages - Replace ObjectProxy with BaseObjectProxy where iteration support is not needed - Add fallback import for wrapt 1.x compatibility (ObjectProxy as BaseObjectProxy) - Keep ObjectProxy usage in classes that implement __iter__ (botocore, aiopg) - Update CHANGELOG.md This change maintains backward compatibility with wrapt 1.x while enabling support for wrapt 2.x. BaseObjectProxy is the new base class in wrapt 2.x, while ObjectProxy is now a subclass that adds __iter__() support. Fixes open-telemetry#3903 Related to open-telemetry#3930 and open-telemetry#4082

Atry force-pushed the patch-1 branch from dca0c27 to 8382217 Compare December 6, 2025 19:05

github-actions bot assigned shalevr Dec 6, 2025

Atry marked this pull request as ready for review December 6, 2025 19:05

Atry requested a review from a team as a code owner December 6, 2025 19:05

Atry force-pushed the patch-1 branch from 8382217 to 455cf29 Compare December 6, 2025 19:15

Atry force-pushed the patch-1 branch from fa47812 to d35bd3d Compare December 6, 2025 19:24

Atry changed the title ~~build: relief wrapt version constraint in pyproject.toml~~ build: relax wrapt version constraint in pyproject.toml Dec 6, 2025

sshishov mentioned this pull request Dec 11, 2025

Support wrapt 2.0 in pyproject.toml #3903

Open

xrmx reviewed Dec 11, 2025

View reviewed changes

xrmx approved these changes Dec 11, 2025

View reviewed changes

xrmx added this to @xrmx's Python PR digest Dec 11, 2025

xrmx moved this to Approved PRs that need fixes in @xrmx's Python PR digest Dec 11, 2025

xrmx self-requested a review December 11, 2025 14:57

xrmx moved this from Approved PRs that need fixes to Reviewed PRs that need fixes in @xrmx's Python PR digest Dec 11, 2025

blarghmatey mentioned this pull request Feb 13, 2026

Add support for wrapt 2.x #4203

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: relax wrapt version constraint in pyproject.toml#3930

build: relax wrapt version constraint in pyproject.toml#3930
Atry wants to merge 1 commit intoopen-telemetry:mainfrom
Atry:patch-1

Atry commented Nov 9, 2025 •

edited by xrmx

Loading

Uh oh!

linux-foundation-easycla bot commented Nov 9, 2025 •

edited

Loading

Uh oh!

xrmx commented Nov 11, 2025

Uh oh!

Atry commented Dec 6, 2025

Uh oh!

xrmx Dec 11, 2025

Uh oh!

xrmx left a comment

Uh oh!

mariojonke commented Dec 11, 2025

Uh oh!

xrmx commented Dec 11, 2025 •

edited

Loading

Uh oh!

blarghmatey commented Jan 12, 2026

Uh oh!

xrmx commented Feb 12, 2026 •

edited

Loading

Uh oh!

blarghmatey commented Feb 13, 2026

Uh oh!

blarghmatey commented Feb 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments

Conversation

Atry commented Nov 9, 2025 • edited by xrmx Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Background

Changes

Type of change

How Has This Been Tested?

Does This PR Require a Core Repo Change?

Checklist:

Uh oh!

linux-foundation-easycla bot commented Nov 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xrmx commented Nov 11, 2025

Uh oh!

Atry commented Dec 6, 2025

Uh oh!

xrmx Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

xrmx left a comment

Choose a reason for hiding this comment

Uh oh!

mariojonke commented Dec 11, 2025

Uh oh!

xrmx commented Dec 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blarghmatey commented Jan 12, 2026

Uh oh!

xrmx commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blarghmatey commented Feb 13, 2026

Uh oh!

blarghmatey commented Feb 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments

Atry commented Nov 9, 2025 •

edited by xrmx

Loading

linux-foundation-easycla bot commented Nov 9, 2025 •

edited

Loading

xrmx commented Dec 11, 2025 •

edited

Loading

xrmx commented Feb 12, 2026 •

edited

Loading