cassandra-driver Instrumentation #1280
Open
Conversation
This file contains 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
🦙 MegaLinter status: ✅ SUCCESS
See detailed report in MegaLinter reports MegaLinter is graciously provided by |
TimPansino
force-pushed
the
feature-cassandra
branch
from
85611c7 to
7d5ea09
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1280 +/- ##
==========================================
- Coverage 81.28% 81.25% -0.03%
==========================================
Files 201 202 +1
Lines 22174 22223 +49
Branches 3519 3526 +7
==========================================
+ Hits 18024 18058 +34
- Misses 2982 2993 +11
- Partials 1168 1172 +4 ☔ View full report in Codecov by Sentry. |
TimPansino
force-pushed
the
feature-cassandra
branch
from
d2fe1f3 to
676ad40
Compare
TimPansino
changed the title
TimPansino
force-pushed
the
feature-cassandra
branch
from
13c3265 to
369e2c3
Compare
TimPansino
changed the title
hmstepanek
approved these changes
Jan 25, 2025
| # the result. We can therefore just instrument execute_async() and achieve full sync/async coverage. | ||
| # If this changes in the future we'll need an additional wrapper, but care should be taken not to double wrap. | ||
| wrap_function_wrapper(module, "Session.execute_async", wrap_Session_execute_async) | ||
| wrap_function_wrapper(module, "Session.execute", wrap_Session_execute_async) # TODO check this |
There was a problem hiding this comment.
Should we remove this wrapper then given the above comment about only needing to wrap execute_async?
| # Exit early there's no transaction, or if we're under an existing DatabaseTrace | ||
| return wrapped(*args, **kwargs) | ||
|
|
||
| bound_args = bind_args(wrapped, args, kwargs) |
There was a problem hiding this comment.
So glad we made this-I use it all the time now!
| sql = bound_args.get("query", None) | ||
| if not isinstance(sql, str): | ||
| statement = getattr(sql, "prepared_statement", sql) # Unbind BoundStatement | ||
| sql = statement.query_string # Unpack query from SimpleStatement and PreparedStatement |
There was a problem hiding this comment.
Should we use a getattr here in case this attribute doesn't exist?
|
|
||
| database_name = getattr(instance, "keyspace", None) | ||
|
|
||
| # hosts = instance.cluster.metadata.all_hosts() |
There was a problem hiding this comment.
Suggested change
| # hosts = instance.cluster.metadata.all_hosts() |
| database_name = getattr(instance, "keyspace", None) | ||
|
|
||
| # hosts = instance.cluster.metadata.all_hosts() | ||
| # breakpoint() |
There was a problem hiding this comment.
Suggested change
| # breakpoint() |
| ): | ||
| return wrapped(*args, **kwargs) | ||
|
|
||
| return wrapped(*args, **kwargs) |
| # Cassandra isn't DBAPI2 compliant, but we need the DatabaseTrace to function properly. We can set parameters | ||
| # for CQL parsing and the product name here, and leave the explain plan functionality unused. | ||
| global DBAPI2_MODULE | ||
| DBAPI2_MODULE = module |
There was a problem hiding this comment.
This is a little unorthodox but seems like it will work fine.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overview
cassandra-driverlibrary.