open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

redis

This commit is contained in:
Tyler Benson 2018-07-26 16:02:36 +10:00
parent 561eb0fcd9
commit 2e7899b405
9 changed files with 95 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
View File

@ -9,6 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -48,7 +49,7 @@ public final class JedisInstrumentation extends Instrumenter.Default {
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();
transformers.put( transformers.put(
isMethod() isMethod()
.and(isPublic()) .and(isPublic())
@ -72,7 +73,7 @@ public final class JedisInstrumentation extends Instrumenter.Default {
span.setTag(DDTags.RESOURCE_NAME, command.name()); span.setTag(DDTags.RESOURCE_NAME, command.name());
span.setTag(DDTags.SERVICE_NAME, SERVICE_NAME); span.setTag(DDTags.SERVICE_NAME, SERVICE_NAME);
span.setTag(DDTags.SPAN_TYPE, SERVICE_NAME); span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.REDIS);
return scope; return scope;
} }

4
dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy
View File

@ -1,5 +1,6 @@
import datadog.opentracing.DDSpan import datadog.opentracing.DDSpan
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.jedis.JedisInstrumentation import datadog.trace.instrumentation.jedis.JedisInstrumentation
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
@ -47,6 +48,7 @@ class JedisClientTest extends AgentTestRunner {
setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME
setTrace.getOperationName() == "redis.query" setTrace.getOperationName() == "redis.query"
setTrace.getResourceName() == "SET" setTrace.getResourceName() == "SET"
setTrace.getSpanType() == DDSpanTypes.REDIS
setTrace.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME setTrace.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME
setTrace.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME setTrace.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME
setTrace.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT 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.getServiceName() == JedisInstrumentation.SERVICE_NAME
getSpan.getOperationName() == "redis.query" getSpan.getOperationName() == "redis.query"
getSpan.getResourceName() == "GET" getSpan.getResourceName() == "GET"
getSpan.getSpanType() == DDSpanTypes.REDIS
getSpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME getSpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME
getSpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME getSpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME
getSpan.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT 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.getServiceName() == JedisInstrumentation.SERVICE_NAME
randomKeySpan.getOperationName() == "redis.query" randomKeySpan.getOperationName() == "redis.query"
randomKeySpan.getResourceName() == "RANDOMKEY" randomKeySpan.getResourceName() == "RANDOMKEY"
randomKeySpan.getSpanType() == DDSpanTypes.REDIS
randomKeySpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME randomKeySpan.getTags().get(Tags.COMPONENT.getKey()) == JedisInstrumentation.COMPONENT_NAME
randomKeySpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME randomKeySpan.getTags().get(Tags.DB_TYPE.getKey()) == JedisInstrumentation.SERVICE_NAME
randomKeySpan.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT randomKeySpan.getTags().get(Tags.SPAN_KIND.getKey()) == Tags.SPAN_KIND_CLIENT

3
dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java
View File

@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.lettuce.core.ConnectionFuture; import io.lettuce.core.ConnectionFuture;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
@ -33,7 +34,7 @@ public class ConnectionFutureAdvice {
span.setTag("db.redis.dbIndex", redisURI.getDatabase()); span.setTag("db.redis.dbIndex", redisURI.getDatabase());
span.setTag(DDTags.RESOURCE_NAME, "CONNECT:" + url); span.setTag(DDTags.RESOURCE_NAME, "CONNECT:" + url);
span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); 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; return scope;
} }

7
dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java
View File

