Merge branch 'main' into issue4467

dimastbk · web-flow · commit 240b1692d379 · 2025-05-20T22:58:00.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   to crash at shutdown with a max recursion error ([#4586](https://github.com/open-telemetry/opentelemetry-python/pull/4586)).
 - Configurable max retry timeout for grpc exporter
   ([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
+- opentelemetry-api: allow importlib-metadata 8.7.0
+  ([#4593](https://github.com/open-telemetry/opentelemetry-python/pull/4593))
 
 ## Version 1.33.0/0.54b0 (2025-05-09)
 
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
     "typing-extensions >= 4.5.0",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, < 8.7.0",
+    "importlib-metadata >= 6.0, < 8.8.0",
 ]
 dynamic = [
     "version",
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -1,6 +1,6 @@
 asgiref==3.7.2
 importlib-metadata==8.5.0 ; python_version < "3.9"
-importlib-metadata==8.6.1 ; python_version >= "3.9"
+importlib-metadata==8.7.0 ; python_version >= "3.9"
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ dependencies = [`
`30`	`30`	`"typing-extensions >= 4.5.0",`
`31`	`31`	`# FIXME This should be able to be removed after 3.12 is released if there is a reliable API`
`32`	`32`	`# in importlib.metadata.`
`33`		`- "importlib-metadata >= 6.0, < 8.7.0",`
	`33`	`+ "importlib-metadata >= 6.0, < 8.8.0",`
`34`	`34`	`]`
`35`	`35`	`dynamic = [`
`36`	`36`	`"version",`