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/06/10 07:13:20 UTC
[skywalking] branch envoy created (now e747bcc)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch envoy
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at e747bcc Fix miss change of envoy receiver.
This branch includes the following new commits:
new e747bcc Fix miss change of envoy receiver.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Fix miss change of envoy receiver.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch envoy
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit e747bcc0dc095a2d0711a487f0d533963dc96c9c
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jun 10 15:13:09 2019 +0800
Fix miss change of envoy receiver.
---
.../oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java | 5 +++--
.../istio/telemetry/provider/IstioTelemetryReceiverProvider.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
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 398eac9..c37b3d5 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
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.receiver.envoy;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.library.module.*;
+import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
/**
@@ -50,7 +51,7 @@ public class EnvoyMetricReceiverProvider extends ModuleProvider {
}
@Override public void start() throws ServiceNotProvidedException, ModuleStartException {
- GRPCHandlerRegister service = getManager().find(CoreModule.NAME).provider().getService(GRPCHandlerRegister.class);
+ GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class);
service.addHandler(new MetricServiceGRPCHandler(getManager()));
service.addHandler(new AccessLogServiceGRPCHandler(getManager(), config));
}
@@ -60,6 +61,6 @@ public class EnvoyMetricReceiverProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[] {TelemetryModule.NAME, CoreModule.NAME};
+ return new String[] {TelemetryModule.NAME, CoreModule.NAME, SharingServerModule.NAME};
}
}
diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
index ee61fb6..3c87887 100644
--- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
+++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
@@ -52,6 +52,6 @@ public class IstioTelemetryReceiverProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[] {TelemetryModule.NAME, CoreModule.NAME, MeshReceiverModule.NAME};
+ return new String[] {TelemetryModule.NAME, CoreModule.NAME, MeshReceiverModule.NAME, SharingServerModule.NAME};
}
}
\ No newline at end of file