@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.lettuce.core.protocol.AsyncCommand; import io.lettuce.core.protocol.AsyncCommand;
import io.lettuce.core.protocol.RedisCommand; import io.lettuce.core.protocol.RedisCommand;
@ -16,7 +17,7 @@ public class LettuceAsyncCommandsAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope startSpan(@Advice.Argument(0) final RedisCommand command) { public static Scope startSpan(@Advice.Argument(0) final RedisCommand command) {
String commandName = LettuceInstrumentationUtil.getCommandName(command); final String commandName = LettuceInstrumentationUtil.getCommandName(command);
final Scope scope = final Scope scope =
GlobalTracer.get() GlobalTracer.get()
@ -31,7 +32,7 @@ public class LettuceAsyncCommandsAdvice {
span.setTag( span.setTag(
DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(commandName)); DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(commandName));
span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); 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; return scope;
} }
@ -52,7 +53,7 @@ public class LettuceAsyncCommandsAdvice {
return; return;
} }
String commandName = LettuceInstrumentationUtil.getCommandName(command); final String commandName = LettuceInstrumentationUtil.getCommandName(command);
// close spans on error or normal completion // close spans on error or normal completion
if (!LettuceInstrumentationUtil.doFinishSpanEarly(commandName)) { if (!LettuceInstrumentationUtil.doFinishSpanEarly(commandName)) {
asyncCommand.handleAsync(new LettuceAsyncBiFunction<>(scope.span())); asyncCommand.handleAsync(new LettuceAsyncBiFunction<>(scope.span()));

15
dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java
View File

@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce.rx;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil; import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil;
import io.opentracing.Scope; import io.opentracing.Scope;
@ -22,7 +23,7 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal>, Runnabl
private int numResults = 0; private int numResults = 0;
private FluxOnSubscribeConsumer onSubscribeConsumer = null; 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); this.onSubscribeConsumer = new FluxOnSubscribeConsumer(this, commandName, finishSpanOnClose);
} }
@ -30,7 +31,7 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal>, Runnabl
return onSubscribeConsumer; return onSubscribeConsumer;
} }
private void finishSpan(boolean isCommandCancelled, Throwable throwable) { private void finishSpan(final boolean isCommandCancelled, final Throwable throwable) {
if (this.span != null) { if (this.span != null) {
this.span.setTag("db.command.results.count", this.numResults); this.span.setTag("db.command.results.count", this.numResults);
if (isCommandCancelled) { if (isCommandCancelled) {
@ -50,7 +51,7 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal>, Runnabl
} }
@Override @Override
public void accept(Signal signal) { public void accept(final Signal signal) {
if (SignalType.ON_COMPLETE.equals(signal.getType()) if (SignalType.ON_COMPLETE.equals(signal.getType())
|| SignalType.ON_ERROR.equals(signal.getType())) { || SignalType.ON_ERROR.equals(signal.getType())) {
finishSpan(false, signal.getThrowable()); finishSpan(false, signal.getThrowable());
@ -78,14 +79,16 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal>, Runnabl
private final boolean finishSpanOnClose; private final boolean finishSpanOnClose;
public FluxOnSubscribeConsumer( public FluxOnSubscribeConsumer(
LettuceFluxTerminationRunnable owner, String commandName, boolean finishSpanOnClose) { final LettuceFluxTerminationRunnable owner,
final String commandName,
final boolean finishSpanOnClose) {
this.owner = owner; this.owner = owner;
this.commandName = commandName; this.commandName = commandName;
this.finishSpanOnClose = finishSpanOnClose; this.finishSpanOnClose = finishSpanOnClose;
} }
@Override @Override
public void accept(Subscription subscription) { public void accept(final Subscription subscription) {
final Scope scope = final Scope scope =
GlobalTracer.get() GlobalTracer.get()
.buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query") .buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query")
@ -103,7 +106,7 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal>, Runnabl
DDTags.RESOURCE_NAME, DDTags.RESOURCE_NAME,
LettuceInstrumentationUtil.getCommandResourceName(this.commandName)); LettuceInstrumentationUtil.getCommandResourceName(this.commandName));
span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); 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(); scope.close();
} }
} }

9
dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java
View File

@ -2,6 +2,7 @@ package datadog.trace.instrumentation.lettuce.rx;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil; import datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil;
import io.opentracing.Scope; import io.opentracing.Scope;
@ -21,13 +22,13 @@ public class LettuceMonoDualConsumer<R, T, U extends Throwable>
private final String commandName; private final String commandName;
private final boolean finishSpanOnClose; private final boolean finishSpanOnClose;
public LettuceMonoDualConsumer(String commandName, boolean finishSpanOnClose) { public LettuceMonoDualConsumer(final String commandName, final boolean finishSpanOnClose) {
this.commandName = commandName; this.commandName = commandName;
this.finishSpanOnClose = finishSpanOnClose; this.finishSpanOnClose = finishSpanOnClose;
} }
@Override @Override
public void accept(T t, Throwable throwable) { public void accept(final T t, final Throwable throwable) {
if (this.span != null) { if (this.span != null) {
if (throwable != null) { if (throwable != null) {
Tags.ERROR.set(this.span, true); Tags.ERROR.set(this.span, true);
@ -43,7 +44,7 @@ public class LettuceMonoDualConsumer<R, T, U extends Throwable>
} }
@Override @Override
public void accept(R r) { public void accept(final R r) {
final Scope scope = final Scope scope =
GlobalTracer.get() GlobalTracer.get()
.buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query") .buildSpan(LettuceInstrumentationUtil.SERVICE_NAME + ".query")
@ -58,7 +59,7 @@ public class LettuceMonoDualConsumer<R, T, U extends Throwable>
this.span.setTag( this.span.setTag(
DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(this.commandName)); DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(this.commandName));
this.span.setTag(DDTags.SERVICE_NAME, LettuceInstrumentationUtil.SERVICE_NAME); 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(); scope.close();
} }
} }

50
dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils 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.ClientOptions
import io.lettuce.core.ConnectionFuture import io.lettuce.core.ConnectionFuture
import io.lettuce.core.RedisClient import io.lettuce.core.RedisClient
@ -116,7 +118,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "CONNECT:" + dbAddr resourceName "CONNECT:" + dbAddr
errored false errored false
@ -129,7 +131,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"peer.hostname" HOST "peer.hostname" HOST
"peer.port" port "peer.port" port
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -157,7 +159,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "CONNECT:" + dbAddrNonExistent resourceName "CONNECT:" + dbAddrNonExistent
errored true errored true
@ -171,7 +173,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"peer.hostname" HOST "peer.hostname" HOST
"peer.port" incorrectPort "peer.port" incorrectPort
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -190,7 +192,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SET" resourceName "SET"
errored false errored false
@ -199,7 +201,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -229,7 +231,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -238,7 +240,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -282,7 +284,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -291,7 +293,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -321,7 +323,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "RANDOMKEY" resourceName "RANDOMKEY"
errored false errored false
@ -330,7 +332,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -379,7 +381,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "HMSET" resourceName "HMSET"
errored false errored false
@ -388,7 +390,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -396,7 +398,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "HGETALL" resourceName "HGETALL"
errored false errored false
@ -405,7 +407,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -443,7 +445,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "DEL" resourceName "DEL"
errored true errored true
@ -453,7 +455,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"db.type" "redis" "db.type" "redis"
errorTags(IllegalStateException, "TestException") errorTags(IllegalStateException, "TestException")
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -485,7 +487,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SADD" resourceName "SADD"
errored false errored false
@ -495,7 +497,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"db.type" "redis" "db.type" "redis"
"db.command.cancelled" true "db.command.cancelled" true
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -512,7 +514,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG"
errored false errored false
@ -521,7 +523,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -539,7 +541,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SHUTDOWN" resourceName "SHUTDOWN"
errored false errored false
@ -548,7 +550,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }

34
dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils 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.ClientOptions
import io.lettuce.core.RedisClient import io.lettuce.core.RedisClient
import io.lettuce.core.api.StatefulConnection import io.lettuce.core.api.StatefulConnection
@ -89,7 +91,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SET" resourceName "SET"
errored false errored false
@ -98,7 +100,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -119,7 +121,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -128,7 +130,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -157,7 +159,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -166,7 +168,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -193,7 +195,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "RANDOMKEY" resourceName "RANDOMKEY"
errored false errored false
@ -202,7 +204,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -219,7 +221,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND" resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND"
errored false errored false
@ -229,7 +231,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"db.type" "redis" "db.type" "redis"
"db.command.results.count" 157 "db.command.results.count" 157
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -246,7 +248,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND" resourceName AGENT_CRASHING_COMMAND_PREFIX + "COMMAND"
errored false errored false
@ -257,7 +259,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"db.command.cancelled" true "db.command.cancelled" true
"db.command.results.count" 2 "db.command.results.count" 2
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -286,7 +288,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG"
errored false errored false
@ -295,7 +297,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -312,7 +314,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SHUTDOWN" resourceName "SHUTDOWN"
errored false errored false
@ -321,7 +323,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }

46
dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils 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.ClientOptions
import io.lettuce.core.RedisClient import io.lettuce.core.RedisClient
import io.lettuce.core.RedisConnectionException import io.lettuce.core.RedisConnectionException
@ -96,7 +98,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "CONNECT:" + dbAddr resourceName "CONNECT:" + dbAddr
errored false errored false
@ -109,7 +111,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"peer.hostname" HOST "peer.hostname" HOST
"peer.port" port "peer.port" port
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -134,7 +136,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "CONNECT:" + dbAddrNonExistent resourceName "CONNECT:" + dbAddrNonExistent
errored true errored true
@ -148,7 +150,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"peer.hostname" HOST "peer.hostname" HOST
"peer.port" incorrectPort "peer.port" incorrectPort
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -166,7 +168,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SET" resourceName "SET"
errored false errored false
@ -175,7 +177,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -193,7 +195,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -202,7 +204,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -220,7 +222,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "GET" resourceName "GET"
errored false errored false
@ -229,7 +231,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -247,7 +249,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "RANDOMKEY" resourceName "RANDOMKEY"
errored false errored false
@ -256,7 +258,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -274,7 +276,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "LPUSH" resourceName "LPUSH"
errored false errored false
@ -283,7 +285,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -301,7 +303,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "HMSET" resourceName "HMSET"
errored false errored false
@ -310,7 +312,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -328,7 +330,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "HGETALL" resourceName "HGETALL"
errored false errored false
@ -337,7 +339,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -354,7 +356,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG" resourceName AGENT_CRASHING_COMMAND_PREFIX + "DEBUG"
errored false errored false
@ -363,7 +365,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }
@ -380,7 +382,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
span(0) { span(0) {
serviceName "redis" serviceName "redis"
operationName "redis.query" operationName "redis.query"
spanType "redis" spanType DDSpanTypes.REDIS
resourceName "SHUTDOWN" resourceName "SHUTDOWN"
errored false errored false
@ -389,7 +391,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
"component" "redis-client" "component" "redis-client"
"db.type" "redis" "db.type" "redis"
"span.kind" "client" "span.kind" "client"
"span.type" "redis" "$DDTags.SPAN_TYPE" DDSpanTypes.REDIS
} }
} }
} }