From c983d85000b39d3258cd15c37d41682bd7f39329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 10 Jun 2019 16:15:34 +0800 Subject: [PATCH] Fix miss change of envoy receiver. (#2844) --- .../server/receiver/envoy/EnvoyMetricReceiverProvider.java | 5 +++-- .../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 398eac91b2..c37b3d5a75 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 ee61fb6802..3c878875d6 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 -- GitLab