diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonRequest.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonRequest.java index 2bf432f4b0df..084bd9e026e6 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonRequest.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonRequest.java @@ -49,6 +49,8 @@ public String getOperation() { CommandsData commandsData = (CommandsData) command; if (commandsData.getCommands().size() == 1) { return commandsData.getCommands().get(0).getCommand().getName(); + } else { + return "BATCH"; } } return null; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 2d266085ee6a..9803d4f09bd8 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -225,7 +225,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo trace.hasSpansSatisfyingExactly( span -> span.hasName("parent").hasKind(INTERNAL).hasNoParent(), span -> - span.hasName("DB Query") + span.hasName("BATCH") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( equalTo(NETWORK_TYPE, "ipv4"), diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index 26caaca0e421..5fdae881b47d 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -166,7 +166,7 @@ void batchCommand() trace -> trace.hasSpansSatisfyingExactly( span -> - span.hasName("DB Query") + span.hasName("BATCH") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( equalTo(NETWORK_TYPE, "ipv4"), @@ -206,7 +206,7 @@ void atomicBatchCommand() { trace.hasSpansSatisfyingExactly( span -> span.hasName("parent").hasNoParent().hasKind(INTERNAL), span -> - span.hasName("DB Query") + span.hasName("BATCH") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( equalTo(NETWORK_TYPE, "ipv4"),