Merge branch 'main' into anthropic-async

vasantteja · web-flow · commit 56d572806f2e · 2026-02-13T11:25:39.000-05:00
diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
@@ -3023,8 +3023,8 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-asyncio -- -ra
 
-  py39-test-instrumentation-cassandra:
-    name: instrumentation-cassandra 
+  py39-test-instrumentation-cassandra-driver:
+    name: instrumentation-cassandra-driver 
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -3051,7 +3051,37 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py39-test-instrumentation-cassandra -- -ra
+        run: tox -e py39-test-instrumentation-cassandra-driver -- -ra
+
+  py39-test-instrumentation-cassandra-scylla:
+    name: instrumentation-cassandra-scylla 
+    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-cassandra-scylla -- -ra
 
   py39-test-processor-baggage:
     name: processor-baggage 
diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml
@@ -1381,8 +1381,8 @@ jobs:
       - name: Run tests
         run: tox -e py313-test-instrumentation-asyncio -- -ra
 
-  py39-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra 3.9 Ubuntu
+  py39-test-instrumentation-cassandra-driver_ubuntu-latest:
+    name: instrumentation-cassandra-driver 3.9 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1398,10 +1398,48 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py39-test-instrumentation-cassandra -- -ra
+        run: tox -e py39-test-instrumentation-cassandra-driver -- -ra
 
-  py310-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra 3.10 Ubuntu
+  py39-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla 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-cassandra-scylla -- -ra
+
+  py310-test-instrumentation-cassandra-driver_ubuntu-latest:
+    name: instrumentation-cassandra-driver 3.10 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py310-test-instrumentation-cassandra-driver -- -ra
+
+  py310-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla 3.10 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1417,10 +1455,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py310-test-instrumentation-cassandra -- -ra
+        run: tox -e py310-test-instrumentation-cassandra-scylla -- -ra
+
+  py311-test-instrumentation-cassandra-driver_ubuntu-latest:
+    name: instrumentation-cassandra-driver 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py311-test-instrumentation-cassandra-driver -- -ra
 
-  py311-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra 3.11 Ubuntu
+  py311-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla 3.11 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1436,10 +1493,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py311-test-instrumentation-cassandra -- -ra
+        run: tox -e py311-test-instrumentation-cassandra-scylla -- -ra
+
+  py312-test-instrumentation-cassandra-driver_ubuntu-latest:
+    name: instrumentation-cassandra-driver 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-cassandra-driver -- -ra
 
-  py312-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra 3.12 Ubuntu
+  py312-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla 3.12 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1455,10 +1531,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py312-test-instrumentation-cassandra -- -ra
+        run: tox -e py312-test-instrumentation-cassandra-scylla -- -ra
+
+  py313-test-instrumentation-cassandra-driver_ubuntu-latest:
+    name: instrumentation-cassandra-driver 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-cassandra-driver -- -ra
 
-  py313-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra 3.13 Ubuntu
+  py313-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla 3.13 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1474,10 +1569,10 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py313-test-instrumentation-cassandra -- -ra
+        run: tox -e py313-test-instrumentation-cassandra-scylla -- -ra
 
-  pypy3-test-instrumentation-cassandra_ubuntu-latest:
-    name: instrumentation-cassandra pypy-3.9 Ubuntu
+  pypy3-test-instrumentation-cassandra-scylla_ubuntu-latest:
+    name: instrumentation-cassandra-scylla pypy-3.9 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -1493,7 +1588,7 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e pypy3-test-instrumentation-cassandra -- -ra
+        run: tox -e pypy3-test-instrumentation-cassandra-scylla -- -ra
 
   py39-test-processor-baggage_ubuntu-latest:
     name: processor-baggage 3.9 Ubuntu
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -58,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `opentelemetry-instrumentation-cassandra`: Use `_instruments_any` instead of `_instruments` for driver dependencies so that having either `cassandra-driver` or `scylla-driver` installed is sufficient
+  ([#4182](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4182))
 - `opentelemetry-instrumentation-asyncpg`: Hydrate span attributes before creation so samplers can filter on database details
   ([#3841](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3841))
 - `opentelemetry-instrumentation-django`: Fix exemplars generation for `http.server.(request.)duration`
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
@@ -32,7 +32,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-instruments = [
+instruments = []
+instruments-any = [
   "cassandra-driver ~= 3.25",
   "scylla-driver ~= 3.25",
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/__init__.py b/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/__init__.py
@@ -37,13 +37,18 @@
 ---
 """
 
+from importlib.metadata import PackageNotFoundError, distribution
 from typing import Collection
 
 import cassandra.cluster
 from wrapt import wrap_function_wrapper
 
 from opentelemetry import trace
-from opentelemetry.instrumentation.cassandra.package import _instruments
+from opentelemetry.instrumentation.cassandra.package import (
+    _instruments_any,
+    _instruments_cassandra_driver,
+    _instruments_scylla_driver,
+)
 from opentelemetry.instrumentation.cassandra.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
@@ -96,7 +101,22 @@ def _traced_execute_async(func, instance, args, kwargs):
 
 class CassandraInstrumentor(BaseInstrumentor):
     def instrumentation_dependencies(self) -> Collection[str]:
-        return _instruments
+        # Determine which package of cassandra is installed.
+        # Right now there are two packages, cassandra-driver and scylla-driver.
+        # The latter is a fork with additional support for ScyllaDB.
+        try:
+            distribution("cassandra-driver")
+            return (_instruments_cassandra_driver,)
+        except PackageNotFoundError:
+            pass
+
+        try:
+            distribution("scylla-driver")
+            return (_instruments_scylla_driver,)
+        except PackageNotFoundError:
+            pass
+
+        return _instruments_any
 
     def _instrument(self, **kwargs):
         _instrument(
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/package.py b/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/package.py
@@ -13,4 +13,8 @@
 # limitations under the License.
 
 
-_instruments = ("cassandra-driver ~= 3.25", "scylla-driver ~= 3.25")
+_instruments_cassandra_driver = "cassandra-driver ~= 3.25"
+_instruments_scylla_driver = "scylla-driver ~= 3.25"
+
+_instruments = ()
+_instruments_any = (_instruments_cassandra_driver, _instruments_scylla_driver)
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements-scylla.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements-scylla.txt
@@ -0,0 +1,20 @@
+asgiref==3.8.1
+pyasyncore==1.0.4  # for python 3.13 (should removed when cassandra-driver replaces asyncore with recommended asyncio)
+click==8.1.7
+Deprecated==1.2.14
+geomet==0.2.1.post1
+iniconfig==2.0.0
+packaging==24.0
+pluggy==1.5.0
+py-cpuinfo==9.0.0
+pytest==7.4.4
+python-snappy==0.7.3
+PyYAML==6.0.1
+scylla-driver==3.26.6
+six==1.16.0
+tomli==2.0.1
+typing_extensions==4.12.2
+wrapt==1.16.0
+zipp==3.19.2
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-cassandra
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt
@@ -10,7 +10,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 PyYAML==6.0.1
-scylla-driver==3.26.6
 six==1.16.0
 tomli==2.0.1
 typing_extensions==4.12.2
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py b/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py
diff --git a/tox.ini b/tox.ini
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ dependencies = [`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`[project.optional-dependencies]`
`35`		`-instruments = [`
	`35`	`+instruments = []`
	`36`	`+instruments-any = [`
`36`	`37`	`"cassandra-driver ~= 3.25",`
`37`	`38`	`"scylla-driver ~= 3.25",`
`38`	`39`	`]`