kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将datacarrier改成1.2版本，修复Health Report 无法 format string问题

This commit is contained in:
ascrutae 2016-11-15 16:06:20 +08:00
parent 7eb409bb94
commit 608b44e1f0
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HeathReading.java
View File

@ -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();
}

13
skywalking-storage-center/pom.xml
View File

@ -32,7 +32,18 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>data-carrier</artifactId>
<version>1.1</version>
<version>1.2</version>
</dependency>
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>DataCarrier</id>
<name>bintray</name>
<url>https://jcenter.bintray.com</url>
</repository>
</repositories>
</project>

11
skywalking-storage-center/skywalking-storage/pom.xml
View File

@ -132,15 +132,4 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-wu-sheng-DataCarrier</id>
<name>bintray</name>
<url>http://dl.bintray.com/wu-sheng/DataCarrier</url>
</repository>
</repositories>
</project>

3
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java
View File

@ -19,7 +19,8 @@ public class SpanDataConsumer implements IConsumer<SpanData> {
private IndexDBConnectorCache cache;
private DataFileWriter fileWriter;
public SpanDataConsumer() {
@Override
public void init() {
cache = new IndexDBConnectorCache();
fileWriter = new DataFileWriter();
}

13
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
View File

@ -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;
}
}