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 2020/05/09 11:28:04 UTC
[skywalking] branch oal updated: Add Envoy OAL define.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch oal
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/oal by this push:
new 4a9eb92 Add Envoy OAL define.
4a9eb92 is described below
commit 4a9eb92e284eb89a395206821954682a86207c69
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat May 9 19:27:42 2020 +0800
Add Envoy OAL define.
---
.../src/main/resources/application.yml | 1 +
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 3 +++
.../envoy/EnvoyMetricReceiverProvider.java | 10 ++++++++-
...tricReceiverConfig.java => EnvoyOALDefine.java} | 26 ++++++++++------------
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml b/oap-server/server-bootstrap/src/main/resources/application.yml
index d2bbae5..b31df6d 100755
--- a/oap-server/server-bootstrap/src/main/resources/application.yml
+++ b/oap-server/server-bootstrap/src/main/resources/application.yml
@@ -192,6 +192,7 @@ istio-telemetry:
envoy-metric:
selector: ${SW_ENVOY_METRIC:default}
default:
+ acceptMetricsService: ${SW_ENVOY_METRIC_SERVICE:true}
alsHTTPAnalysis: ${SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS:""}
prometheus-fetcher:
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 6f63771..67e1071 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
@@ -23,9 +23,12 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import lombok.Getter;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
public class EnvoyMetricReceiverConfig extends ModuleConfig {
+ @Getter
+ private boolean acceptMetricsService = false;
private String alsHTTPAnalysis;
public List<String> getAlsHTTPAnalysis() {
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java
index 0d57be1..c546386 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.oap.server.receiver.envoy;
import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.oal.rt.OALEngineLoaderService;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
@@ -60,7 +61,14 @@ public class EnvoyMetricReceiverProvider extends ModuleProvider {
GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME)
.provider()
.getService(GRPCHandlerRegister.class);
- service.addHandler(new MetricServiceGRPCHandler(getManager()));
+ if (config.isAcceptMetricsService()) {
+ getManager().find(CoreModule.NAME)
+ .provider()
+ .getService(OALEngineLoaderService.class)
+ .load(EnvoyOALDefine.INSTANCE);
+
+ service.addHandler(new MetricServiceGRPCHandler(getManager()));
+ }
service.addHandler(new AccessLogServiceGRPCHandler(getManager(), config));
}
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/EnvoyOALDefine.java
similarity index 59%
copy from oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
copy to oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyOALDefine.java
index 6f63771..da0ba4c 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/EnvoyOALDefine.java
@@ -18,20 +18,18 @@
package org.apache.skywalking.oap.server.receiver.envoy;
-import com.google.common.base.Strings;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.skywalking.oap.server.library.module.ModuleConfig;
+import org.apache.skywalking.oap.server.core.oal.rt.OALDefine;
-public class EnvoyMetricReceiverConfig extends ModuleConfig {
- private String alsHTTPAnalysis;
+/**
+ * Envoy OAl script includes the metrics related to Envoy only.
+ */
+public class EnvoyOALDefine extends OALDefine {
+ public static final EnvoyOALDefine INSTANCE = new EnvoyOALDefine();
- public List<String> getAlsHTTPAnalysis() {
- if (Strings.isNullOrEmpty(alsHTTPAnalysis)) {
- return Collections.EMPTY_LIST;
- }
- return Arrays.stream(alsHTTPAnalysis.trim().split(",")).map(String::trim).collect(Collectors.toList());
+ private EnvoyOALDefine() {
+ super(
+ "oal/envoy.oal",
+ "org.apache.skywalking.oap.server.core.source"
+ );
}
-}
+}
\ No newline at end of file