From 63f5e93aebe772d2f1b2948ef22f3e7b474ee860 Mon Sep 17 00:00:00 2001
From: Long Dai <long0dai@foxmail.com>
Date: Thu, 3 Jun 2021 00:39:35 -0700
Subject: [PATCH] stat_sinks: remove well_known_names

Signed-off-by: Long Dai <long0dai@foxmail.com>
---
 source/extensions/stat_sinks/BUILD                  | 11 -----------
 source/extensions/stat_sinks/dog_statsd/BUILD       |  1 -
 source/extensions/stat_sinks/dog_statsd/config.cc   |  3 +--
 source/extensions/stat_sinks/hystrix/BUILD          |  1 -
 source/extensions/stat_sinks/hystrix/config.cc      |  3 +--
 source/extensions/stat_sinks/metrics_service/BUILD  |  1 -
 .../extensions/stat_sinks/metrics_service/config.cc |  3 +--
 source/extensions/stat_sinks/statsd/BUILD           |  1 -
 source/extensions/stat_sinks/statsd/config.cc       |  3 +--
 source/extensions/stat_sinks/wasm/BUILD             |  1 -
 source/extensions/stat_sinks/wasm/config.cc         |  3 +--
 .../stats_sinks/dog_statsd/config_test.cc           |  9 ++++-----
 test/extensions/stats_sinks/hystrix/config_test.cc  |  3 +--
 test/extensions/stats_sinks/statsd/config_test.cc   | 13 ++++++-------
 test/extensions/stats_sinks/wasm/config_test.cc     |  3 +--
 test/server/configuration_impl_test.cc              |  3 +--
 16 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/source/extensions/stat_sinks/BUILD b/source/extensions/stat_sinks/BUILD
index 40a5e79b39d3..90e061ad8da3 100644
--- a/source/extensions/stat_sinks/BUILD
+++ b/source/extensions/stat_sinks/BUILD
@@ -1,19 +1,8 @@
 load(
     "//bazel:envoy_build_system.bzl",
-    "envoy_cc_library",
     "envoy_extension_package",
 )
 
 licenses(["notice"])  # Apache 2
 
 envoy_extension_package()
