backport(google-genai): loosen instrumented version restriction (#4597)

aabmass · web-flow · commit c3afdcff52cd · 2026-05-18T21:30:59.000-04:00
* backport(google-genai): loosen instrumented version restriction This is a backport of open-telemetry/opentelemetry-python-genai#21 to the v0.7b0 release branch. * Pin workflows to older core sha so they don't try to build against main
diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
@@ -143,66 +143,6 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-vertexai-latest -- -ra
 
-  py39-test-instrumentation-google-genai-oldest:
-    name: instrumentation-google-genai-oldest 
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python-contrib
-          ref: ${{ env.CONTRIB_REPO_SHA }}
-
-      - name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python
-          ref: ${{ env.CORE_REPO_SHA }}
-          path: opentelemetry-python
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-google-genai-oldest -- -ra
-
-  py39-test-instrumentation-google-genai-latest:
-    name: instrumentation-google-genai-latest 
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python-contrib
-          ref: ${{ env.CONTRIB_REPO_SHA }}
-
-      - name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
-        uses: actions/checkout@v4
-        with:
-          repository: open-telemetry/opentelemetry-python
-          ref: ${{ env.CORE_REPO_SHA }}
-          path: opentelemetry-python
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-google-genai-latest -- -ra
-
   py39-test-instrumentation-anthropic-oldest:
     name: instrumentation-anthropic-oldest 
     runs-on: ubuntu-latest
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}{% endraw %}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}{% endraw %}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}{% endraw %}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}{% endraw %}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: {% raw %}${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}{% endraw %}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}{% endraw %}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
@@ -25,8 +25,8 @@ env:
   CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
@@ -716,44 +716,6 @@ jobs:
       - name: Run tests
         run: tox -e py314-test-instrumentation-vertexai-latest -- -ra
 
-  py39-test-instrumentation-google-genai-oldest_ubuntu-latest:
-    name: instrumentation-google-genai-oldest 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-google-genai-oldest -- -ra
-
-  py39-test-instrumentation-google-genai-latest_ubuntu-latest:
-    name: instrumentation-google-genai-latest 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-google-genai-latest -- -ra
-
   py310-test-instrumentation-google-genai-oldest_ubuntu-latest:
     name: instrumentation-google-genai-oldest 3.10 Ubuntu
     runs-on: ubuntu-latest
@@ -4781,3 +4743,41 @@ jobs:
 
       - name: Run tests
         run: tox -e py314-test-instrumentation-fastapi -- -ra
+
+  pypy3-test-instrumentation-fastapi_ubuntu-latest:
+    name: instrumentation-fastapi pypy-3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python pypy-3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "pypy-3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e pypy3-test-instrumentation-fastapi -- -ra
+
+  py39-test-instrumentation-flask-0_ubuntu-latest:
+    name: instrumentation-flask-0 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-flask-0 -- -ra
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -25,51 +25,13 @@ env:
   CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
 jobs:
 
-  pypy3-test-instrumentation-fastapi_ubuntu-latest:
-    name: instrumentation-fastapi pypy-3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python pypy-3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "pypy-3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e pypy3-test-instrumentation-fastapi -- -ra
-
-  py39-test-instrumentation-flask-0_ubuntu-latest:
-    name: instrumentation-flask-0 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-flask-0 -- -ra
-
   py39-test-instrumentation-flask-1_ubuntu-latest:
     name: instrumentation-flask-1 3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -4781,3 +4743,41 @@ jobs:
 
       - name: Run tests
         run: tox -e py311-test-instrumentation-redis -- -ra
+
+  py312-test-instrumentation-redis_ubuntu-latest:
+    name: instrumentation-redis 3.12 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py312-test-instrumentation-redis -- -ra
+
+  py313-test-instrumentation-redis_ubuntu-latest:
+    name: instrumentation-redis 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py313-test-instrumentation-redis -- -ra
diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml
@@ -25,51 +25,13 @@ env:
   CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
        contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
        contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
-       'main'
-    ) || 'main' }}
+       'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4'
+    ) || 'f32b684a1ccd6d5eb658ec0b45bf18928ea430e4' }}
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
 jobs:
 
-  py312-test-instrumentation-redis_ubuntu-latest:
-    name: instrumentation-redis 3.12 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py312-test-instrumentation-redis -- -ra
-
-  py313-test-instrumentation-redis_ubuntu-latest:
-    name: instrumentation-redis 3.13 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py313-test-instrumentation-redis -- -ra
-
   py314-test-instrumentation-redis_ubuntu-latest:
     name: instrumentation-redis 3.14 Ubuntu
     runs-on: ubuntu-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,3 +20,4 @@ repos:
       - id: rstcheck
         additional_dependencies: ['rstcheck[sphinx]']
         args: ["--report-level", "warning"]
+        exclude: ^_template/
diff --git a/instrumentation-genai/README.md b/instrumentation-genai/README.md
@@ -3,7 +3,7 @@
 | --------------- | ------------------ | --------------- | -------------- |
 | [opentelemetry-instrumentation-anthropic](./opentelemetry-instrumentation-anthropic) | anthropic >= 0.16.0 | No | development
 | [opentelemetry-instrumentation-claude-agent-sdk](./opentelemetry-instrumentation-claude-agent-sdk) | claude-agent-sdk >= 0.1.14 | No | development
-| [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0 | No | development
+| [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0, <3 | No | development
 | [opentelemetry-instrumentation-langchain](./opentelemetry-instrumentation-langchain) | langchain >= 0.3.21 | No | development
 | [opentelemetry-instrumentation-openai-agents-v2](./opentelemetry-instrumentation-openai-agents-v2) | openai-agents >= 0.3.3 | No | development
 | [opentelemetry-instrumentation-openai-v2](./opentelemetry-instrumentation-openai-v2) | openai >= 1.26.0 | Yes | development
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md b/instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+- Relax version constraint of `google-genai` to allow v2 of that library to be used with the instrumentation library.
+
 ## Version 0.7b0 (2026-02-20)
 - Fix bug in how tokens are counted when using the streaming `generateContent` method.  ([#4152](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4152)).
 - Add `gen_ai.tool.definitions` attribute to `gen_ai.client.inference.operation.details` log event ([#4142](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4142)).
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml b/instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/instrumentor.py b/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/instrumentor.py
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py b/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt b/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt
diff --git a/tox.ini b/tox.ini
diff --git a/uv.lock b/uv.lock
