From 2e7899b405c5e849f0e602f45281be9dfdca0b7a Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 26 Jul 2018 16:02:36 +1000 Subject: [PATCH] redis --- .../jedis/JedisInstrumentation.java | 5 +- .../src/test/groovy/JedisClientTest.groovy | 4 ++ .../lettuce/ConnectionFutureAdvice.java | 3 +- .../lettuce/LettuceAsyncCommandsAdvice.java | 7 +-- .../rx/LettuceFluxTerminationRunnable.java | 15 +++--- .../lettuce/rx/LettuceMonoDualConsumer.java | 9 ++-- .../test/groovy/LettuceAsyncClientTest.groovy | 50 ++++++++++--------- .../groovy/LettuceReactiveClientTest.groovy | 34 +++++++------ .../test/groovy/LettuceSyncClientTest.groovy | 46 +++++++++-------- 9 files changed, 95 insertions(+), 78 deletions(-) diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index c32a2a611b..d94e8c2c40 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -9,6 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; import io.opentracing.Span; @@ -48,7 +49,7 @@ public final class JedisInstrumentation extends Instrumenter.Default { @Override public Map transformers() { - Map transformers = new HashMap<>(); + final Map transformers = new HashMap<>(); transformers.put( isMethod() .and(isPublic()) @@ -72,7 +73,7 @@ public final class JedisInstrumentation extends Instrumenter.Default { span.setTag(DDTags.RESOURCE_NAME, command.name()); span.setTag(DDTags.SERVICE_NAME, SERVICE_NAME); - span.setTag(DDTags.SPAN_TYPE, SERVICE_NAME); + span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS); return scope; } diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy index b7a9eae56c..e5ca40cd80 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy @@ -1,5 +1,6 @@ import datadog.opentracing.DDSpan import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags import datadog.trace.instrumentation.jedis.JedisInstrumentation import io.opentracing.tag.Tags @@ -47,6 +48,7 @@ class JedisClientTest extends AgentTestRunner { setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME setTrace.getOperationName() == "redis.query" setTrace.getResourceName() == "SET" + setTrace.getSpanType() == DDSpanTypes.REDIS setTrace.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME setTrace.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME setTrace.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT @@ -66,6 +68,7 @@ class JedisClientTest extends AgentTestRunner { getSpan.getServiceName() == JedisInstrumentation.SERVICE_NAME getSpan.getOperationName() == "redis.query" getSpan.getResourceName() == "GET" + getSpan.getSpanType() == DDSpanTypes.REDIS getSpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME getSpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME getSpan.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT @@ -85,6 +88,7 @@ class JedisClientTest extends AgentTestRunner { randomKeySpan.getServiceName() == JedisInstrumentation.SERVICE_NAME randomKeySpan.getOperationName() == "redis.query" randomKeySpan.getResourceName() == "RANDOMKEY" + randomKeySpan.getSpanType() == DDSpanTypes.REDIS randomKeySpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME randomKeySpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME randomKeySpan.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java index 999f58e436..2c29275d5f 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce; import static io.opentracing.log.Fields.ERROR_OBJECT; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.lettuce.core.ConnectionFuture; import io.lettuce.core.RedisURI; @@ -33,7 +34,7 @@ public class ConnectionFutureAdvice { span.setTag("db.redis.dbIndex", redisURI.getDatabase()); span.setTag(DDTags.RESOURCE_NAME, "CONNECT:" + url); span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); - span.setTag(DDTags.SPAN_TYPE, LettuceInstrumentationUtil.SERVICE_NAME); + span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS); return scope; } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java index 9ee2a9f54d..883fe6d94d 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce; import static io.opentracing.log.Fields.ERROR_OBJECT; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.lettuce.core.protocol.AsyncCommand; import io.lettuce.core.protocol.RedisCommand; @@ -16,7 +17,7 @@ public class LettuceAsyncCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static Scope startSpan(@Advice.Argument(0) final RedisCommand command) { - String commandName = LettuceInstrumentationUtil.getCommandName(command); + final String commandName = LettuceInstrumentationUtil.getCommandName(command); final Scope scope = GlobalTracer.get() @@ -31,7 +32,7 @@ public class LettuceAsyncCommandsAdvice { span.setTag( DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(commandName)); span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); - span.setTag(DDTags.SPAN_TYPE, LettuceInstrumentationUtil.SERVICE_NAME); + span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS); return scope; } @@ -52,7 +53,7 @@ public class LettuceAsyncCommandsAdvice { return; } - String commandName = LettuceInstrumentationUtil.getCommandName(command); + final String commandName = LettuceInstrumentationUtil.getCommandName(command); // close spans on error or normal completion if (!LettuceInstrumentationUtil.doFinishSpanEarly(commandName)) { asyncCommand.handleAsync(new LettuceAsyncBiFunction<>(scope.span())); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java index 982f013d4b..3d776e625a 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce.rx; import static io.opentracing.log.Fields.ERROR_OBJECT; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil; import io.opentracing.Scope; @@ -22,7 +23,7 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl private int numResults = 0; private FluxOnSubscribeConsumer onSubscribeConsumer = null; - public LettuceFluxTerminationRunnable(String commandName, boolean finishSpanOnClose) { + public LettuceFluxTerminationRunnable(final String commandName, final boolean finishSpanOnClose) { this.onSubscribeConsumer = new FluxOnSubscribeConsumer(this, commandName, finishSpanOnClose); } @@ -30,7 +31,7 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl return onSubscribeConsumer; } - private void finishSpan(boolean isCommandCancelled, Throwable throwable) { + private void finishSpan(final boolean isCommandCancelled, final Throwable throwable) { if (this.span != null) { this.span.setTag("db.command.results.count", this.numResults); if (isCommandCancelled) { @@ -50,7 +51,7 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl } @Override - public void accept(Signal signal) { + public void accept(final Signal signal) { if (SignalType.ON_COMPLETE.equals(signal.getType()) || SignalType.ON_ERROR.equals(signal.getType())) { finishSpan(false, signal.getThrowable()); @@ -78,14 +79,16 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl private final boolean finishSpanOnClose; public FluxOnSubscribeConsumer( - LettuceFluxTerminationRunnable owner, String commandName, boolean finishSpanOnClose) { + final LettuceFluxTerminationRunnable owner, + final String commandName, + final boolean finishSpanOnClose) { this.owner = owner; this.commandName = commandName; this.finishSpanOnClose = finishSpanOnClose; } @Override - public void accept(Subscription subscription) { + public void accept(final Subscription subscription) { final Scope scope = GlobalTracer.get() .buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query") @@ -103,7 +106,7 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(this.commandName)); span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); - span.setTag(DDTags.SPAN_TYPE, LettuceInstrumentationUtil.SERVICE_NAME); + span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS); scope.close(); } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java index dd8c46b33b..c69658d67c 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce.rx; import static io.opentracing.log.Fields.ERROR_OBJECT; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil; import io.opentracing.Scope; @@ -21,13 +22,13 @@ public class LettuceMonoDualConsumer private final String commandName; private final boolean finishSpanOnClose; - public LettuceMonoDualConsumer(String commandName, boolean finishSpanOnClose) { + public LettuceMonoDualConsumer(final String commandName, final boolean finishSpanOnClose) { this.commandName = commandName; this.finishSpanOnClose = finishSpanOnClose; } @Override - public void accept(T t, Throwable throwable) { + public void accept(final T t, final Throwable throwable) { if (this.span != null) { if (throwable != null) { Tags.ERROR.set(this.span, true); @@ -43,7 +44,7 @@ public class LettuceMonoDualConsumer } @Override - public void accept(R r) { + public void accept(final R r) { final Scope scope = GlobalTracer.get() .buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query") @@ -58,7 +59,7 @@ public class LettuceMonoDualConsumer this.span.setTag( DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(this.commandName)); this.span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); - this.span.setTag(DDTags.SPAN_TYPE, LettuceInstrumentationUtil.SERVICE_NAME); + this.span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS); scope.close(); } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy index 4acc60e13d..95ba078cbd 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.lettuce.core.ClientOptions import io.lettuce.core.ConnectionFuture import io.lettuce.core.RedisClient @@ -116,7 +118,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "CONNECT:" + dbAddr errored false @@ -129,7 +131,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "peer.hostname" HOST "peer.port" port "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -157,7 +159,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "CONNECT:" + dbAddrNonExistent errored true @@ -171,7 +173,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "peer.hostname" HOST "peer.port" incorrectPort "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -190,7 +192,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SET" errored false @@ -199,7 +201,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -229,7 +231,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -238,7 +240,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -282,7 +284,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -291,7 +293,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -321,7 +323,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "RANDOMKEY" errored false @@ -330,7 +332,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -379,7 +381,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "HMSET" errored false @@ -388,7 +390,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -396,7 +398,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "HGETALL" errored false @@ -405,7 +407,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -443,7 +445,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "DEL" errored true @@ -453,7 +455,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "db.type" "redis" errorTags(IllegalStateException, "TestException") "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -485,7 +487,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SADD" errored false @@ -495,7 +497,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "db.type" "redis" "db.command.cancelled" true "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -512,7 +514,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" errored false @@ -521,7 +523,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -539,7 +541,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SHUTDOWN" errored false @@ -548,7 +550,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy index cb1ff767b3..eedb106321 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.lettuce.core.ClientOptions import io.lettuce.core.RedisClient import io.lettuce.core.api.StatefulConnection @@ -89,7 +91,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SET" errored false @@ -98,7 +100,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -119,7 +121,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -128,7 +130,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -157,7 +159,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -166,7 +168,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -193,7 +195,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "RANDOMKEY" errored false @@ -202,7 +204,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -219,7 +221,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND" errored false @@ -229,7 +231,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "db.type" "redis" "db.command.results.count" 157 "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -246,7 +248,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND" errored false @@ -257,7 +259,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "db.command.cancelled" true "db.command.results.count" 2 "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -286,7 +288,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" errored false @@ -295,7 +297,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -312,7 +314,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SHUTDOWN" errored false @@ -321,7 +323,7 @@ class LettuceReactiveClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy index 694ef494f3..a1f2a4b8a6 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.lettuce.core.ClientOptions import io.lettuce.core.RedisClient import io.lettuce.core.RedisConnectionException @@ -96,7 +98,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "CONNECT:" + dbAddr errored false @@ -109,7 +111,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "peer.hostname" HOST "peer.port" port "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -134,7 +136,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "CONNECT:" + dbAddrNonExistent errored true @@ -148,7 +150,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "peer.hostname" HOST "peer.port" incorrectPort "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -166,7 +168,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SET" errored false @@ -175,7 +177,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -193,7 +195,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -202,7 +204,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -220,7 +222,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "GET" errored false @@ -229,7 +231,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -247,7 +249,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "RANDOMKEY" errored false @@ -256,7 +258,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -274,7 +276,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "LPUSH" errored false @@ -283,7 +285,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -301,7 +303,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "HMSET" errored false @@ -310,7 +312,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -328,7 +330,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "HGETALL" errored false @@ -337,7 +339,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -354,7 +356,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" errored false @@ -363,7 +365,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } } @@ -380,7 +382,7 @@ class LettuceSyncClientTest extends AgentTestRunner { span(0) { serviceName "redis" operationName "redis.query" - spanType "redis" + spanType DDSpanTypes.REDIS resourceName "SHUTDOWN" errored false @@ -389,7 +391,7 @@ class LettuceSyncClientTest extends AgentTestRunner { "component" "redis-client" "db.type" "redis" "span.kind" "client" - "span.type" "redis" + "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS } } }