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 2021/11/19 05:04:20 UTC
[skywalking] branch master updated: Change `SO11Y` metric `envoy_als_in_count` to calculate the ALS message count. (#8150)
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/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b2e8438 Change `SO11Y` metric `envoy_als_in_count` to calculate the ALS message count. (#8150)
b2e8438 is described below
commit b2e8438820cabb1fbf392217fa42e8de6e1a47fd
Author: mrproliu <74...@qq.com>
AuthorDate: Fri Nov 19 13:03:59 2021 +0800
Change `SO11Y` metric `envoy_als_in_count` to calculate the ALS message count. (#8150)
* Change `SO11Y` metric `envoy_als_in_count` to calculate the ALS message count.
---
CHANGES.md | 1 +
.../oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index e448ff9..3d6738e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -49,6 +49,7 @@ Release Notes.
* Fix `max` function in OAL doesn't support negative long.
* Add `MicroBench` module to make it easier for developers to write JMH test.
* Upgrade Kubernetes Java client to 14.0.0, supports GCP token refreshing and fixes some bugs.
+* Change `SO11Y` metric `envoy_als_in_count` to calculate the ALS message count.
#### UI
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
index 14c052e..1915a44 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
@@ -80,7 +80,7 @@ public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogS
MetricsCreator metricCreator = manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class);
counter = metricCreator.createCounter(
- "envoy_als_in_count", "The count of envoy ALS metric received", MetricsTag.EMPTY_KEY,
+ "envoy_als_in_count", "The count of envoy ALS message received", MetricsTag.EMPTY_KEY,
MetricsTag.EMPTY_VALUE
);
histogram = metricCreator.createHistogramMetric(
@@ -103,8 +103,6 @@ public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogS
@Override
public void onNext(StreamAccessLogsMessage message) {
- counter.inc();
-
HistogramMetrics.Timer timer = histogram.createTimer();
try {
if (isFirst) {
@@ -129,6 +127,7 @@ public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogS
switch (logCase) {
case HTTP_LOGS:
StreamAccessLogsMessage.HTTPAccessLogEntries logs = message.getHttpLogs();
+ counter.inc(logs.getLogEntryCount());
for (final HTTPAccessLogEntry log : logs.getLogEntryList()) {
AccessLogAnalyzer.Result result = AccessLogAnalyzer.Result.builder().build();
@@ -143,6 +142,7 @@ public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogS
break;
case TCP_LOGS:
StreamAccessLogsMessage.TCPAccessLogEntries tcpLogs = message.getTcpLogs();
+ counter.inc(tcpLogs.getLogEntryCount());
for (final TCPAccessLogEntry tcpLog : tcpLogs.getLogEntryList()) {
AccessLogAnalyzer.Result result = AccessLogAnalyzer.Result.builder().build();