From 59e2f69d357782cd0de5598ccf73ebf1f77d392a Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 5 Jun 2016 11:21:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0redis=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=202.=20=E7=A7=BB=E9=99=A4log4j=20shade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skywalking-agent/pom.xml | 37 +++++------ test/skywalking-agent-test/redis-test/pom.xml | 38 ++++++++++++ .../skywalking/agent/test/RedisOperator.java | 61 +++++++++++++++++++ .../agent/test/RedisPluginTest.java | 7 +++ .../redis-test/src/main/resources/log4j2.xml | 13 ++++ .../redis-test/src/main/resources/redis.conf | 2 + .../src/main/resources/sky-walking.auth | 22 +++++++ 7 files changed, 158 insertions(+), 22 deletions(-) create mode 100644 test/skywalking-agent-test/redis-test/pom.xml create mode 100644 test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java create mode 100644 test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java create mode 100644 test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml create mode 100644 test/skywalking-agent-test/redis-test/src/main/resources/redis.conf create mode 100644 test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth diff --git a/skywalking-agent/pom.xml b/skywalking-agent/pom.xml index 2a3efa84d6..f98146b421 100644 --- a/skywalking-agent/pom.xml +++ b/skywalking-agent/pom.xml @@ -21,8 +21,6 @@ com.ai.cloud.skywalking.api.dependencies.net.bytebuddy io.netty com.ai.cloud.skywalking.api.dependencies.io.netty - org.apache.logging.log4j - com.ai.cloud.skywalking.api.dependencies.org.apache.logging.log4j @@ -31,21 +29,21 @@ skywalking-jedis-2.x-plugin 1.0-Final - - com.ai.cloud - skywalking-mysql-plugin - 1.0-Final - - - com.ai.cloud - skywalking-httpClient-4.x-plugin - 1.0-Final - - - com.ai.cloud - skywalking-httpClient-4.x-plugin-dubbox-rest-attachment - 1.0-Final - + + + + + + + + + + + + + + + @@ -84,11 +82,6 @@ ${shade.io.netty.source} ${shade.io.netty.target} - - - ${shade.org.apache.logging.log4j} - ${shade.org.apache.logging.log4j.target} - diff --git a/test/skywalking-agent-test/redis-test/pom.xml b/test/skywalking-agent-test/redis-test/pom.xml new file mode 100644 index 0000000000..b91e672fd3 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/pom.xml @@ -0,0 +1,38 @@ + + + skywalking-agent-test + com.ai.skywalking + 1.0-SNAPSHOT + + 4.0.0 + + redis-test + jar + + redis-test + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 4.12 + test + + + org.apache.logging.log4j + log4j-core + 2.4.1 + + + redis.clients + jedis + 2.8.1 + + + diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java new file mode 100644 index 0000000000..312ed384f5 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java @@ -0,0 +1,61 @@ +package com.ai.cloud.skywalking.agent.test; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + * Created by xin on 16-6-5. + */ +public class RedisOperator { + + private static Logger logger = LogManager.getLogger(RedisOperator.class); + private static JedisPool jedisPool = 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); + } + jedisPool = new JedisPool(properties.getProperty("redis.ip", "127.0.0.1"), + Integer.parseInt(properties.getProperty("redis.port", "2181"))); + } + + + public static void setData(String key, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + jedis.set(key, value); + } catch (Exception e) { + logger.error(e); + } finally { + if (jedis != null) + jedis.close(); + } + } + + public static String getData(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.get(key); + } catch (Exception e) { + logger.error(e); + } finally { + if (jedis != null) + jedis.close(); + } + + return ""; + } +} diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java new file mode 100644 index 0000000000..5f0c9ae396 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java @@ -0,0 +1,7 @@ +package com.ai.cloud.skywalking.agent.test; + +public class RedisPluginTest { + public static void main(String[] args) { + RedisOperator.setData("key1", "value1"); + } +} diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml b/test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml new file mode 100644 index 0000000000..91e20d37a4 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/redis.conf b/test/skywalking-agent-test/redis-test/src/main/resources/redis.conf new file mode 100644 index 0000000000..19693067f6 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/main/resources/redis.conf @@ -0,0 +1,2 @@ +redis.ip=127.0.0.1 +redis.port=6379 \ No newline at end of file diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth b/test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth new file mode 100644 index 0000000000..5e4c0b8dc7 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth @@ -0,0 +1,22 @@ +#test +#Mon Dec 28 11:30:29 CST 2015 +buriedpoint.businesskey_max_length=300 +sender.retry_get_sender_wait_interval=2000 +buffer.pool_size=5 +senderchecker.check_polling_time=200 +sender.is_off=true +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=redis-plugin-test +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=true +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 +skywalking.auth_override=true \ No newline at end of file -- GitLab