From 3a318128545627da1420fb26eb24030df07623b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <pengys@apache.org>
Date: Fri, 10 May 2019 12:02:17 +0800
Subject: [PATCH] Recover the module name of envoy-metric. (#2645)

---
 docs/en/setup/backend/backend-receivers.md                    | 4 ++--
 .../oap/server/receiver/envoy/EnvoyMetricReceiverModule.java  | 2 +-
 oap-server/server-starter/src/main/assembly/application.yml   | 2 +-
 oap-server/server-starter/src/main/resources/application.yml  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/setup/backend/backend-receivers.md b/docs/en/setup/backend/backend-receivers.md
index 2a2540f7c..a5cd09b4a 100644
--- a/docs/en/setup/backend/backend-receivers.md
+++ b/docs/en/setup/backend/backend-receivers.md
@@ -10,7 +10,7 @@ We have following receivers, and `default` implementors are provided in our Apac
 1. **service-mesh**. gRPC services accept data from inbound mesh probes.
 1. **receiver-jvm**. gRPC services accept JVM metrics data.
 1. **istio-telemetry**. Istio telemetry is from Istio official bypass adaptor, this receiver match its gRPC services.
-1. **envoy-metrics**. Envoy `metrics_service` supported by this receiver. OAL script support all GAUGE type metrics. 
+1. **envoy-metric**. Envoy `metrics_service` supported by this receiver. OAL script support all GAUGE type metrics. 
 1. **receiver_zipkin**. See [details](#zipkin-receiver).
 1. **receiver_jaeger**. See [details](#jaeger-receiver).
 
@@ -35,7 +35,7 @@ service-mesh:
     bufferFileCleanWhenRestart: false
 istio-telemetry:
   default:
-envoy-metrics:
+envoy-metric:
   default:
 receiver_zipkin:
   default:
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
index 449518f08..d43042877 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
@@ -26,7 +26,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine;
  * @author wusheng
  */
 public class EnvoyMetricReceiverModule extends ModuleDefine {
-    public static final String NAME = "envoy-metrics";
+    public static final String NAME = "envoy-metric";
 
     public EnvoyMetricReceiverModule() {
         super(NAME);
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index 0f25c93f1..cd71767a5 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -100,7 +100,7 @@ service-mesh:
     bufferFileCleanWhenRestart: ${SW_SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
 istio-telemetry:
   default:
-envoy-metrics:
+envoy-metric:
   default:
 #receiver_zipkin:
 #  default:
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 27a9f25d0..08ccd0635 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -100,7 +100,7 @@ service-mesh:
     bufferFileCleanWhenRestart: ${SW_SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
 istio-telemetry:
   default:
-envoy-metrics:
+envoy-metric:
   default:
 #receiver_zipkin:
 #  default: