From bf8cdbcb363311bdda690d3dcc376b9229f191ac Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 11:36:00 +0800 Subject: [PATCH 1/7] Envoy metrics service receiver: support adapter listener metrics. --- .../envoy/MetricServiceGRPCHandler.java | 3 +- .../adapters/ListenerMetricsAdapter.java | 41 +++++++++ .../ProtoMetricFamily2MetricsAdapter.java | 5 ++ .../ClusterManagerMetricsAdapterTest.java | 5 +- .../envoy/ListenerMetricsAdapterTest.java | 89 +++++++++++++++++++ 5 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java create mode 100644 oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ListenerMetricsAdapterTest.java 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 bb40f18f3a84..abac6d10d298 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 @@ -42,6 +42,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleStartException; import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Metric; import org.apache.skywalking.oap.server.receiver.envoy.als.ServiceMetaInfo; +import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ListenerMetricsAdapter; import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ProtoMetricFamily2MetricsAdapter; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; @@ -112,7 +113,7 @@ public void onNext(StreamMetricsMessage message) { counter.inc(); try (final HistogramMetrics.Timer ignored = histogram.createTimer()) { final ProtoMetricFamily2MetricsAdapter adapter = new ProtoMetricFamily2MetricsAdapter( - metricFamily, config.getClusterManagerMetricsAdapter()); + metricFamily, config.getClusterManagerMetricsAdapter(), new ListenerMetricsAdapter()); adapter.adapt().forEach(it -> { it.getLabels().putIfAbsent("app", service.getServiceName()); it.getLabels().putIfAbsent("instance", service.getServiceInstanceName()); diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java new file mode 100644 index 000000000000..37b11e103695 --- /dev/null +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters; + +import io.prometheus.client.Metrics; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@RequiredArgsConstructor +public class ListenerMetricsAdapter { + + public String adaptMetricsName(final Metrics.MetricFamily metricFamily) { + + return "envoy_listener_metrics"; + } + + public Map adaptLabels(final Metrics.MetricFamily metricFamily, final Map labels) { + String metricsName = metricFamily.getName(); + labels.putIfAbsent("metrics_name", metricsName); + + return labels; + } +} diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ProtoMetricFamily2MetricsAdapter.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ProtoMetricFamily2MetricsAdapter.java index 1be1966dff82..d963641154ae 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ProtoMetricFamily2MetricsAdapter.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ProtoMetricFamily2MetricsAdapter.java @@ -35,6 +35,7 @@ public class ProtoMetricFamily2MetricsAdapter { protected final Metrics.MetricFamily metricFamily; private final ClusterManagerMetricsAdapter clusterManagerMetricsAdapter; + private final ListenerMetricsAdapter listenerMetricsAdapter; public Stream adapt() { switch (metricFamily.getType()) { @@ -75,6 +76,8 @@ public Stream adapt() { public String adaptMetricsName(final Metrics.Metric metric) { if (metricFamily.getName().startsWith("cluster.")) { return clusterManagerMetricsAdapter.adaptMetricsName(metricFamily); + } else if (metricFamily.getName().startsWith("listener.")) { + return listenerMetricsAdapter.adaptMetricsName(metricFamily); } return metricFamily.getName(); @@ -90,6 +93,8 @@ public Map adaptLabels(final Metrics.Metric metric) { .collect(toMap(Metrics.LabelPair::getName, Metrics.LabelPair::getValue)); if (metricFamily.getName().startsWith("cluster.")) { return clusterManagerMetricsAdapter.adaptLabels(metricFamily, labels); + } else if (metricFamily.getName().startsWith("listener.")) { + return listenerMetricsAdapter.adaptLabels(metricFamily, labels); } return labels; diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ClusterManagerMetricsAdapterTest.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ClusterManagerMetricsAdapterTest.java index 067721a0230a..0e0aa3439af5 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ClusterManagerMetricsAdapterTest.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ClusterManagerMetricsAdapterTest.java @@ -37,6 +37,7 @@ public class ClusterManagerMetricsAdapterTest { private Metrics.MetricFamily cbNameOutboundFQDN = Metrics.MetricFamily.newBuilder().setName("cluster.outbound|9080||reviews.default.svc.cluster.local.circuit_breakers.default.cx_pool_open").build(); private Metrics.MetricFamily cbNameOutboundFQDNSubset = Metrics.MetricFamily.newBuilder().setName("cluster.outbound|9080|v1|reviews.default.svc.cluster.local.circuit_breakers.default.cx_pool_open").build(); private Metrics.MetricFamily cbNameInboundFQDN = Metrics.MetricFamily.newBuilder().setName("cluster.inbound|9080||.upstream_cx_total").build(); + private Metrics.MetricFamily ca = Metrics.MetricFamily.newBuilder().setName("cluster.outbound|9080|v2-mysql|ratings.default.svc.cluster.local;.ssl.certificate.ROOTCA.expiration_unix_time_seconds").build(); @SneakyThrows @BeforeEach @@ -68,6 +69,8 @@ public void testAdaptLabels() { assertThat( clusterManagerMetricsAdapter.adaptLabels(cbNameInboundFQDN, new HashMap<>()).toString() ).isEqualTo("{cluster_name=-.inbound:9080.-, metrics_name=" + cbNameInboundFQDN.getName() + "}"); - + assertThat( + clusterManagerMetricsAdapter.adaptLabels(ca, new HashMap<>()).toString() + ).isEqualTo("{cluster_name=v2-mysql.ratings.default, metrics_name=" + ca.getName() + "}"); } } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ListenerMetricsAdapterTest.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ListenerMetricsAdapterTest.java new file mode 100644 index 000000000000..efbb7e6ab859 --- /dev/null +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/ListenerMetricsAdapterTest.java @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.oap.server.receiver.envoy; + +import io.prometheus.client.Metrics; +import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ListenerMetricsAdapter; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +public class ListenerMetricsAdapterTest { + + private ListenerMetricsAdapter listenerMetricsAdapter; + private final Metrics.MetricFamily downstream = Metrics.MetricFamily.newBuilder() + .setName( + "listener.0.0.0.0_15090.downstream_cx_total") + .build(); + private final Metrics.MetricFamily http = Metrics.MetricFamily.newBuilder() + .setName( + "listener.0.0.0.0_15090.http.inbound_0.0.0.0_15090.downstream_rq_2xx") + .build(); + private final Metrics.MetricFamily adminListener = Metrics.MetricFamily.newBuilder() + .setName( + "listener.admin.downstream_cx_destroy") + .build(); + private final Metrics.MetricFamily virtualListener = Metrics.MetricFamily.newBuilder() + .setName( + "listener.0.0.0.0_15001.downstream_cx_active") + .build(); + private final Metrics.MetricFamily ca = Metrics.MetricFamily.newBuilder() + .setName( + "listener.0.0.0.0_15006.ssl.certificate.ROOTCA.expiration_unix_time_seconds") + .build(); + + @BeforeEach + public void setUp() { + listenerMetricsAdapter = new ListenerMetricsAdapter(); + } + + @Test + public void testAdaptMetricsName() { + assertThat(listenerMetricsAdapter.adaptMetricsName(downstream)).isEqualTo("envoy_listener_metrics"); + assertThat(listenerMetricsAdapter.adaptMetricsName(http)).isEqualTo("envoy_listener_metrics"); + assertThat(listenerMetricsAdapter.adaptMetricsName(adminListener)).isEqualTo("envoy_listener_metrics"); + assertThat(listenerMetricsAdapter.adaptMetricsName(virtualListener)).isEqualTo("envoy_listener_metrics"); + assertThat(listenerMetricsAdapter.adaptMetricsName(ca)).isEqualTo("envoy_listener_metrics"); + } + + @Test + public void testAdaptLabels() { + assertThat( + listenerMetricsAdapter.adaptLabels(downstream, new HashMap<>()).toString() + ).isEqualTo("{metrics_name=" + downstream.getName() + "}"); + + assertThat( + listenerMetricsAdapter.adaptLabels(http, new HashMap<>()).toString() + ).isEqualTo("{metrics_name=" + http.getName() + "}"); + + assertThat( + listenerMetricsAdapter.adaptLabels(adminListener, new HashMap<>()).toString() + ).isEqualTo("{metrics_name=" + adminListener.getName() + "}"); + + assertThat( + listenerMetricsAdapter.adaptLabels(virtualListener, new HashMap<>()).toString() + ).isEqualTo("{metrics_name=" + virtualListener.getName() + "}"); + assertThat( + listenerMetricsAdapter.adaptLabels(ca, new HashMap<>()).toString() + ).isEqualTo("{metrics_name=" + ca.getName() + "}"); + } +} From 47c9ca03dcad4157a6271ca3854d5afbcaa11b57 Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 11:37:05 +0800 Subject: [PATCH 2/7] changes --- docs/en/changes/changes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 3456dcfc65e3..f6c0bd8134e4 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -29,6 +29,7 @@ * `BanyanDB Client`: Property query support `Order By`. * MQE: trim the label values condition for the labeled metrics query to enhance the readability. * PromQL service: fix time parse issue when using RFC3339 time format for querying. +* Envoy metrics service receiver: support adapter listener metrics. #### UI * Fix the missing icon in new native trace view. From a437dd1ffc83f6e05476ceec33c64fda144805c8 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Thu, 5 Feb 2026 11:46:00 +0800 Subject: [PATCH 3/7] Update oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../envoy/metrics/adapters/ListenerMetricsAdapter.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java index 37b11e103695..dabccbc0de75 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java @@ -21,9 +21,6 @@ import io.prometheus.client.Metrics; import java.util.Map; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j @RequiredArgsConstructor public class ListenerMetricsAdapter { From 9cf362b928ae64bf482f742fcf0c96bb24dabca1 Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 11:50:46 +0800 Subject: [PATCH 4/7] style --- .../oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java | 4 ++++ .../oap/server/receiver/envoy/MetricServiceGRPCHandler.java | 2 +- .../envoy/metrics/adapters/ListenerMetricsAdapter.java | 1 + 3 files changed, 6 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/EnvoyMetricReceiverConfig.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java index 5ae7cee716a6..dfe7a8030cc5 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java @@ -33,6 +33,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig; import org.apache.skywalking.oap.server.library.module.ModuleStartException; import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ClusterManagerMetricsAdapter; +import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ListenerMetricsAdapter; public class EnvoyMetricReceiverConfig extends ModuleConfig { @Getter @@ -67,6 +68,9 @@ public class EnvoyMetricReceiverConfig extends ModuleConfig { private final ServiceMetaInfoFactory serviceMetaInfoFactory = new ServiceMetaInfoFactoryImpl(); @Getter private final ClusterManagerMetricsAdapter clusterManagerMetricsAdapter = new ClusterManagerMetricsAdapter(this); + @Getter + private final ListenerMetricsAdapter listenerMetricsAdapter = new ListenerMetricsAdapter(); + public List getAlsHTTPAnalysis() { if (Strings.isNullOrEmpty(alsHTTPAnalysis)) { 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 abac6d10d298..994994d56b2e 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 @@ -113,7 +113,7 @@ public void onNext(StreamMetricsMessage message) { counter.inc(); try (final HistogramMetrics.Timer ignored = histogram.createTimer()) { final ProtoMetricFamily2MetricsAdapter adapter = new ProtoMetricFamily2MetricsAdapter( - metricFamily, config.getClusterManagerMetricsAdapter(), new ListenerMetricsAdapter()); + metricFamily, config.getClusterManagerMetricsAdapter(), config.getListenerMetricsAdapter()); adapter.adapt().forEach(it -> { it.getLabels().putIfAbsent("app", service.getServiceName()); it.getLabels().putIfAbsent("instance", service.getServiceInstanceName()); diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java index dabccbc0de75..e7b7330ad05d 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java @@ -21,6 +21,7 @@ import io.prometheus.client.Metrics; import java.util.Map; import lombok.RequiredArgsConstructor; + @RequiredArgsConstructor public class ListenerMetricsAdapter { From eed96f96b45f6896654675303e2626ae08dc9d94 Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 11:52:41 +0800 Subject: [PATCH 5/7] style --- .../envoy/metrics/adapters/ListenerMetricsAdapter.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java index e7b7330ad05d..6307bf0a771f 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ListenerMetricsAdapter.java @@ -20,13 +20,10 @@ import io.prometheus.client.Metrics; import java.util.Map; -import lombok.RequiredArgsConstructor; -@RequiredArgsConstructor public class ListenerMetricsAdapter { public String adaptMetricsName(final Metrics.MetricFamily metricFamily) { - return "envoy_listener_metrics"; } From bc75da4eba185beee63d03e392a6b2f2b0ea471f Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 12:18:29 +0800 Subject: [PATCH 6/7] style --- .../oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java | 1 - .../oap/server/receiver/envoy/MetricServiceGRPCHandler.java | 1 - 2 files changed, 2 deletions(-) diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java index dfe7a8030cc5..6572c42faac4 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java @@ -71,7 +71,6 @@ public class EnvoyMetricReceiverConfig extends ModuleConfig { @Getter private final ListenerMetricsAdapter listenerMetricsAdapter = new ListenerMetricsAdapter(); - public List getAlsHTTPAnalysis() { if (Strings.isNullOrEmpty(alsHTTPAnalysis)) { return Collections.emptyList(); 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 994994d56b2e..921edfee10c4 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 @@ -42,7 +42,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleStartException; import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Metric; import org.apache.skywalking.oap.server.receiver.envoy.als.ServiceMetaInfo; -import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ListenerMetricsAdapter; import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ProtoMetricFamily2MetricsAdapter; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; From 960cce8d2873774358b34e499ac7349267f7ff3a Mon Sep 17 00:00:00 2001 From: wankai123 Date: Thu, 5 Feb 2026 14:06:57 +0800 Subject: [PATCH 7/7] increase virtualMQ e2e verify interval --- test/e2e-v2/cases/virtual-mq/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e-v2/cases/virtual-mq/e2e.yaml b/test/e2e-v2/cases/virtual-mq/e2e.yaml index 7256e86f57d2..23cf780cc3ae 100644 --- a/test/e2e-v2/cases/virtual-mq/e2e.yaml +++ b/test/e2e-v2/cases/virtual-mq/e2e.yaml @@ -38,7 +38,7 @@ trigger: verify: retry: count: 20 - interval: 3s + interval: 10s cases: - includes: - mq-cases.yaml