-
-envoy_cc_library(
-    name = "well_known_names",
-    hdrs = ["well_known_names.h"],
-    # well known names files are public as long as they exist.
-    visibility = ["//visibility:public"],
-    deps = [
-        "//source/common/singleton:const_singleton",
-    ],
-)
diff --git a/source/extensions/stat_sinks/dog_statsd/BUILD b/source/extensions/stat_sinks/dog_statsd/BUILD
index ce75b191dedd..5c62fcc58f0a 100644
--- a/source/extensions/stat_sinks/dog_statsd/BUILD
+++ b/source/extensions/stat_sinks/dog_statsd/BUILD
@@ -19,7 +19,6 @@ envoy_cc_extension(
         "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
-        "//source/extensions/stat_sinks:well_known_names",
         "//source/extensions/stat_sinks/common/statsd:statsd_lib",
         "//source/server:configuration_lib",
         "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
diff --git a/source/extensions/stat_sinks/dog_statsd/config.cc b/source/extensions/stat_sinks/dog_statsd/config.cc
index e31ac22f68e1..28a58a212ce7 100644
--- a/source/extensions/stat_sinks/dog_statsd/config.cc
+++ b/source/extensions/stat_sinks/dog_statsd/config.cc
@@ -8,7 +8,6 @@
 
 #include "source/common/network/resolver_impl.h"
 #include "source/extensions/stat_sinks/common/statsd/statsd.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "absl/types/optional.h"
 
@@ -38,7 +37,7 @@ ProtobufTypes::MessagePtr DogStatsdSinkFactory::createEmptyConfigProto() {
   return std::make_unique<envoy::config::metrics::v3::DogStatsdSink>();
 }
 
-std::string DogStatsdSinkFactory::name() const { return StatsSinkNames::get().DogStatsd; }
+std::string DogStatsdSinkFactory::name() const { return "envoy.stat_sinks.dog_statsd"; }
 
 /**
  * Static registration for the this sink factory. @see RegisterFactory.
diff --git a/source/extensions/stat_sinks/hystrix/BUILD b/source/extensions/stat_sinks/hystrix/BUILD
index 3908e49d3272..25a1ffa4a49f 100644
--- a/source/extensions/stat_sinks/hystrix/BUILD
+++ b/source/extensions/stat_sinks/hystrix/BUILD
@@ -20,7 +20,6 @@ envoy_cc_extension(
         "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
-        "//source/extensions/stat_sinks:well_known_names",
         "//source/server:configuration_lib",
         "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/stat_sinks/hystrix/config.cc b/source/extensions/stat_sinks/hystrix/config.cc
index b9ae021fb9af..684ce1cd873a 100644
--- a/source/extensions/stat_sinks/hystrix/config.cc
+++ b/source/extensions/stat_sinks/hystrix/config.cc
@@ -8,7 +8,6 @@
 
 #include "source/common/network/resolver_impl.h"
 #include "source/extensions/stat_sinks/hystrix/hystrix.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -28,7 +27,7 @@ ProtobufTypes::MessagePtr HystrixSinkFactory::createEmptyConfigProto() {
   return std::make_unique<envoy::config::metrics::v3::HystrixSink>();
 }
 
-std::string HystrixSinkFactory::name() const { return StatsSinkNames::get().Hystrix; }
+std::string HystrixSinkFactory::name() const { return "envoy.stat_sinks.hystrix"; }
 
 /**
  * Static registration for the statsd sink factory. @see RegisterFactory.
diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD
index 11ffe31b018a..97d79e032f03 100644
--- a/source/extensions/stat_sinks/metrics_service/BUILD
+++ b/source/extensions/stat_sinks/metrics_service/BUILD
@@ -47,7 +47,6 @@ envoy_cc_extension(
         "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
-        "//source/extensions/stat_sinks:well_known_names",
         "//source/extensions/stat_sinks/metrics_service:metrics_proto_descriptors_lib",
         "//source/extensions/stat_sinks/metrics_service:metrics_service_grpc_lib",
         "//source/server:configuration_lib",
diff --git a/source/extensions/stat_sinks/metrics_service/config.cc b/source/extensions/stat_sinks/metrics_service/config.cc
index ad34c75e6305..83976a07c2e9 100644
--- a/source/extensions/stat_sinks/metrics_service/config.cc
+++ b/source/extensions/stat_sinks/metrics_service/config.cc
@@ -10,7 +10,6 @@
 #include "source/common/network/resolver_impl.h"
 #include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h"
 #include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -48,7 +47,7 @@ ProtobufTypes::MessagePtr MetricsServiceSinkFactory::createEmptyConfigProto() {
       std::make_unique<envoy::config::metrics::v3::MetricsServiceConfig>());
 }
 
-std::string MetricsServiceSinkFactory::name() const { return StatsSinkNames::get().MetricsService; }
+std::string MetricsServiceSinkFactory::name() const { return "envoy.stat_sinks.metrics_service"; }
 
 /**
  * Static registration for the this sink factory. @see RegisterFactory.
diff --git a/source/extensions/stat_sinks/statsd/BUILD b/source/extensions/stat_sinks/statsd/BUILD
index 8ac0182eba9d..1443316f7151 100644
--- a/source/extensions/stat_sinks/statsd/BUILD
+++ b/source/extensions/stat_sinks/statsd/BUILD
@@ -19,7 +19,6 @@ envoy_cc_extension(
         "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
-        "//source/extensions/stat_sinks:well_known_names",
         "//source/extensions/stat_sinks/common/statsd:statsd_lib",
         "//source/server:configuration_lib",
         "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
diff --git a/source/extensions/stat_sinks/statsd/config.cc b/source/extensions/stat_sinks/statsd/config.cc
index e9656bfdb8e0..20fa5bef8fe3 100644
--- a/source/extensions/stat_sinks/statsd/config.cc
+++ b/source/extensions/stat_sinks/statsd/config.cc
@@ -8,7 +8,6 @@
 
 #include "source/common/network/resolver_impl.h"
 #include "source/extensions/stat_sinks/common/statsd/statsd.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -45,7 +44,7 @@ ProtobufTypes::MessagePtr StatsdSinkFactory::createEmptyConfigProto() {
   return std::make_unique<envoy::config::metrics::v3::StatsdSink>();
 }
 
-std::string StatsdSinkFactory::name() const { return StatsSinkNames::get().Statsd; }
+std::string StatsdSinkFactory::name() const { return "envoy.stat_sinks.statsd"; }
 
 /**
  * Static registration for the statsd sink factory. @see RegisterFactory.
diff --git a/source/extensions/stat_sinks/wasm/BUILD b/source/extensions/stat_sinks/wasm/BUILD
index 1747789d6c7a..ce5f63bfb616 100644
--- a/source/extensions/stat_sinks/wasm/BUILD
+++ b/source/extensions/stat_sinks/wasm/BUILD
@@ -21,7 +21,6 @@ envoy_cc_extension(
         "//envoy/server:factory_context_interface",
         "//envoy/server:instance_interface",
         "//source/extensions/common/wasm:wasm_lib",
-        "//source/extensions/stat_sinks:well_known_names",
         "//source/server:configuration_lib",
         "@envoy_api//envoy/extensions/stat_sinks/wasm/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/stat_sinks/wasm/config.cc b/source/extensions/stat_sinks/wasm/config.cc
index 8e1ffd9274d4..9d6f463b5742 100644
--- a/source/extensions/stat_sinks/wasm/config.cc
+++ b/source/extensions/stat_sinks/wasm/config.cc
@@ -8,7 +8,6 @@
 
 #include "source/extensions/common/wasm/wasm.h"
 #include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -56,7 +55,7 @@ ProtobufTypes::MessagePtr WasmSinkFactory::createEmptyConfigProto() {
   return std::make_unique<envoy::extensions::stat_sinks::wasm::v3::Wasm>();
 }
 
-std::string WasmSinkFactory::name() const { return StatsSinkNames::get().Wasm; }
+std::string WasmSinkFactory::name() const { return "envoy.stat_sinks.wasm"; }
 
 /**
  * Static registration for the wasm access log. @see RegisterFactory.
diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc
index 6a7e285bf5f1..eb8381c14334 100644
--- a/test/extensions/stats_sinks/dog_statsd/config_test.cc
+++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc
@@ -6,7 +6,6 @@
 #include "source/common/protobuf/utility.h"
 #include "source/extensions/stat_sinks/common/statsd/statsd.h"
 #include "source/extensions/stat_sinks/dog_statsd/config.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
@@ -30,7 +29,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, DogStatsdConfigLoopbackTest,
                          TestUtility::ipTestParamsToString);
 
 TEST_P(DogStatsdConfigLoopbackTest, ValidUdpIp) {
-  const std::string name = StatsSinkNames::get().DogStatsd;
+  const std::string name = "envoy.stat_sinks.dog_statsd";
 
   envoy::config::metrics::v3::DogStatsdSink sink_config;
   envoy::config::core::v3::Address& address = *sink_config.mutable_address();
@@ -66,7 +65,7 @@ TEST(DogStatsdConfigTest, ValidateFail) {
 }
 
 TEST_P(DogStatsdConfigLoopbackTest, CustomBufferSize) {
-  const std::string name = StatsSinkNames::get().DogStatsd;
+  const std::string name = "envoy.stat_sinks.dog_statsd";
 
   envoy::config::metrics::v3::DogStatsdSink sink_config;
   sink_config.mutable_max_bytes_per_datagram()->set_value(128);
@@ -94,7 +93,7 @@ TEST_P(DogStatsdConfigLoopbackTest, CustomBufferSize) {
 }
 
 TEST_P(DogStatsdConfigLoopbackTest, DefaultBufferSize) {
-  const std::string name = StatsSinkNames::get().DogStatsd;
+  const std::string name = "envoy.stat_sinks.dog_statsd";
 
   envoy::config::metrics::v3::DogStatsdSink sink_config;
   envoy::config::core::v3::Address& address = *sink_config.mutable_address();
@@ -122,7 +121,7 @@ TEST_P(DogStatsdConfigLoopbackTest, DefaultBufferSize) {
 }
 
 TEST_P(DogStatsdConfigLoopbackTest, WithCustomPrefix) {
-  const std::string name = StatsSinkNames::get().DogStatsd;
+  const std::string name = "envoy.stat_sinks.dog_statsd";
 
   envoy::config::metrics::v3::DogStatsdSink sink_config;
   envoy::config::core::v3::Address& address = *sink_config.mutable_address();
diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc
index 9a5b78b7024f..01619b17d8bf 100644
--- a/test/extensions/stats_sinks/hystrix/config_test.cc
+++ b/test/extensions/stats_sinks/hystrix/config_test.cc
@@ -4,7 +4,6 @@
 #include "source/common/protobuf/utility.h"
 #include "source/extensions/stat_sinks/hystrix/config.h"
 #include "source/extensions/stat_sinks/hystrix/hystrix.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
@@ -23,7 +22,7 @@ namespace Hystrix {
 namespace {
 
 TEST(StatsConfigTest, ValidHystrixSink) {
-  const std::string name = StatsSinkNames::get().Hystrix;
+  const std::string name = "envoy.stat_sinks.hystrix";
 
   envoy::config::metrics::v3::HystrixSink sink_config;
 
diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc
index cbf1c02d6030..f5ef08b27351 100644
--- a/test/extensions/stats_sinks/statsd/config_test.cc
+++ b/test/extensions/stats_sinks/statsd/config_test.cc
@@ -7,7 +7,6 @@
 #include "source/common/protobuf/utility.h"
 #include "source/extensions/stat_sinks/common/statsd/statsd.h"
 #include "source/extensions/stat_sinks/statsd/config.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
@@ -26,7 +25,7 @@ namespace Statsd {
 namespace {
 
 TEST(StatsConfigTest, ValidTcpStatsd) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
 
   envoy::config::metrics::v3::StatsdSink sink_config;
   sink_config.set_tcp_cluster_name("fake_cluster");
@@ -60,7 +59,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, StatsConfigParameterizedTest,
                          TestUtility::ipTestParamsToString);
 
 TEST_P(StatsConfigParameterizedTest, UdpSinkDefaultPrefix) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
   const auto& defaultPrefix = Common::Statsd::getDefaultPrefix();
 
   envoy::config::metrics::v3::StatsdSink sink_config;
@@ -91,7 +90,7 @@ TEST_P(StatsConfigParameterizedTest, UdpSinkDefaultPrefix) {
 }
 
 TEST_P(StatsConfigParameterizedTest, UdpSinkCustomPrefix) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
   const std::string customPrefix = "prefix.test";
 
   envoy::config::metrics::v3::StatsdSink sink_config;
@@ -123,7 +122,7 @@ TEST_P(StatsConfigParameterizedTest, UdpSinkCustomPrefix) {
 }
 
 TEST(StatsConfigTest, TcpSinkDefaultPrefix) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
 
   envoy::config::metrics::v3::StatsdSink sink_config;
   const auto& defaultPrefix = Common::Statsd::getDefaultPrefix();
@@ -147,7 +146,7 @@ TEST(StatsConfigTest, TcpSinkDefaultPrefix) {
 }
 
 TEST(StatsConfigTest, TcpSinkCustomPrefix) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
 
   envoy::config::metrics::v3::StatsdSink sink_config;
   std::string prefix = "prefixTest";
@@ -178,7 +177,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, StatsConfigLoopbackTest,
                          TestUtility::ipTestParamsToString);
 
 TEST_P(StatsConfigLoopbackTest, ValidUdpIpStatsd) {
-  const std::string name = StatsSinkNames::get().Statsd;
+  const std::string name = "envoy.stat_sinks.statsd";
 
   envoy::config::metrics::v3::StatsdSink sink_config;
   envoy::config::core::v3::Address& address = *sink_config.mutable_address();
diff --git a/test/extensions/stats_sinks/wasm/config_test.cc b/test/extensions/stats_sinks/wasm/config_test.cc
index 0887d1b1ecb1..3121e5172152 100644
--- a/test/extensions/stats_sinks/wasm/config_test.cc
+++ b/test/extensions/stats_sinks/wasm/config_test.cc
@@ -5,7 +5,6 @@
 #include "source/extensions/common/wasm/wasm.h"
 #include "source/extensions/stat_sinks/wasm/config.h"
 #include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
@@ -43,7 +42,7 @@ class WasmStatSinkConfigTest : public testing::TestWithParam<std::string> {
 
   void initializeWithConfig(const envoy::extensions::stat_sinks::wasm::v3::Wasm& config) {
     auto factory = Registry::FactoryRegistry<Server::Configuration::StatsSinkFactory>::getFactory(
-        StatsSinkNames::get().Wasm);
+        "envoy.stat_sinks.wasm");
     ASSERT_NE(factory, nullptr);
     api_ = Api::createApiForTest(stats_store_);
     EXPECT_CALL(context_, api()).WillRepeatedly(testing::ReturnRef(*api_));
diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc
index d4625db96388..8dd5e3e6969b 100644
--- a/test/server/configuration_impl_test.cc
+++ b/test/server/configuration_impl_test.cc
@@ -12,7 +12,6 @@
 #include "source/common/json/json_loader.h"
 #include "source/common/protobuf/utility.h"
 #include "source/common/upstream/cluster_manager_impl.h"
-#include "source/extensions/stat_sinks/well_known_names.h"
 #include "source/server/configuration_impl.h"
 
 #include "test/common/upstream/utility.h"
@@ -467,7 +466,7 @@ TEST_F(ConfigurationImplTest, ProtoSpecifiedStatsSink) {
   auto bootstrap = Upstream::parseBootstrapFromV3Json(json);
 
   auto& sink = *bootstrap.mutable_stats_sinks()->Add();
-  sink.set_name(Extensions::StatSinks::StatsSinkNames::get().Statsd);
+  sink.set_name("envoy.stat_sinks.statsd");
   addStatsdFakeClusterConfig(sink);
   server_.server_factory_context_->cluster_manager_.initializeClusters({"fake_cluster"}, {});