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

Merge pull request #313 from ascrutae/zhangxin/fix/send-duplidate-jvm-data 

fix send duplicate jvm data issue
This commit is contained in:
吴晟 Wu Sheng 2017-07-25 11:44:11 +08:00 committed by GitHub
parent cfa8ef1b13 ca7619d069
commit 426d339a3f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/JVMService.java
View File

@ -83,7 +83,7 @@ public class JVMService implements BootService, Runnable {
jvmBuilder.addAllGc(GCProvider.INSTANCE.getGCList());
JVMMetric jvmMetric = jvmBuilder.build();
if (queue.offer(jvmMetric)) {
if (!queue.offer(jvmMetric)) {
queue.poll();
queue.offer(jvmMetric);
}
@ -107,10 +107,11 @@ public class JVMService implements BootService, Runnable {
JVMMetrics.Builder builder = JVMMetrics.newBuilder();
LinkedList<JVMMetric> buffer = new LinkedList<JVMMetric>();
queue.drainTo(buffer);
builder.addAllMetrics(buffer);
builder.setApplicationInstanceId(RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID);
stub.collect(builder.build());
if (buffer.size() > 0) {
builder.addAllMetrics(buffer);
builder.setApplicationInstanceId(RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID);
stub.collect(builder.build());
}
} catch (Throwable t) {
logger.error(t, "send JVM metrics to Collector fail.");
}