1.添加redis cluster测试类

test/skywalking-agent-test/redis-test/pom.xml

@@ -22,7 +22,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java

+package com.ai.cloud.skywalking.agent.test;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Created by xin on 16-6-13.
+ */
+public class RedisClusterOperator {
+
+    private static Logger logger = LogManager.getLogger(RedisClusterOperator.class);
+    private static JedisCluster jedisCluster = null;
+
+    static {
+        InputStream inputStream = RedisOperator.class.getResourceAsStream("/redis.conf");
+        Properties properties = new Properties();
+        try {
+            properties.load(inputStream);
+        } catch (IOException e) {
+            logger.error("Failed to load redis.conf", e);
+            System.exit(-1);
+        }
+        jedisCluster = new JedisCluster(getHostAndPorts(properties.getProperty("redis.cluster.host", "127.0.0.1:7000")));
+    }
+
+    private static Set<HostAndPort> getHostAndPorts(String property) {
+        Set<HostAndPort> redisEnv = new HashSet<HostAndPort>();
+        String[] hosts = property.split(";");
+        for (String host : hosts) {
+            String[] hostAndPort = host.split(":");
+            redisEnv.add(new HostAndPort(hostAndPort[0], Integer.parseInt(hostAndPort[1])));
+        }
+        return redisEnv;
+    }
+
+
+    public static void setData(String key, String value) {
+        jedisCluster.set(key, value);
+    }
+
+    public static String getData(String key) {
+        return jedisCluster.get(key);
+    }
+
+    public static void delData(String key) {
+        jedisCluster.del(key);
+    }
+
+}

test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java

+package com.ai.cloud.skywalking.agent.test;
+
+import com.ai.skywalking.testframework.api.TraceTreeAssert;
+import org.junit.Test;
+
+public class RedisClusterPluginTest {
+
+    @Test
+    public void testSetData() {
+        RedisClusterOperator.setData("key1", "value1");
+        TraceTreeAssert.assertEquals(new String[][]{
+                // 根据实际情况进行修改
+                {"0.0", "127.0.0.1:7001 set", "key=key1"},
+                {"0", "127.0.0.1:7002;127.0.0.1:7001;127.0.0.1:7000;127.0.0.1:7005;127.0.0.1:7004;127.0.0.1:7003; set", "key=key1"},
+        });
+
+    }
+
+    @Test
+    public void testGetData() {
+        RedisClusterOperator.getData("key1");
+        TraceTreeAssert.assertEquals(new String[][]{
+                // 根据实际情况进行修改
+                {"0.0", "127.0.0.1:7001 get", "key=key1"},
+                {"0", "127.0.0.1:7002;127.0.0.1:7001;127.0.0.1:7000;127.0.0.1:7005;127.0.0.1:7004;127.0.0.1:7003; get", "key=key1"},
+        });
+    }
+
+
+    @Test
+    public void testDelData() {
+        RedisClusterOperator.delData("key1");
+        TraceTreeAssert.assertEquals(new String[][]{
+                // 根据实际情况进行修改
+                {"0.0", "127.0.0.1:7001 del", "key=key1"},
+                {"0", "127.0.0.1:7001;127.0.0.1:7000; del", "key=key1"},
+        });
+    }
+}

test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java

@@ -27,7 +27,7 @@ public class RedisOperator {
             System.exit(-1);
         }
         jedisPool = new JedisPool(properties.getProperty("redis.ip", "127.0.0.1"),
-                Integer.parseInt(properties.getProperty("redis.port", "2181")));
+                Integer.parseInt(properties.getProperty("redis.port", "6379")));
     }
 
 
@@ -38,6 +38,7 @@ public class RedisOperator {
             jedis.set(key, value);
         } catch (Exception e) {
             logger.error(e);
+            throw e;
         } finally {
             if (jedis != null)
                 jedis.close();
@@ -51,11 +52,25 @@ public class RedisOperator {
             return jedis.get(key);
         } catch (Exception e) {
             logger.error(e);
+            throw e;
         } finally {
             if (jedis != null)
                 jedis.close();
         }
 
-        return "";
+    }
+
+    public static void delData(String key) {
+        Jedis jedis = null;
+        try {
+            jedis = jedisPool.getResource();
+            jedis.del(key);
+        } catch (Exception e) {
+            logger.error(e);
+            throw e;
+        } finally {
+            if (jedis != null)
+                jedis.close();
+        }
     }
 }

test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java

 package com.ai.cloud.skywalking.agent.test;
 
 import com.ai.skywalking.testframework.api.TraceTreeAssert;
+import org.junit.Test;
 
 public class RedisPluginTest {
-    public static void main(String[] args) {
+
+    @Test
+    public void testSetData() {
         RedisOperator.setData("key1", "value1");
         TraceTreeAssert.assertEquals(new String[][]{
                 {"0", "127.0.0.1:6379 set", "key=key1"},
         });
+
+    }
+
+    @Test
+    public void testGetData() {
+        RedisOperator.getData("key1");
+        TraceTreeAssert.assertEquals(new String[][]{
+                {"0", "127.0.0.1:6379 get", "key=key1"},
+        });
+    }
+
+
+    @Test
+    public void testDelData() {
+        RedisOperator.delData("key1");
+        TraceTreeAssert.assertEquals(new String[][]{
+                {"0", "127.0.0.1:6379 del", "key=key1"},
+        });
     }
 }

test/skywalking-agent-test/redis-test/src/main/resources/redis.conf

 redis.ip=127.0.0.1
-redis.port=6379
\ No newline at end of file
+redis.port=6379
+redis.cluster.host=127.0.0.1:7000;127.0.0.1:7001;127.0.0.1:7000;127.0.0.1:7000;127.0.0.1:7000;127.0.0.1:7000;
\ No newline at end of file

test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth

@@ -4,7 +4,6 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
 sender.max_send_length=20000
 consumer.max_consumer=0
 consumer.max_wait_time=5