Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(parser/cassandra): propagate request context in query span extraction (#19988)

Vincent Huangc5467f9d16dc
diff --git a/backend/plugin/parser/cassandra/query_span.go b/backend/plugin/parser/cassandra/query_span.go
index 704cbaffc0..bb604d05bb 100644
--- a/backend/plugin/parser/cassandra/query_span.go
+++ b/backend/plugin/parser/cassandra/query_span.go
@@ -15,7 +15,7 @@ func init() {
}
// GetQuerySpan extracts the query span from a CQL statement.
-func GetQuerySpan(_ context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, _ string, _ bool) (*base.QuerySpan, error) {
+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, _ string, _ bool) (*base.QuerySpan, error) {
parseResults, err := ParseCassandraSQL(stmt.Text)
if err != nil {
return nil, err
@@ -33,7 +33,7 @@ func GetQuerySpan(_ context.Context, gCtx base.GetQuerySpanContext, stmt base.St
tree := parseResults[0].Tree
// Create extractor and walk the tree
- extractor := newQuerySpanExtractor(database, gCtx)
+ extractor := newQuerySpanExtractor(ctx, database, gCtx)
antlr.ParseTreeWalkerDefault.Walk(extractor, tree)
if extractor.err != nil {
diff --git a/backend/plugin/parser/cassandra/query_span_extractor.go b/backend/plugin/parser/cassandra/query_span_extractor.go
index 03e8c35e54..859c190851 100644
--- a/backend/plugin/parser/cassandra/query_span_extractor.go
+++ b/backend/plugin/parser/cassandra/query_span_extractor.go
@@ -15,6 +15,7 @@ type querySpanExtractor struct {
*cql.BaseCqlParserListener
// Context
+ ctx context.Context
defaultKeyspace string
gCtx base.GetQuerySpanContext
@@ -33,9 +34,10 @@ func unquoteIdentifier(identifier string) string {
return identifier
}
-func newQuerySpanExtractor(defaultKeyspace string, gCtx base.GetQuerySpanContext) *querySpanExtractor {
+func newQuerySpanExtractor(ctx context.Context, defaultKeyspace string, gCtx base.GetQuerySpanContext) *querySpanExtractor {
return &querySpanExtractor{
BaseCqlParserListener: &cql.BaseCqlParserListener{},
+ ctx: ctx,
defaultKeyspace: defaultKeyspace,
gCtx: gCtx,
querySpan: &base.QuerySpan{
@@ -180,8 +182,7 @@ func (e *querySpanExtractor) expandSelectAsterisk(keyspace, table string) []base
}}
}
- ctx := context.Background()
- _, metadata, err := e.gCtx.GetDatabaseMetadataFunc(ctx, e.gCtx.InstanceID, keyspace)
+ _, metadata, err := e.gCtx.GetDatabaseMetadataFunc(e.ctx, e.gCtx.InstanceID, keyspace)
if err != nil || metadata == nil {
// If we can't get metadata, fall back to SelectAsterisk flag
// This matches behavior of other engines like TSQL