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 2019/03/08 09:41:33 UTC
[incubator-skywalking] branch master updated: Envoy heartbeat
update bug (#2334)
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 93347b2 Envoy heartbeat update bug (#2334)
93347b2 is described below
commit 93347b234084ed02c0918c7eca401535c1f27c42
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Mar 8 17:41:26 2019 +0800
Envoy heartbeat update bug (#2334)
---
.../oap/server/receiver/envoy/MetricServiceGRPCHandler.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
index 5ccaa88..9f9c82e 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
@@ -96,6 +96,7 @@ public class MetricServiceGRPCHandler extends MetricsServiceGrpc.MetricsServiceI
if (serviceInstanceId != Const.NONE) {
List<Metrics.MetricFamily> list = message.getEnvoyMetricsList();
+ boolean needHeartbeatUpdate = true;
for (int i = 0; i < list.size(); i++) {
counter.inc();
HistogramMetric.Timer timer = histogram.createTimer();
@@ -123,10 +124,11 @@ public class MetricServiceGRPCHandler extends MetricsServiceGrpc.MetricsServiceI
default:
continue;
}
- if (i == 0) {
+ if (needHeartbeatUpdate) {
// Send heartbeat
serviceInventoryRegister.heartbeat(serviceId, timestamp);
serviceInstanceInventoryRegister.heartbeat(serviceInstanceId, timestamp);
+ needHeartbeatUpdate = false;
}
} finally {
timer.finish();