Merge branch 'instruments-either-use' into instruments-either

jeremydvoss · jeremydvoss · commit 517e4b1c2e62 · 2025-07-11T12:10:37.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation`: Fix dependency conflict detection when instrumented packages are not installed by moving check back to before instrumentors are loaded. Add "instruments-any" feature for instrumentations that target multiple packages.
   ([#3610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3610))
 
+### Added
+
+- `opentelemetry-util-http` Added support for redacting specific url query string values and url credentials in instrumentations
+  ([#3508](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3508))
+- `opentelemetry-instrumentation-pymongo` `aggregate` and `getMore` capture statements support
+  ([#3601](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3601))
+- `opentelemetry-instrumentation-fastapi` Utilize instruments-any functionality. TODO MOVE TO NEW VERSION WHEN OUT
+  ([#3612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3612))
+- `opentelemetry-instrumentation-psycopg2` Utilize instruments-any functionality.
+  ([#3612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3612))
+- `opentelemetry-instrumentation-kafka-python` Utilize instruments-any functionality.
+  ([#3612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3612))
+
 ## Version 1.34.0/0.55b0 (2025-06-04)
 
 ### Fixed
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -22,7 +22,7 @@
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes | development
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 6.0 | No | development
 | [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon >= 1.4.1, < 5.0.0 | Yes | migration
-| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.92 | Yes | migration
+| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.92,fastapi-slim ~= 0.92 | Yes | migration
 | [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0 | Yes | migration
 | [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio >= 1.42.0 | No | development
 | [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0 | Yes | migration
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
@@ -33,8 +33,10 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-instruments = [
+instruments = []
+instruments-any = [
     "fastapi ~= 0.92",
+    "fastapi-slim ~= 0.92",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/package.py b/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/package.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 
-_instruments = ("fastapi ~= 0.92",)
+# TODO: update this
+_instruments = ()
+_instruments_any = ("fastapi ~= 0.92", "fastapi-slim ~= 0.92")
 
 _supports_metrics = True
 
diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml b/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
@@ -31,7 +31,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-instruments = [
+instruments = []
+instruments-any = [
   "kafka-python >= 2.0, < 3.0",
   "kafka-python-ng >= 2.0, < 3.0"
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/package.py b/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/package.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 
+# TODO: where are these used?
 _instruments_kafka_python = "kafka-python >= 2.0, < 3.0"
 _instruments_kafka_python_ng = "kafka-python-ng >= 2.0, < 3.0"
 
-_instruments = (_instruments_kafka_python, _instruments_kafka_python_ng)
+_instruments = ()
+_instruments_any = (_instruments_kafka_python, _instruments_kafka_python_ng)
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
@@ -31,7 +31,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-instruments = [
+instruments = []
+instruments-any = [
   "psycopg2 >= 2.7.3.1",
   "psycopg2-binary >= 2.7.3.1",
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/package.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/package.py
@@ -13,10 +13,13 @@
 # limitations under the License.
 
 
+# TODO: where are these used?
 _instruments_psycopg2 = "psycopg2 >= 2.7.3.1"
 _instruments_psycopg2_binary = "psycopg2-binary >= 2.7.3.1"
 
-_instruments = (
+# TODO: maybe add _instruments_any
+_instruments = ()
+_instruments_any = (
     _instruments_psycopg2,
     _instruments_psycopg2_binary,
 )
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -104,6 +104,10 @@
         "library": "fastapi ~= 0.92",
         "instrumentation": "opentelemetry-instrumentation-fastapi==0.57b0.dev",
     },
+    {
+        "library": "fastapi-slim ~= 0.92",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.57b0.dev",
+    },
     {
         "library": "flask >= 1.0",
         "instrumentation": "opentelemetry-instrumentation-flask==0.57b0.dev",
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,17 +32,20 @@ dependencies = [
   "opentelemetry-instrumentation-elasticsearch[instruments]",
   "opentelemetry-instrumentation-falcon[instruments]",
   "opentelemetry-instrumentation-fastapi[instruments]",
+  "opentelemetry-instrumentation-fastapi[instruments-any]",
   "opentelemetry-instrumentation-flask[instruments]",
   "opentelemetry-instrumentation-grpc[instruments]",
   "opentelemetry-instrumentation-httpx[instruments]",
   "opentelemetry-instrumentation-jinja2[instruments]",
   "opentelemetry-instrumentation-kafka-python[instruments]",
+  "opentelemetry-instrumentation-kafka-python[instruments-any]",
   "opentelemetry-instrumentation-logging",
   "opentelemetry-instrumentation-mysql[instruments]",
   "opentelemetry-instrumentation-mysqlclient[instruments]",
   "opentelemetry-instrumentation-pika[instruments]",
   "opentelemetry-instrumentation-psycopg[instruments]",
   "opentelemetry-instrumentation-psycopg2[instruments]",
+  "opentelemetry-instrumentation-psycopg2[instruments-any]",
   "opentelemetry-instrumentation-pymemcache[instruments]",
   "opentelemetry-instrumentation-pymongo[instruments]",
   "opentelemetry-instrumentation-pymysql[instruments]",
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,10 @@ dependencies = [`
`33`	`33`	`]`
`34`	`34`
`35`	`35`	`[project.optional-dependencies]`
`36`		`-instruments = [`
	`36`	`+instruments = []`
	`37`	`+instruments-any = [`
`37`	`38`	`"fastapi ~= 0.92",`
	`39`	`+ "fastapi-slim ~= 0.92",`
`38`	`40`	`]`
`39`	`41`
`40`	`42`	`[project.entry-points.opentelemetry_instrumentor]`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ dependencies = [`
`31`	`31`	`]`
`32`	`32`
`33`	`33`	`[project.optional-dependencies]`
`34`		`-instruments = [`
	`34`	`+instruments = []`
	`35`	`+instruments-any = [`
`35`	`36`	`"kafka-python >= 2.0, < 3.0",`
`36`	`37`	`"kafka-python-ng >= 2.0, < 3.0"`
`37`	`38`	`]`