You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/10/15 08:02:57 UTC
[incubator-skywalking] branch master updated: Fixed JVM handler
error. Forgot to use break in switch case code. (#1766)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new c467e5c Fixed JVM handler error. Forgot to use break in switch case code. (#1766)
c467e5c is described below
commit c467e5c723e75b0f515b4823e84de4522824882d
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Oct 15 16:02:51 2018 +0800
Fixed JVM handler error. Forgot to use break in switch case code. (#1766)
---
.../jvm/provider/handler/JVMMetricsServiceHandler.java | 13 ++++++++-----
.../provider/handler/JVMMetricsServiceHandlerMainTest.java | 7 ++++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandler.java
index f46bd8f..f2c7c77 100644
--- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandler.java
@@ -55,7 +55,6 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
sendToMemoryMetricProcess(serviceInstanceId, minuteTimeBucket, metric.getMemoryList());
sendToMemoryPoolMetricProcess(serviceInstanceId, minuteTimeBucket, metric.getMemoryPoolList());
sendToGCMetricProcess(serviceInstanceId, minuteTimeBucket, metric.getGcList());
- sendToInstanceHeartBeatProcess(serviceInstanceId, metric.getTime());
});
responseObserver.onNext(Downstream.newBuilder().build());
@@ -84,8 +83,10 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
switch (gc.getPhrase()) {
case NEW:
serviceInstanceJVMGC.setPhrase(GCPhrase.NEW);
+ break;
case OLD:
serviceInstanceJVMGC.setPhrase(GCPhrase.OLD);
+ break;
}
serviceInstanceJVMGC.setTime(gc.getTime());
@@ -125,16 +126,22 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
switch (memoryPool.getType()) {
case NEWGEN_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.NEWGEN_USAGE);
+ break;
case OLDGEN_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.OLDGEN_USAGE);
+ break;
case PERMGEN_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.PERMGEN_USAGE);
+ break;
case SURVIVOR_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.SURVIVOR_USAGE);
+ break;
case METASPACE_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.METASPACE_USAGE);
+ break;
case CODE_CACHE_USAGE:
serviceInstanceJVMMemoryPool.setPoolType(MemoryPoolType.CODE_CACHE_USAGE);
+ break;
}
serviceInstanceJVMMemoryPool.setInit(memoryPool.getInit());
@@ -145,8 +152,4 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
sourceReceiver.receive(serviceInstanceJVMMemoryPool);
});
}
-
- private void sendToInstanceHeartBeatProcess(int instanceId, long heartBeatTime) {
-// instanceHeartBeatService.heartBeat(instanceId, heartBeatTime);
- }
}
diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandlerMainTest.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandlerMainTest.java
index ffa2c8d..79da3c8 100644
--- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandlerMainTest.java
+++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandlerMainTest.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.oap.server.receiver.jvm.provider.handler;
import io.grpc.*;
+import java.util.concurrent.*;
import org.apache.skywalking.apm.network.language.agent.*;
/**
@@ -31,8 +32,12 @@ public class JVMMetricsServiceHandlerMainTest {
JVMMetricsServiceGrpc.JVMMetricsServiceBlockingStub stub = JVMMetricsServiceGrpc.newBlockingStub(channel);
+ Executors.newSingleThreadScheduledExecutor().schedule(() -> send(stub), 1, TimeUnit.SECONDS);
+ }
+
+ private static void send(JVMMetricsServiceGrpc.JVMMetricsServiceBlockingStub stub) {
JVMMetrics.Builder jvmMetrics = JVMMetrics.newBuilder();
- jvmMetrics.setApplicationInstanceId(1);
+ jvmMetrics.setApplicationInstanceId(2);
JVMMetric.Builder jvmMetricBuilder = JVMMetric.newBuilder();
jvmMetricBuilder.setTime(System.currentTimeMillis());