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

reusing declared values to make tests more roboust

This commit is contained in:
gihad 2018-02-18 08:38:47 -05:00
parent 692b6e7508
commit 44dd384648
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dd-java-agent/instrumentation/jedis-2.9/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
View File

@ -26,6 +26,7 @@ import redis.clients.jedis.Protocol.Command;
public final class JedisInstrumentation extends Instrumenter.Configurable {
private static final String SERVICE_NAME = "redis";
private static final String COMPONENT_NAME = SERVICE_NAME + "-command";
public JedisInstrumentation() {
super(SERVICE_NAME);
@ -61,7 +62,7 @@ public final class JedisInstrumentation extends Instrumenter.Configurable {
final Span span = scope.span();
Tags.DB_TYPE.set(span, SERVICE_NAME);
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
Tags.COMPONENT.set(span, "redis-command");
Tags.COMPONENT.set(span, COMPONENT_NAME);
span.setTag(DDTags.RESOURCE_NAME, command.name());
span.setTag(DDTags.SERVICE_NAME, SERVICE_NAME);

31
dd-java-agent/instrumentation/jedis-2.9/src/test/groovy/JedisClientTest.groovy
View File

@ -9,6 +9,7 @@ import io.opentracing.tag.Tags
import redis.clients.jedis.Jedis
import redis.embedded.RedisServer
import spock.lang.Shared
import datadog.trace.instrumentation.jedis.JedisInstrumentation
class JedisClientTest extends AgentTestRunner {
@ -39,13 +40,13 @@ class JedisClientTest extends AgentTestRunner {
expect:
final DDSpan setTrace = TEST_WRITER.get(TEST_WRITER.size() - 1).get(0)
setTrace.getServiceName() == "redis"
setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME
setTrace.getOperationName() == "redis.query"
setTrace.getResourceName() == "SET"
setTrace.getTags().get(Tags.COMPONENT.getKey()) == "redis-command"
setTrace.getTags().get(Tags.DB_TYPE.getKey()) == "redis"
setTrace.getTags().get(Tags.SPAN_KIND.getKey()) == "client"
setTrace.getTags().get(DDTags.SPAN_TYPE) == "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
setTrace.getTags().get(DDTags.SPAN_TYPE) == JedisInstrumentation.SERVICE_NAME
}
def "get command"() {
@ -55,13 +56,13 @@ class JedisClientTest extends AgentTestRunner {
expect:
value == "bar"
final DDSpan setTrace = TEST_WRITER.get(TEST_WRITER.size() - 1).get(0)
setTrace.getServiceName() == "redis"
setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME
setTrace.getOperationName() == "redis.query"
setTrace.getResourceName() == "GET"
setTrace.getTags().get(Tags.COMPONENT.getKey()) == "redis-command"
setTrace.getTags().get(Tags.DB_TYPE.getKey()) == "redis"
setTrace.getTags().get(Tags.SPAN_KIND.getKey()) == "client"
setTrace.getTags().get(DDTags.SPAN_TYPE) == "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
setTrace.getTags().get(DDTags.SPAN_TYPE) == JedisInstrumentation.SERVICE_NAME
}
def "command with no arguments"() {
@ -72,12 +73,12 @@ class JedisClientTest extends AgentTestRunner {
expect:
value == "foo"
final DDSpan setTrace = TEST_WRITER.get(TEST_WRITER.size() - 1).get(0)
setTrace.getServiceName() == "redis"
setTrace.getServiceName() == JedisInstrumentation.SERVICE_NAME
setTrace.getOperationName() == "redis.query"
setTrace.getResourceName() == "RANDOMKEY"
setTrace.getTags().get(Tags.COMPONENT.getKey()) == "redis-command"
setTrace.getTags().get(Tags.DB_TYPE.getKey()) == "redis"
setTrace.getTags().get(Tags.SPAN_KIND.getKey()) == "client"
setTrace.getTags().get(DDTags.SPAN_TYPE) == "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
setTrace.getTags().get(DDTags.SPAN_TYPE) == JedisInstrumentation.SERVICE_NAME
}
}