diff --git a/skywalking-analysis/src/main/resources/analysis.conf b/skywalking-analysis/src/main/resources/analysis.conf index c175eb6b4..d3f292a04 100644 --- a/skywalking-analysis/src/main/resources/analysis.conf +++ b/skywalking-analysis/src/main/resources/analysis.conf @@ -1,32 +1,14 @@ -hbase.trace_detail_family_column=chain_detail - -hbase.chain_summary_column_family=chain_summary - -hbase.trace_info_column_family=trace_info hbase.zk_quorum=10.1.235.197,10.1.235.198,10.1.235.199 hbase.zk_client_port=29181 -hbase.trace_info_table_name=trace-info - -hbase.table_call_chain_relationship=sw-chain-relationship - -hbase.chain_relationship_column_family=chain-relationship - -hbase.table_chain_info=sw-chain-info - -hbase.table_chain_summary=sw-chain-summary - -hbase.table_chain_detail=sw-chain-detail - -hbase.table_call_chain=sw-call-chain - -traceinfo.trace_info_column_cid=cid - mysql.url=jdbc:mysql://10.1.228.202:31316/test + mysql.username=devrdbusr21 + mysql.password=devrdbusr21 + mysql.driver_class=com.mysql.jdbc.Driver filter.filter_package_name=com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl diff --git a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java index 7d6475150..226452231 100644 --- a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java +++ b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java @@ -6,6 +6,7 @@ import com.ai.cloud.skywalking.analysis.categorize2chain.Categorize2ChainReducer import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; import com.ai.cloud.skywalking.analysis.config.Config; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; +import com.ai.cloud.skywalking.analysis.config.Constants; import com.ai.cloud.skywalking.protocol.Span; import org.apache.hadoop.conf.Configuration; @@ -48,7 +49,7 @@ public class CallChainMapperTest { public static List selectByTraceId(String traceId) throws IOException { List entries = new ArrayList(); - Table table = connection.getTable(TableName.valueOf(Config.HBase.TABLE_CALL_CHAIN)); + Table table = connection.getTable(TableName.valueOf(Constants.TABLE_CALL_CHAIN)); Get g = new Get(Bytes.toBytes(traceId)); Result r = table.get(g); for (Cell cell : r.rawCells()) {