From 70e2dddf15477b970e3a340301f9bafa4438105b Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Tue, 12 Nov 2024 15:13:42 -0800
Subject: [PATCH] Add openai instrumentation to opentelemetry-bootstrap (#2996)

---
 CHANGELOG.md                                          |  2 ++
 .../pyproject.toml                                    |  2 +-
 .../opentelemetry/instrumentation/bootstrap_gen.py    |  4 ++++
 scripts/otel_packaging.py                             | 11 ++++++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae2dffb52..d9ee62572a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-sqlalchemy` Update unit tests to run with SQLALchemy 2
   ([#2976](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2976))
+  - Add `opentelemetry-instrumentation-openai-v2` to `opentelemetry-bootstrap`
+  ([#2996](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2996))
 
 ### Fixed
 
diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml
index b342cdade7..f1539ba641 100644
--- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml
+++ b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "openai >= 1.0.0",
+  "openai >= 1.26.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
index c30eb4ec92..32dcddc457 100644
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -16,6 +16,10 @@
 # RUN `python scripts/generate_instrumentation_bootstrap.py` TO REGENERATE.
 
 libraries = [
+    {
+        "library": "openai >= 1.26.0",
+        "instrumentation": "opentelemetry-instrumentation-openai-v2==2.1b0.dev",
+    },
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",
         "instrumentation": "opentelemetry-instrumentation-aio-pika==0.49b1",
diff --git a/scripts/otel_packaging.py b/scripts/otel_packaging.py
index 2f42e44189..3b09dd87eb 100644
--- a/scripts/otel_packaging.py
+++ b/scripts/otel_packaging.py
@@ -21,14 +21,23 @@
 scripts_path = os.path.dirname(os.path.abspath(__file__))
 root_path = os.path.dirname(scripts_path)
 instrumentations_path = os.path.join(root_path, "instrumentation")
+genai_instrumentations_path = os.path.join(root_path, "instrumentation-genai")
 
 
 def get_instrumentation_packages():
-    for pkg in sorted(os.listdir(instrumentations_path)):
+    pkg_paths = []
+    for pkg in os.listdir(instrumentations_path):
         pkg_path = os.path.join(instrumentations_path, pkg)
         if not os.path.isdir(pkg_path):
             continue
+        pkg_paths.append(pkg_path)
+    for pkg in os.listdir(genai_instrumentations_path):
+        pkg_path = os.path.join(genai_instrumentations_path, pkg)
+        if not os.path.isdir(pkg_path):
+            continue
+        pkg_paths.append(pkg_path)
 
+    for pkg_path in sorted(pkg_paths):
         try:
             version = subprocess.check_output(
                 "hatch version",