From 0bc9d9c08df454c5f0577b2c88b953177660b24e Mon Sep 17 00:00:00 2001 From: Gary Huang Date: Tue, 5 Jun 2018 15:16:36 -0400 Subject: [PATCH] remove string constants in advice class and comment fixes --- .../lettuce/ConnectionFutureAdvice.java | 10 +++------- .../lettuce/LettuceAsyncCommandsAdvice.java | 1 - .../src/test/groovy/LettuceAsyncClientTest.groovy | 5 ++--- .../src/test/groovy/LettuceSyncClientTest.groovy | 5 ++--- 4 files changed, 7 insertions(+), 14 deletions(-) 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 799d089db8..dfec9275f0 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 @@ -12,10 +12,6 @@ import net.bytebuddy.asm.Advice; public class ConnectionFutureAdvice { - public static final String REDIS_URL_TAG_NAME = "db.redis.url"; - public static final String REDIS_DB_INDEX_TAG_NAME = "db.redis.dbIndex"; - public static final String RESOURCE_NAME_PREFIX = "CONNECT:"; - @Advice.OnMethodEnter(suppress = Throwable.class) public static Scope startSpan(@Advice.Argument(1) final RedisURI redisURI) { final Scope scope = GlobalTracer.get().buildSpan("redis.query").startActive(false); @@ -31,9 +27,9 @@ public class ConnectionFutureAdvice { Tags.PEER_HOSTNAME.set(span, redisHost); final String url = redisHost + ":" + redisPort + "/" + redisURI.getDatabase(); - span.setTag(REDIS_URL_TAG_NAME, url); - span.setTag(REDIS_DB_INDEX_TAG_NAME, redisURI.getDatabase()); - span.setTag(DDTags.RESOURCE_NAME, RESOURCE_NAME_PREFIX + url); + span.setTag("db.redis.url", url); + 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); 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 23b6defb8f..1ba7156c2e 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 @@ -18,7 +18,6 @@ public class LettuceAsyncCommandsAdvice { Map commandMap = LettuceInstrumentationUtil.getCommandInfo(command); String commandName = commandMap.get(LettuceInstrumentationUtil.MAP_KEY_CMD_NAME); String commandArgs = commandMap.get(LettuceInstrumentationUtil.MAP_KEY_CMD_ARGS); - ; final Scope scope = GlobalTracer.get() 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 fc78faf4ed..829e6ab4cb 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 @@ -21,7 +21,6 @@ import java.util.function.BiFunction import java.util.function.Consumer import java.util.function.Function -import static datadog.trace.instrumentation.lettuce.ConnectionFutureAdvice.RESOURCE_NAME_PREFIX import static datadog.trace.agent.test.ListWriterAssert.assertTraces class LettuceAsyncClientTest extends AgentTestRunner { @@ -90,7 +89,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { serviceName "redis" operationName "redis.query" spanType "redis" - resourceName RESOURCE_NAME_PREFIX + DB_ADDR + resourceName "CONNECT:" + DB_ADDR errored false tags { @@ -128,7 +127,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { serviceName "redis" operationName "redis.query" spanType "redis" - resourceName RESOURCE_NAME_PREFIX + DB_ADDR_NON_EXISTENT + resourceName "CONNECT:" + DB_ADDR_NON_EXISTENT errored true tags { 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 5360cd1747..69ed46ce7e 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 @@ -9,7 +9,6 @@ import spock.lang.Shared import java.util.concurrent.CompletionException -import static datadog.trace.instrumentation.lettuce.ConnectionFutureAdvice.RESOURCE_NAME_PREFIX import static datadog.trace.agent.test.ListWriterAssert.assertTraces class LettuceSyncClientTest extends AgentTestRunner { @@ -74,7 +73,7 @@ class LettuceSyncClientTest extends AgentTestRunner { serviceName "redis" operationName "redis.query" spanType "redis" - resourceName RESOURCE_NAME_PREFIX + DB_ADDR + resourceName "CONNECT:" + DB_ADDR errored false tags { @@ -108,7 +107,7 @@ class LettuceSyncClientTest extends AgentTestRunner { serviceName "redis" operationName "redis.query" spanType "redis" - resourceName RESOURCE_NAME_PREFIX + DB_ADDR_NON_EXISTENT + resourceName "CONNECT:" + DB_ADDR_NON_EXISTENT errored true tags {