diff --git a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HeathReading.java b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HeathReading.java
index 4d0ec0ab4..c413e78b5 100644
--- a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HeathReading.java
+++ b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HeathReading.java
@@ -28,7 +28,7 @@ public class HeathReading {
if (datas.containsKey(key)) {
datas.get(key).updateData(newData, arguments);
} else {
- datas.put(key, new HeathDetailData(newData));
+ datas.put(key, new HeathDetailData(newData, arguments));
}
}
@@ -50,7 +50,13 @@ public class HeathReading {
private long statusTime;
HeathDetailData(String initialData) {
+ this(initialData, new Object[0]);
+ }
+
+ HeathDetailData(String initialData, Object[] arguments) {
data = initialData;
+ if (arguments.length > 0)
+ data = String.format(initialData, arguments);
statusTime = System.currentTimeMillis();
}
diff --git a/skywalking-storage-center/pom.xml b/skywalking-storage-center/pom.xml
index 0718f445c..cfe9c0967 100644
--- a/skywalking-storage-center/pom.xml
+++ b/skywalking-storage-center/pom.xml
@@ -32,7 +32,18 @@
com.a.eye
data-carrier
- 1.1
+ 1.2
+
+
+
+
+ false
+
+ DataCarrier
+ bintray
+ https://jcenter.bintray.com
+
+
diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml
index ff43abc84..0b101ebcd 100644
--- a/skywalking-storage-center/skywalking-storage/pom.xml
+++ b/skywalking-storage-center/skywalking-storage/pom.xml
@@ -132,15 +132,4 @@
-
-
-
-
- false
-
- bintray-wu-sheng-DataCarrier
- bintray
- http://dl.bintray.com/wu-sheng/DataCarrier
-
-
diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java
index edd650235..5d5e8336c 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java
@@ -19,7 +19,8 @@ public class SpanDataConsumer implements IConsumer {
private IndexDBConnectorCache cache;
private DataFileWriter fileWriter;
- public SpanDataConsumer() {
+ @Override
+ public void init() {
cache = new IndexDBConnectorCache();
fileWriter = new DataFileWriter();
}
diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
index 0b5e8e4ef..673860e8c 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
@@ -21,18 +21,20 @@ public class StorageListener implements SpanStorageListener {
public StorageListener() {
spanDataDataCarrier = new DataCarrier<>(Config.DataConsumer.CHANNEL_SIZE, Config.DataConsumer.BUFFER_SIZE);
- spanDataDataCarrier.consume(new SpanDataConsumer(), Config.DataConsumer.CONSUMER_SIZE, true);
+ spanDataDataCarrier.consume(SpanDataConsumer.class, Config.DataConsumer.CONSUMER_SIZE);
}
@Override
public boolean storage(RequestSpan requestSpan) {
try {
spanDataDataCarrier.produce(SpanDataBuilder.build(requestSpan));
- HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.INFO,"RequestSpan stored.");
+ HealthCollector.getCurrentHeathReading("StorageListener")
+ .updateData(HeathReading.INFO, "RequestSpan stored.");
return true;
} catch (Exception e) {
logger.error("RequestSpan trace-id[{}] store failure..", requestSpan.getTraceId(), e);
- HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR,"RequestSpan store failure.");
+ HealthCollector.getCurrentHeathReading("StorageListener")
+ .updateData(HeathReading.ERROR, "RequestSpan store failure.");
return false;
}
}
@@ -41,11 +43,12 @@ public class StorageListener implements SpanStorageListener {
public boolean storage(AckSpan ackSpan) {
try {
spanDataDataCarrier.produce(SpanDataBuilder.build(ackSpan));
- HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.INFO,"AckSpan stored.");
+ HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.INFO, "AckSpan stored.");
return true;
} catch (Exception e) {
logger.error("AckSpan trace-id[{}] store failure..", ackSpan.getTraceId(), e);
- HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR,"AckSpan store failure.");
+ HealthCollector.getCurrentHeathReading("StorageListener")
+ .updateData(HeathReading.ERROR, "AckSpan store failure.");
return false;
}
}