Skip to content

Commit 9afeab6

Browse files
authored
Fix lettuce latest dep tests (#15428)
1 parent 1951761 commit 9afeab6

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@
66
package io.opentelemetry.instrumentation.lettuce.v5_1;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
9-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10-
import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
11-
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX;
129

1310
import io.lettuce.core.RedisClient;
1411
import io.lettuce.core.api.StatefulRedisConnection;
15-
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1612
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
1713
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1814
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
1915
import io.opentelemetry.sdk.trace.data.SpanData;
20-
import java.util.ArrayList;
2116
import java.util.Arrays;
2217
import java.util.List;
2318
import org.junit.jupiter.api.TestInstance;
@@ -88,17 +83,8 @@ private ContainerConnection(StatefulRedisConnection<String, String> connection,
8883
}
8984
}
9085

91-
@SuppressWarnings("deprecation") // using deprecated semconv
9286
protected static List<AttributeAssertion> addExtraAttributes(AttributeAssertion... assertions) {
93-
List<AttributeAssertion> result = new ArrayList<>(Arrays.asList(assertions));
94-
if (Boolean.getBoolean("testLatestDeps")) {
95-
if (SemconvStability.emitStableDatabaseSemconv()) {
96-
result.add(equalTo(DB_NAMESPACE, "0"));
97-
} else {
98-
result.add(equalTo(DB_REDIS_DATABASE_INDEX, 0));
99-
}
100-
}
101-
return result;
87+
return Arrays.asList(assertions);
10288
}
10389

10490
protected static void assertCommandEncodeEvents(SpanData span) {

0 commit comments

Comments
 (0)