From 00fb29f52844ced2ceebcce9b2159b85f9837fd2 Mon Sep 17 00:00:00 2001
From: Brian Devins-Suresh <brian.devinssuresh@datadoghq.com>
Date: Thu, 5 Dec 2019 15:59:12 -0500
Subject: [PATCH] Some clean up

---
 .../instrumentation/jedis30/JedisClientDecorator.java      | 7 +++++--
 .../instrumentation/jedis30/JedisInstrumentation.java      | 5 ++---
 .../{JedisClientTest.groovy => Jedis30ClientTest.groovy}   | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/{JedisClientTest.groovy => Jedis30ClientTest.groovy} (96%)

diff --git a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
index e76d80a915..224411c76a 100644
--- a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
+++ b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisClientDecorator.java
@@ -7,6 +7,9 @@ import redis.clients.jedis.commands.ProtocolCommand;
 public class JedisClientDecorator extends DatabaseClientDecorator<ProtocolCommand> {
   public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
 
+  private static final String SERVICE_NAME = "redis";
+  private static final String COMPONENT_NAME = SERVICE_NAME + "-command";
+
   @Override
   protected String[] instrumentationNames() {
     return new String[] {"jedis", "redis"};
@@ -14,12 +17,12 @@ public class JedisClientDecorator extends DatabaseClientDecorator<ProtocolComman
 
   @Override
   protected String service() {
-    return "redis";
+    return SERVICE_NAME;
   }
 
   @Override
   protected String component() {
-    return "redis-command";
+    return COMPONENT_NAME;
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
index 37d45936f1..635ec2bfb0 100644
--- a/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
+++ b/dd-java-agent/instrumentation/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java
@@ -24,9 +24,6 @@ import redis.clients.jedis.commands.ProtocolCommand;
 @AutoService(Instrumenter.class)
 public final class JedisInstrumentation extends Instrumenter.Default {
 
-  private static final String SERVICE_NAME = "redis";
-  private static final String COMPONENT_NAME = SERVICE_NAME + "-command";
-
   public JedisInstrumentation() {
     super("jedis", "redis");
   }
@@ -66,6 +63,8 @@ public final class JedisInstrumentation extends Instrumenter.Default {
       if (command instanceof Protocol.Command) {
         DECORATE.onStatement(span, ((Protocol.Command) command).name());
       } else {
+        // Protocol.Command is the only implementation in the Jedis lib as of 3.1 but this will save
+        // us if that changes
         DECORATE.onStatement(span, new String(command.getRaw()));
       }
       return activateSpan(span, true);
diff --git a/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy
similarity index 96%
rename from dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/JedisClientTest.groovy
rename to dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy
index aa775f0176..c415d0435c 100644
--- a/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/JedisClientTest.groovy
+++ b/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy
@@ -6,7 +6,7 @@ import redis.clients.jedis.Jedis
 import redis.embedded.RedisServer
 import spock.lang.Shared
 
-class JedisClientTest extends AgentTestRunner {
+class Jedis30ClientTest extends AgentTestRunner {
 
   public static final int PORT = 6399
 
@@ -30,7 +30,7 @@ class JedisClientTest extends AgentTestRunner {
 
   def cleanupSpec() {
     redisServer.stop()
-//    jedis.close()  // not available in the early version we're using.
+    jedis.close()
 
     System.clearProperty(Config.PREFIX + Config.DB_CLIENT_HOST_SPLIT_BY_INSTANCE)
   }