diff --git a/source/extensions/resource_monitors/BUILD b/source/extensions/resource_monitors/BUILD index 40a5e79b39d3b..90e061ad8da39 100644 --- a/source/extensions/resource_monitors/BUILD +++ b/source/extensions/resource_monitors/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/resource_monitors/fixed_heap/BUILD b/source/extensions/resource_monitors/fixed_heap/BUILD index f1ce7fa600253..f2be46b297394 100644 --- a/source/extensions/resource_monitors/fixed_heap/BUILD +++ b/source/extensions/resource_monitors/fixed_heap/BUILD @@ -29,7 +29,6 @@ envoy_cc_extension( ":fixed_heap_monitor", "//include/envoy/registry", "//source/common/common:assert_lib", - "//source/extensions/resource_monitors:well_known_names", "//source/extensions/resource_monitors/common:factory_base_lib", "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto", ], diff --git a/source/extensions/resource_monitors/fixed_heap/config.h b/source/extensions/resource_monitors/fixed_heap/config.h index 4c822719abeac..98d3858a40e7b 100644 --- a/source/extensions/resource_monitors/fixed_heap/config.h +++ b/source/extensions/resource_monitors/fixed_heap/config.h @@ -5,7 +5,6 @@ #include "envoy/server/resource_monitor_config.h" #include "extensions/resource_monitors/common/factory_base.h" -#include "extensions/resource_monitors/well_known_names.h" namespace Envoy { namespace Extensions { @@ -16,7 +15,7 @@ class FixedHeapMonitorFactory : public Common::FactoryBase< envoy::extensions::resource_monitors::fixed_heap::v3::FixedHeapConfig> { public: - FixedHeapMonitorFactory() : FactoryBase(ResourceMonitorNames::get().FixedHeap) {} + FixedHeapMonitorFactory() : FactoryBase("envoy.resource_monitors.fixed_heap") {} private: Server::ResourceMonitorPtr createResourceMonitorFromProtoTyped( diff --git a/source/extensions/resource_monitors/injected_resource/BUILD b/source/extensions/resource_monitors/injected_resource/BUILD index 50453d2a1bdcf..5d320df4987ff 100644 --- a/source/extensions/resource_monitors/injected_resource/BUILD +++ b/source/extensions/resource_monitors/injected_resource/BUILD @@ -35,7 +35,6 @@ envoy_cc_extension( ":injected_resource_monitor", "//include/envoy/registry", "//source/common/common:assert_lib", - "//source/extensions/resource_monitors:well_known_names", "//source/extensions/resource_monitors/common:factory_base_lib", "@envoy_api//envoy/extensions/resource_monitors/injected_resource/v3:pkg_cc_proto", ], diff --git a/source/extensions/resource_monitors/injected_resource/config.h b/source/extensions/resource_monitors/injected_resource/config.h index cbbd5abd49a77..87e54c6b2c294 100644 --- a/source/extensions/resource_monitors/injected_resource/config.h +++ b/source/extensions/resource_monitors/injected_resource/config.h @@ -5,7 +5,6 @@ #include "envoy/server/resource_monitor_config.h" #include "extensions/resource_monitors/common/factory_base.h" -#include "extensions/resource_monitors/well_known_names.h" namespace Envoy { namespace Extensions { @@ -16,7 +15,7 @@ class InjectedResourceMonitorFactory : public Common::FactoryBase< envoy::extensions::resource_monitors::injected_resource::v3::InjectedResourceConfig> { public: - InjectedResourceMonitorFactory() : FactoryBase(ResourceMonitorNames::get().InjectedResource) {} + InjectedResourceMonitorFactory() : FactoryBase("envoy.resource_monitors.injected_resource") {} private: Server::ResourceMonitorPtr createResourceMonitorFromProtoTyped( diff --git a/source/extensions/resource_monitors/well_known_names.h b/source/extensions/resource_monitors/well_known_names.h deleted file mode 100644 index 7828997ed7829..0000000000000 --- a/source/extensions/resource_monitors/well_known_names.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace ResourceMonitors { - -/** - * Well-known resource monitor names. - * NOTE: New resource monitors should use the well known name: envoy.resource_monitors.name. - */ -class ResourceMonitorNameValues { -public: - // Heap monitor with statically configured max. - const std::string FixedHeap = "envoy.resource_monitors.fixed_heap"; - - // File-based injected resource monitor. - const std::string InjectedResource = "envoy.resource_monitors.injected_resource"; -}; - -using ResourceMonitorNames = ConstSingleton; - -} // namespace ResourceMonitors -} // namespace Extensions -} // namespace Envoy