Skip to content

Commit b7a2f1d

Browse files
committed
fixup! Capture db.namespace in the db attributes getter
1 parent 535b06f commit b7a2f1d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
1111
import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer;
12+
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1213
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1314
import javax.annotation.Nullable;
1415

@@ -34,7 +35,10 @@ public String getUser(VertxRedisClientRequest request) {
3435
@Override
3536
@Nullable
3637
public String getDbNamespace(VertxRedisClientRequest request) {
37-
return String.valueOf(request.getDatabaseIndex());
38+
if (SemconvStability.emitStableDatabaseSemconv()) {
39+
return String.valueOf(request.getDatabaseIndex());
40+
}
41+
return null;
3842
}
3943

4044
@Deprecated

instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientSingletons.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import io.opentelemetry.context.Context;
1010
import io.opentelemetry.context.Scope;
1111
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
12-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
1312
import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor;
1413
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1514
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
@@ -37,7 +36,7 @@ public final class VertxRedisClientSingletons {
3736

3837
static {
3938
SpanNameExtractor<VertxRedisClientRequest> spanNameExtractor =
40-
DbClientSpanNameExtractor.create(VertxRedisClientAttributesGetter.INSTANCE);
39+
VertxRedisClientRequest::getCommand;
4140

4241
InstrumenterBuilder<VertxRedisClientRequest, Void> builder =
4342
Instrumenter.<VertxRedisClientRequest, Void>builder(

0 commit comments

Comments
 (0)