update generative scripts with instruments_either

Author: jeremydvoss

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/generate_instrumentation_readme.py

@@ -58,19 +58,23 @@ def main(base_instrumentation_path):
         with open(version_filename, encoding="utf-8") as fh:
             exec(fh.read(), pkg_info)
 
-        instruments = pkg_info["_instruments"]
+        instruments_and = pkg_info.get("_instruments", ())
+        instruments_either = pkg_info.get("_instruments_either", ())
         supports_metrics = pkg_info.get("_supports_metrics")
         semconv_status = pkg_info.get("_semconv_status")
-        if not instruments:
-            instruments = (name,)
+        instruments_all = ()
+        if not instruments_and and not instruments_either:
+            instruments_all = (name,)
+        else:
+            instruments_all = tuple(instruments_and + instruments_either)
 
         if not semconv_status:
             semconv_status = "development"
 
         metric_column = "Yes" if supports_metrics else "No"
 
         table.append(
-            f"| [{instrumentation}](./{instrumentation}) | {','.join(instruments)} | {metric_column} | {semconv_status}"
+            f"| [{instrumentation}](./{instrumentation}) | {','.join(instruments_all)} | {metric_column} | {semconv_status}"
         )
 
     with open(

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"]]