diff --git a/skywalking-analysis/pom.xml b/skywalking-analysis/pom.xml
index c74aeb101..d0c82b291 100644
--- a/skywalking-analysis/pom.xml
+++ b/skywalking-analysis/pom.xml
@@ -41,6 +41,12 @@
skywalking-protocol
1.0-SNAPSHOT
+
+ junit
+ junit
+ 4.12
+ test
+
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
index 651b60d04..d32049fa7 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
@@ -41,7 +41,7 @@ public class AnalysisServerDriver extends Configured implements Tool {
job.setJarByClass(AnalysisServerDriver.class);
Scan scan = buildHBaseScan(args);
- TableMapReduceUtil.initTableMapperJob(Config.HBase.TABLE_NAME, scan, CallChainMapper.class,
+ TableMapReduceUtil.initTableMapperJob(Config.HBase.CALL_CHAIN_TABLE_NAME, scan, CallChainMapper.class,
String.class, ChainInfo.class, job);
//TableMapReduceUtil.initTableReducerJob("sw-call-chain-model", CallChainReducer.class, job);
return job.waitForCompletion(true) ? 0 : 1;
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
index 9dbff39a4..2c3e81434 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
@@ -2,6 +2,38 @@ package com.ai.cloud.skywalking.analysis.config;
public class Config {
public static class HBase {
- public static String TABLE_NAME;
+
+ public static String TRACE_INFO_COLUMN_FAMILY = "trace_info";
+
+ public static String CALL_CHAIN_TABLE_NAME;
+
+ public static String ZK_QUORUM;
+
+ public static String ZK_CLIENT_PORT;
+
+ public static String TRACE_INFO_TABLE_NAME;
+
+
+ }
+
+ public static class TraceInfo {
+
+ public static String PARENT_LEVEL_ID = "parentLevelId";
+
+ public static String LEVEL_ID = "levelId";
+
+ public static String BUSINESS_KEY = "businessKey";
+
+ public static String COST = "cost";
+
+ public static String TRACE_INFO_COLUMN_CID = "cid";
+
+ public static String STATUS = "status";
+
+ public static String USER_ID = "UId";
+ }
+
+ public static class Filter {
+ public static String FILTER_PACKAGE_NAME;
}
}
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/ViewPointFilterFactory.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/ViewPointFilterFactory.java
deleted file mode 100644
index ea8b74c76..000000000
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/ViewPointFilterFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.ai.cloud.skywalking.analysis.config;
-
-import com.ai.cloud.skywalking.analysis.viewpoint.ViewPointFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-public class ViewPointFilterFactory {
-
- private static Logger logger = LoggerFactory.getLogger(ViewPointFilterFactory.class.getName());
-
- private static Map filterType;
-
- private static Object lock = new Object();
-
- private ViewPointFilterFactory() {
- //Non
- }
-
- private static void initFilterChain() {
- Properties properties = new Properties();
- try {
- properties.load(ViewPointFilterFactory.class.getResourceAsStream("/viewpointfilter.conf"));
- } catch (IOException e) {
- logger.error("Failed to found the conf file[viewpointfilter.conf]", e);
- System.exit(-1);
- }
-
- Set> entries = properties.entrySet();
-
- for (Map.Entry