Skip to content

Commit c07aa44

Browse files
committed
Handle lettuce 5.1 db.namespace conditionally based on semconv opt-in
1 parent 74d07f1 commit c07aa44

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java

+5
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,11 @@ public synchronized Tracer.Span tag(String key, String value) {
313313
argsString = value;
314314
return this;
315315
}
316+
if (key.equals("db.namespace") && SemconvStability.emitOldDatabaseSemconv()) {
317+
key = "db.name";
318+
} else if (key.equals("db.name") && SemconvStability.emitStableDatabaseSemconv()) {
319+
key = "db.namespace";
320+
}
316321
if (span != null) {
317322
span.setAttribute(key, value);
318323
} else {

instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.instrumentation.lettuce.v5_1;
77

8+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
89
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
910
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAMESPACE;
1011

@@ -83,7 +84,7 @@ private ContainerConnection(StatefulRedisConnection<String, String> connection,
8384
protected static List<AttributeAssertion> addExtraAttributes(AttributeAssertion... assertions) {
8485
List<AttributeAssertion> result = new ArrayList<>(Arrays.asList(assertions));
8586
if (Boolean.getBoolean("testLatestDeps")) {
86-
result.add(equalTo(DB_NAMESPACE, "0"));
87+
result.add(equalTo(maybeStable(DB_NAMESPACE), "0"));
8788
}
8889
return result;
8990
}

0 commit comments

Comments
 (0)