[Hackathon] otel-instrumentation#5273
Draft
supersven wants to merge 14 commits into
Draft
Conversation
Services automatically connect to it.
zebot
added
the
ok-to-test
supersven
force-pushed
the
sventennie/otel
branch
from
6ad1a9d to
1952110
Compare
Attaches only to the top-level (request) span for now.
- Cassandra: Wrap all Client queries in 'cassandra.query' spans via runClientTraced
- Implemented in libs/cassandra-util/src/Cassandra/Exec.hs
- Integrated into brig, galley, cannon services
- Uses global tracer provider; spans include full query timing
- PostgreSQL: Add tracing for critical ConversationStore operations
- Implemented runStatementTraced wrapper in libs/wire-subsystems/src/Wire/Postgres.hs
- Instrumented 4 operations: delete_conversation, get_team_conversation,
get_team_conversations, delete_team_conversations
- Query names used as span identifiers (e.g., db.query.get_team_conversations)
- All services now emit OpenTelemetry spans for database operations
- Spans export to Grafana Tempo for distributed tracing and performance analysis
Comment on lines
+182
to
+213
| runClientTraced :: ClientState -> Client a -> IO a | ||
| runClientTraced st action = do | ||
| tp <- getGlobalTracerProvider | ||
| let tracer = makeTracer tp "cassandra" tracerOptions | ||
| inSpan tracer "cassandra.query" defaultSpanArguments $ runClient st action | ||
|
|
||
| cqlSpanArgs :: PrepQuery k a b -> SpanArguments | ||
| cqlSpanArgs q = | ||
| let QueryString cql = queryString q | ||
| in defaultSpanArguments | ||
| { attributes = HashMap.fromList [("db.statement", toAttribute (LT.toStrict cql))] } | ||
|
|
||
| -- | Like 'query' but adds a 'db.statement' OTel span attribute with the CQL template. | ||
| queryTraced :: (MonadClient m, Tuple a, Tuple b) => PrepQuery R a b -> QueryParams a -> m [b] | ||
| queryTraced q p = liftClient $ do | ||
| tp <- liftIO getGlobalTracerProvider | ||
| let tracer = makeTracer tp "cassandra" tracerOptions | ||
| inSpan tracer "cassandra.query" (cqlSpanArgs q) $ query q p | ||
|
|
||
| -- | Like 'query1' but adds a 'db.statement' OTel span attribute with the CQL template. | ||
| query1Traced :: (MonadClient m, Tuple a, Tuple b) => PrepQuery R a b -> QueryParams a -> m (Maybe b) | ||
| query1Traced q p = liftClient $ do | ||
| tp <- liftIO getGlobalTracerProvider | ||
| let tracer = makeTracer tp "cassandra" tracerOptions | ||
| inSpan tracer "cassandra.query" (cqlSpanArgs q) $ query1 q p | ||
|
|
||
| -- | Like 'write' but adds a 'db.statement' OTel span attribute with the CQL template. | ||
| writeTraced :: (MonadClient m, Tuple a) => PrepQuery W a () -> QueryParams a -> m () | ||
| writeTraced q p = liftClient $ do | ||
| tp <- liftIO getGlobalTracerProvider | ||
| let tracer = makeTracer tp "cassandra" tracerOptions | ||
| inSpan tracer "cassandra.query" (cqlSpanArgs q) $ write q p |
Member
There was a problem hiding this comment.
instead of ...Traced variants of these functions, it'd be nice to default to the Traced variants, so rest of the code doesn't have to choose between calling query1 and query1Traced, the queries should always be traced.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Checklist
changelog.d