scripts/generate_instrumentation_bootstrap: don't force genai instrumentations versions

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

@@ -18,11 +18,7 @@
 libraries = [
     {
         "library": "openai >= 1.26.0",
-        "instrumentation": "opentelemetry-instrumentation-openai-v2==2.2b0.dev",
-    },
-    {
-        "library": "google-cloud-aiplatform >= 1.64",
-        "instrumentation": "opentelemetry-instrumentation-vertexai==2.1b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-openai-v2",
     },
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",

scripts/generate_instrumentation_bootstrap.py

@@ -60,15 +60,25 @@
 # See https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2787
 packages_to_exclude = [
     "opentelemetry-instrumentation-aws-lambda",
+    "opentelemetry-instrumentation-vertexai",  # not released yet
+]
+
+# We should not put any version limit for instrumentations that are released independently
+unversioned_packages = [
+    "opentelemetry-instrumentation-openai-v2",
+    "opentelemetry-instrumentation-vertexai",
 ]
 
 
 def main():
     # pylint: disable=no-member
     default_instrumentations = ast.List(elts=[])
     libraries = ast.List(elts=[])
-    for pkg in get_instrumentation_packages():
-        if pkg.get("name") in packages_to_exclude:
+    for pkg in get_instrumentation_packages(
+        unversioned_packages=unversioned_packages
+    ):
+        pkg_name = pkg.get("name")
+        if pkg_name in packages_to_exclude:
             continue
         if not pkg["instruments"]:
             default_instrumentations.elts.append(ast.Str(pkg["requirement"]))

scripts/otel_packaging.py

@@ -24,7 +24,8 @@
 genai_instrumentations_path = os.path.join(root_path, "instrumentation-genai")
 
 
-def get_instrumentation_packages():
+def get_instrumentation_packages(unversioned_packages=None):
+    unversioned_packages = unversioned_packages or []
     pkg_paths = []
     for pkg in os.listdir(instrumentations_path):
         pkg_path = os.path.join(instrumentations_path, pkg)
@@ -62,12 +63,15 @@ def get_instrumentation_packages():
                 "instruments"
             ],
         }
-        instrumentation["requirement"] = "==".join(
-            (
-                instrumentation["name"],
-                instrumentation["version"],
+        if instrumentation["name"] in unversioned_packages:
+            instrumentation["requirement"] = instrumentation["name"]
+        else:
+            instrumentation["requirement"] = "==".join(
+                (
+                    instrumentation["name"],
+                    instrumentation["version"],
+                )
             )
-        )
         yield instrumentation