Remove fastapi changes as they are not necessary like those of psycopg2 and kafkapython

Author: jeremydvoss

CHANGELOG.md

@@ -18,12 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `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))
+  ([#3610](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))
+  ([#3610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3612))
 
 ## Version 1.35.0/0.56b0 (2025-07-11)
 

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,fastapi-slim ~= 0.92 | Yes | migration
+| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 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

instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml

@@ -33,10 +33,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-instruments = []
-instruments-any = [
+instruments = [
     "fastapi ~= 0.92",
-    "fastapi-slim ~= 0.92",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/package.py

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 
-# TODO: update this
-_instruments = ()
-_instruments_any = ("fastapi ~= 0.92", "fastapi-slim ~= 0.92")
+_instruments = ("fastapi ~= 0.92",)
 
 _supports_metrics = True
 

instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/package.py

@@ -13,7 +13,6 @@
 # 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"
 

instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/package.py

@@ -13,11 +13,9 @@
 # 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"
 
-# TODO: maybe add _instruments_any
 _instruments = ()
 _instruments_any = (
     _instruments_psycopg2,

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -104,10 +104,6 @@
         "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",