Skip to content

Commit fd97a7a

Browse files
otelbot[bot]Copilottrask
authored
Review fixes for lettuce-5.1:javaagent (open-telemetry#18176)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: trask <218610+trask@users.noreply.github.com>
1 parent fd58970 commit fd97a7a

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/ClientResourcesInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public static class BuilderAdvice {
4040

4141
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
4242
public static void onExit(@Advice.Return ClientResources.Builder builder) {
43-
if (CompatibilityChecker.checkCompatible()) {
44-
builder.tracing(TracingHolder.TRACING);
43+
if (CompatibilityChecker.isCompatible()) {
44+
builder.tracing(TracingHolder.tracing());
4545
}
4646
}
4747
}

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/CompatibilityChecker.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
public class CompatibilityChecker {
1111

12-
private static final boolean isCompatible = isCompatible();
12+
private static final boolean IS_COMPATIBLE = computeCompatibility();
1313

14-
private static boolean isCompatible() {
14+
private static boolean computeCompatibility() {
1515
try {
1616
Tracing.getContext();
1717
return true;
@@ -23,8 +23,8 @@ private static boolean isCompatible() {
2323
// related to https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/10997
2424
// if users are using incompatible versions of reactor-core and lettuce
2525
// then just disable the instrumentation
26-
public static boolean checkCompatible() {
27-
return isCompatible;
26+
public static boolean isCompatible() {
27+
return IS_COMPATIBLE;
2828
}
2929

3030
private CompatibilityChecker() {}

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/TracingHolder.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ public class TracingHolder {
1818
.get("command_encoding_events/development")
1919
.getBoolean("enabled", false);
2020

21-
public static final Tracing TRACING =
21+
private static final Tracing tracing =
2222
LettuceTelemetry.builder(GlobalOpenTelemetry.get())
2323
.setQuerySanitizationEnabled(
2424
DbConfig.isQuerySanitizationEnabled(GlobalOpenTelemetry.get(), "lettuce"))
2525
.setEncodingSpanEventsEnabled(CAPTURE_COMMAND_ENCODING_EVENTS)
2626
.build()
2727
.createTracing();
2828

29+
public static Tracing tracing() {
30+
return tracing;
31+
}
32+
2933
private TracingHolder() {}
3034
}

0 commit comments

Comments
 (0)