Add instruments_either to bootstrap

Author: jeremydvoss

instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+instruments = []
 instruments_either = [
     "fastapi ~= 0.92",
     "fastapi-slim ~= 0.92",

instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+instruments = []
 instruments_either = [
   "kafka-python >= 2.0, < 3.0",
   "kafka-python-ng >= 2.0, < 3.0"

instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+instruments = []
 instruments_either = [
   "psycopg2 >= 2.7.3.1",
   "psycopg2-binary >= 2.7.3.1",

scripts/generate_instrumentation_bootstrap.py

@@ -84,7 +84,7 @@ def main():
         pkg_name = pkg.get("name")
         if pkg_name in packages_to_exclude:
             continue
-        if not pkg["instruments"]:
+        if not pkg["instruments"] and not pkg["instruments_either"]:
             default_instrumentations.elts.append(ast.Str(pkg["requirement"]))
         for target_pkg in pkg["instruments"]:
             libraries.elts.append(
@@ -93,6 +93,13 @@ def main():
                     values=[ast.Str(target_pkg), ast.Str(pkg["requirement"])],
                 )
             )
+        for target_pkg in pkg["instruments_either"]:
+            libraries.elts.append(
+                ast.Dict(
+                    keys=[ast.Str("library"), ast.Str("instrumentation")],
+                    values=[ast.Str(target_pkg), ast.Str(pkg["requirement"])],
+                )
+            )
 
     tree = ast.parse(_source_tmpl)
     tree.body[0].value = libraries

scripts/otel_packaging.py

@@ -60,12 +60,18 @@ def get_instrumentation_packages(
         with open(pyproject_toml_path, "rb") as file:
             pyproject_toml = tomli.load(file)
 
+        optional_dependencies = pyproject_toml["project"][
+            "optional-dependencies"
+        ]
+        instruments = optional_dependencies.get("instruments", [])
+        instruments_either = optional_dependencies.get(
+            "instruments_either", []
+        )
         instrumentation = {
             "name": pyproject_toml["project"]["name"],
             "version": version.strip(),
-            "instruments": pyproject_toml["project"]["optional-dependencies"][
-                "instruments"
-            ],
+            "instruments": instruments,
+            "instruments_either": instruments_either,
         }
         if instrumentation["name"] in independent_packages:
             specifier = independent_packages[instrumentation["name"]]