diff --git a/skywalking-analysis/pom.xml b/skywalking-analysis/pom.xml
index 9480f30b2..c2cb20b41 100644
--- a/skywalking-analysis/pom.xml
+++ b/skywalking-analysis/pom.xml
@@ -38,12 +38,6 @@
skywalking-protocol
1.0-SNAPSHOT
-
- junit
- junit
- 4.12
- test
-
com.google.code.gson
gson
@@ -59,10 +53,12 @@
log4j-core
2.2
+
- redis.clients
- jedis
- 2.8.1
+ junit
+ junit
+ 4.12
+ test
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
index 24a922e1c..223fdf0cf 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
@@ -1,17 +1,14 @@
package com.ai.cloud.skywalking.analysis.chainbuild;
-import com.ai.cloud.skywalking.analysis.chainbuild.exception.Tid2CidECovertException;
-import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessChain;
-import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessFilter;
-import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainInfo;
-import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode;
-import com.ai.cloud.skywalking.analysis.chainbuild.po.SummaryType;
-import com.ai.cloud.skywalking.analysis.chainbuild.util.*;
-import com.ai.cloud.skywalking.analysis.config.Config;
-import com.ai.cloud.skywalking.analysis.config.ConfigInitializer;
-import com.ai.cloud.skywalking.protocol.Span;
-import com.ai.cloud.skywalking.util.SpanLevelIdComparators;
-import com.google.gson.Gson;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -21,9 +18,20 @@ import org.apache.hadoop.io.Text;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import com.ai.cloud.skywalking.analysis.chainbuild.exception.Tid2CidECovertException;
+import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessChain;
+import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessFilter;
+import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainInfo;
+import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode;
+import com.ai.cloud.skywalking.analysis.chainbuild.po.SummaryType;
+import com.ai.cloud.skywalking.analysis.chainbuild.util.HBaseUtil;
+import com.ai.cloud.skywalking.analysis.chainbuild.util.SubLevelSpanCostCounter;
+import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator;
+import com.ai.cloud.skywalking.analysis.chainbuild.util.VersionIdentifier;
+import com.ai.cloud.skywalking.analysis.config.ConfigInitializer;
+import com.ai.cloud.skywalking.protocol.Span;
+import com.ai.cloud.skywalking.util.SpanLevelIdComparators;
+import com.google.gson.Gson;
public class ChainBuildMapper extends TableMapper {
@@ -46,7 +54,6 @@ public class ChainBuildMapper extends TableMapper {
return;
}
- RedisUtil.autoIncrement(Config.Redis.MAPPER_COUNT_KEY);
List spanList = new ArrayList();
ChainInfo chainInfo = null;
try {
@@ -121,11 +128,9 @@ public class ChainBuildMapper extends TableMapper {
+ ":" + chainInfo.getCallEntrance()),
new Text(new Gson().toJson(chainInfo)));
}
- RedisUtil.autoIncrement(Config.Redis.SUCCESS_MAPPER_COUNT_KEY);
} catch (Exception e) {
logger.error("Failed to mapper call chain[" + key.toString() + "]",
e);
- RedisUtil.autoIncrement(Config.Redis.FAILED_MAPPER_COUNT_KEY);
}
}
@@ -162,10 +167,4 @@ public class ChainBuildMapper extends TableMapper {
}
return spanEntryMap;
}
-
- private void clearData(){
- RedisUtil.clearData(Config.Redis.MAPPER_COUNT_KEY);
- RedisUtil.clearData(Config.Redis.FAILED_MAPPER_COUNT_KEY);
- RedisUtil.clearData(Config.Redis.SUCCESS_MAPPER_COUNT_KEY);
- }
}
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildReducer.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildReducer.java
index 7e9947e2c..370da1be3 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildReducer.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildReducer.java
@@ -1,18 +1,18 @@
package com.ai.cloud.skywalking.analysis.chainbuild;
-import com.ai.cloud.skywalking.analysis.chainbuild.action.IStatisticsAction;
-import com.ai.cloud.skywalking.analysis.chainbuild.po.SummaryType;
-import com.ai.cloud.skywalking.analysis.config.Config;
-import com.ai.cloud.skywalking.analysis.config.ConfigInitializer;
-import org.apache.hadoop.hbase.util.Bytes;
+import java.io.IOException;
+import java.util.Iterator;
+
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Reducer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.io.IOException;
-import java.util.Iterator;
+import com.ai.cloud.skywalking.analysis.chainbuild.action.IStatisticsAction;
+import com.ai.cloud.skywalking.analysis.chainbuild.po.SummaryType;
+import com.ai.cloud.skywalking.analysis.config.Config;
+import com.ai.cloud.skywalking.analysis.config.ConfigInitializer;
public class ChainBuildReducer extends Reducer {
private Logger logger = LogManager.getLogger(ChainBuildReducer.class);
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/DBCallChainInfoDao.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/DBCallChainInfoDao.java
index 33ebf83be..44dc4b1f9 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/DBCallChainInfoDao.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/DBCallChainInfoDao.java
@@ -1,13 +1,17 @@
package com.ai.cloud.skywalking.analysis.chainbuild;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.ai.cloud.skywalking.analysis.chainbuild.entity.CallChainDetailForMysql;
import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode;
import com.ai.cloud.skywalking.analysis.config.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.*;
-import java.util.Map;
public class DBCallChainInfoDao {
private static Logger logger = LoggerFactory
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java
index 968fa8b91..5eff09f62 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java
@@ -1,11 +1,12 @@
package com.ai.cloud.skywalking.analysis.chainbuild.filter.impl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import com.ai.cloud.skywalking.analysis.chainbuild.SpanEntry;
import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessFilter;
import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode;
import com.ai.cloud.skywalking.analysis.chainbuild.util.SubLevelSpanCostCounter;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
public class JDBCBusinessKeyHandleFilter extends SpanNodeProcessFilter {
private Logger logger = LogManager.getLogger(JDBCBusinessKeyHandleFilter.class);
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/util/RedisUtil.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/util/RedisUtil.java
deleted file mode 100644
index 33f58f2a6..000000000
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/util/RedisUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ai.cloud.skywalking.analysis.chainbuild.util;
-
-import com.ai.cloud.skywalking.analysis.config.Config;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-
-/**
- * Created by xin on 16-5-13.
- */
-public class RedisUtil {
-
- private static Logger logger = LogManager.getLogger(RedisUtil.class);
-
- private static JedisPool jedisPool;
-
- private static boolean turn_on = true;
-
- static {
- try {
- GenericObjectPoolConfig genericObjectPoolConfig = new GenericObjectPoolConfig();
- jedisPool = new JedisPool(genericObjectPoolConfig, Config.Redis.HOST, Config.Redis.PORT);
- } catch (Exception e) {
- logger.error("Failed to create jedis pool", e);
- turn_on = false;
- }
- }
-
-
- public static void autoIncrement(String key) {
- if (!turn_on) {
- return;
- }
-
- Jedis jedis = null;
- try {
- jedis = jedisPool.getResource();
- jedis.incrBy(key, 1);
- } catch (Exception e) {
- logger.error("Failed to auto increment .", e);
- } finally {
- if (jedis != null) {
- jedis.close();
- }
- }
- }
-
-
- public static void clearData(String key) {
- if (!turn_on) {
- return;
- }
-
- Jedis jedis = null;
- try {
- jedis = jedisPool.getResource();
- jedis.setnx(key, "0");
- } catch (Exception e) {
- logger.error("Failed to auto increment .", e);
- } finally {
- if (jedis != null) {
- jedis.close();
- }
- }
- }
-
-}