cassandra: use _instruments_any instead of _instruments for driver deps #4182
+523
−241
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andreamatt
force-pushed
the
fix/cassandra-instruments-any
branch
from
fdcc855 to
b27f1e3
Compare
andreamatt
force-pushed
the
fix/cassandra-instruments-any
branch
2 times, most recently
from
935feab to
f96edf4
Compare
11 tasks
xrmx
reviewed
Feb 10, 2026
Contributor
xrmx
left a comment
xrmx
left a comment
There was a problem hiding this comment.
Thanks for the PR, I think you are missing one piece of the puzzle that is to test both the implementation and not just one.
In short you have to split the test-requirements.txt in one for cassandra-driver and the other for scylla-driver and update tox.ini accordingly.
The split plus a ton of unrelated changes are available in this PR https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4180/changes
andreamatt
force-pushed
the
fix/cassandra-instruments-any
branch
from
f96edf4 to
51d855b
Compare
andreamatt
commented
Feb 10, 2026
Author
andreamatt
left a comment
andreamatt
left a comment
There was a problem hiding this comment.
Done — split test requirements into separate files for cassandra-driver and scylla-driver, with separate tox environments for each. Both pass:
py313-test-instrumentation-cassandra-driver: 8/8 passedpy312-test-instrumentation-cassandra-scylla: 8/8 passed
andreamatt
force-pushed
the
fix/cassandra-instruments-any
branch
from
51d855b to
7ba9c50
Compare
xrmx
reviewed
Feb 11, 2026
xrmx
reviewed
Feb 11, 2026
The cassandra instrumentation listed both cassandra-driver and scylla-driver in _instruments, which requires ALL listed packages to be installed. Since users install one OR the other (they are alternative drivers for the same API), this should use _instruments_any so that having either driver installed is sufficient. This follows the same pattern already used by psycopg2 and kafka-python instrumentations, introduced in open-telemetry#3610. Co-authored-by: Cursor <[email protected]>
andreamatt
force-pushed
the
fix/cassandra-instruments-any
branch
from
7ba9c50 to
de3f0f8
Compare
Signed-off-by: emdneto <[email protected]>
Signed-off-by: emdneto <[email protected]>
…/opentelemetry-python-contrib into fix/cassandra-instruments-any
emdneto
approved these changes
Feb 11, 2026
xrmx
approved these changes
Feb 12, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The cassandra instrumentation listed both
cassandra-driverandscylla-driverin_instruments, which requires all listed packages to be installed. Since users install one or the other (they are alternative drivers for the samecassandra.clusterAPI), this should use_instruments_anyso that having either driver installed is sufficient.This follows the same pattern already used by the psycopg2 and kafka-python instrumentations, introduced in #3610. Cassandra was the only remaining instrumentation with multiple alternative packages listed under
_instrumentsinstead of_instruments_any.Also splits test requirements into separate files for each driver and adds separate tox/CI environments to test both independently.
Fixes #2819
Type of change
How Has This Been Tested?
DependencyConflict: requested: "scylla-driver ~= 3.25" but found: "None"when onlycassandra-driveris installed (3/4 tests fail)instrumentation_dependencies()covering all four cases: only cassandra-driver, only scylla-driver, both installed, neither installedpy313-test-instrumentation-cassandra-driver: 8/8 passedpy312-test-instrumentation-cassandra-scylla: 8/8 passedtox -e generateandtox -e generate-workflowsto regenerate filesDoes This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.