From 44dd384648e3cad42512a35f64c9d813bb0f7d88 Mon Sep 17 00:00:00 2001 From: gihad Date: Sun, 18 Feb 2018 08:38:47 -0500 Subject: [PATCH] reusing declared values to make tests more roboust --- .../jedis/JedisInstrumentation.java | 3 +- .../src/test/groovy/JedisClientTest.groovy | 31 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/jedis-2.9/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-2.9/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index 606b306d41..7cb27ae7e2 100644 --- a/dd-java-agent/instrumentation/jedis-2.9/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-2.9/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -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); diff --git a/dd-java-agent/instrumentation/jedis-2.9/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-2.9/src/test/groovy/JedisClientTest.groovy index 15d44cb767..bbfff2afca 100644 --- a/dd-java-agent/instrumentation/jedis-2.9/src/test/groovy/JedisClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-2.9/src/test/groovy/JedisClientTest.groovy @@ -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 } } \ No newline at end of file