Skip to content

Make db.statement available to samplers in Lettuce instrumentation #14856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 3, 2025
Merged

Make db.statement available to samplers in Lettuce instrumentation #14856

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb01aa3
Make db.statement available to samplers in Lettuce instrumentation
trask Oct 1, 2025
9642cf4
./gradlew spotlessApply
otelbot[bot] Oct 1, 2025
49e5645
format
trask Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 30 additions & 17 deletions ...ary/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ private void fillEndpoint(OpenTelemetryEndpoint endpoint) {
@CanIgnoreReturnValue
@SuppressWarnings({"UnusedMethod", "EffectivelyPrivate"})
public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
// Extract args BEFORE calling start() so db.statement can include them
// when it's set on SpanBuilder (making it available to samplers)
if (command.getArgs() != null) {
argsList = OtelCommandArgsUtil.getCommandArgs(command.getArgs());
}

start();
long startNanos = System.nanoTime();

Expand All @@ -280,10 +286,6 @@ public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
}
span.updateName(command.getType().toString());

if (command.getArgs() != null) {
argsList = OtelCommandArgsUtil.getCommandArgs(command.getArgs());
}

if (command instanceof CompleteableCommand) {
CompleteableCommand<?> completeableCommand = (CompleteableCommand<?>) command;
completeableCommand.onComplete(
Expand Down Expand Up @@ -311,8 +313,27 @@ public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
@Override
@CanIgnoreReturnValue
public synchronized Tracer.Span start() {
// Set db.statement on SpanBuilder before starting span so it's available to samplers
if (name != null) {
String statement =
sanitizer.sanitize(name, argsList != null ? argsList : splitArgs(argsString));
if (statement != null) {
if (SemconvStability.emitStableDatabaseSemconv()) {
spanBuilder.setAttribute(DB_QUERY_TEXT, statement);
attributesBuilder.put(DB_QUERY_TEXT, statement);
}
if (SemconvStability.emitOldDatabaseSemconv()) {
spanBuilder.setAttribute(DB_STATEMENT, statement);
attributesBuilder.put(DB_STATEMENT, statement);
}
}
}

span = spanBuilder.startSpan();
spanStartNanos = System.nanoTime();
// Note: Span name cannot be set on SpanBuilder because it's set during
// tracer.spanBuilder(name) call in nextSpan(), and we don't know the actual command name at
// that point. We have to update the name after the span starts.
if (name != null) {
span.updateName(name);
}
Expand Down Expand Up @@ -401,19 +422,11 @@ public synchronized void finish() {
}

private void finish(Span span, long startTime) {
if (name != null) {
String statement =
sanitizer.sanitize(name, argsList != null ? argsList : splitArgs(argsString));
if (SemconvStability.emitStableDatabaseSemconv()) {
span.setAttribute(DB_QUERY_TEXT, statement);
metrics.onEnd(
metrics.onStart(Context.current(), Attributes.empty(), startTime),
attributesBuilder.build(),
System.nanoTime());
}
if (SemconvStability.emitOldDatabaseSemconv()) {
span.setAttribute(DB_STATEMENT, statement);
}
if (SemconvStability.emitStableDatabaseSemconv()) {
metrics.onEnd(
metrics.onStart(Context.current(), Attributes.empty(), startTime),
attributesBuilder.build(),
System.nanoTime());
}
span.end();
}
Expand Down