Skip to content

Commit 33baad6

Browse files
authored
Review fixes for jedis-3.0:javaagent (#18069)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 402e62e commit 33baad6

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1515
import io.opentelemetry.javaagent.instrumentation.jedis.JedisRequestContext;
16+
import javax.annotation.Nullable;
1617
import net.bytebuddy.asm.Advice;
1718
import net.bytebuddy.description.type.TypeDescription;
1819
import net.bytebuddy.matcher.ElementMatcher;
@@ -54,7 +55,8 @@ public static JedisRequestContext<JedisRequest> onEnter() {
5455
}
5556

5657
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
57-
public static void onExit(@Advice.Enter JedisRequestContext<JedisRequest> requestContext) {
58+
public static void onExit(
59+
@Advice.Enter @Nullable JedisRequestContext<JedisRequest> requestContext) {
5860
if (requestContext != null) {
5961
requestContext.detachAndEnd();
6062
}

instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@
4343
@SuppressWarnings("deprecation") // using deprecated semconv
4444
class Jedis30ClientTest {
4545
@RegisterExtension
46-
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
46+
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
4747

48-
static GenericContainer<?> redisServer =
48+
private static final GenericContainer<?> redisServer =
4949
new GenericContainer<>("redis:6.2.3-alpine").withExposedPorts(6379);
5050

51-
static String host;
51+
private static String host;
5252

53-
static String ip;
53+
private static String ip;
5454

55-
static int port;
55+
private static int port;
5656

57-
static Jedis jedis;
57+
private static Jedis jedis;
5858

5959
@BeforeAll
6060
static void setup() throws UnknownHostException {

0 commit comments

Comments
 (0)