Skip to content

resource_monitors: remove well_known_names #16761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
Jun 2, 2021
Merged

resource_monitors: remove well_known_names #16761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions source/extensions/resource_monitors/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
],
)
1 change: 0 additions & 1 deletion source/extensions/resource_monitors/fixed_heap/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/resource_monitors/fixed_heap/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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(
Expand Down
1 change: 0 additions & 1 deletion source/extensions/resource_monitors/injected_resource/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/resource_monitors/injected_resource/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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(
Expand Down
27 changes: 0 additions & 27 deletions source/extensions/resource_monitors/well_known_names.h
View file
Open in desktop

This file was deleted.