diff --git a/source/extensions/access_loggers/BUILD b/source/extensions/access_loggers/BUILD index 40a5e79b39d3b..90e061ad8da39 100644 --- a/source/extensions/access_loggers/BUILD +++ b/source/extensions/access_loggers/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/access_loggers/file/BUILD b/source/extensions/access_loggers/file/BUILD index d053296f6a9b8..88376ee987759 100644 --- a/source/extensions/access_loggers/file/BUILD +++ b/source/extensions/access_loggers/file/BUILD @@ -24,7 +24,6 @@ envoy_cc_extension( "//source/common/config:config_provider_lib", "//source/common/formatter:substitution_format_string_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/common:file_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", ], diff --git a/source/extensions/access_loggers/file/config.cc b/source/extensions/access_loggers/file/config.cc index 5eaacb5a37e14..aaba4ea1e2a15 100644 --- a/source/extensions/access_loggers/file/config.cc +++ b/source/extensions/access_loggers/file/config.cc @@ -14,7 +14,6 @@ #include "common/protobuf/protobuf.h" #include "extensions/access_loggers/common/file_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -72,7 +71,7 @@ ProtobufTypes::MessagePtr FileAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::file::v3::FileAccessLog()}; } -std::string FileAccessLogFactory::name() const { return AccessLogNames::get().File; } +std::string FileAccessLogFactory::name() const { return "envoy.access_loggers.file"; } /** * Static registration for the file access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/grpc/BUILD b/source/extensions/access_loggers/grpc/BUILD index 043c5dc898a1d..1c0a4b484f30c 100644 --- a/source/extensions/access_loggers/grpc/BUILD +++ b/source/extensions/access_loggers/grpc/BUILD @@ -108,7 +108,6 @@ envoy_cc_extension( "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:http_grpc_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", @@ -130,7 +129,6 @@ envoy_cc_extension( "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:tcp_grpc_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", diff --git a/source/extensions/access_loggers/grpc/http_config.cc b/source/extensions/access_loggers/grpc/http_config.cc index ae3ca564dc4f8..502a2e2f09c0a 100644 --- a/source/extensions/access_loggers/grpc/http_config.cc +++ b/source/extensions/access_loggers/grpc/http_config.cc @@ -13,7 +13,6 @@ #include "extensions/access_loggers/grpc/config_utils.h" #include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" #include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -38,7 +37,7 @@ ProtobufTypes::MessagePtr HttpGrpcAccessLogFactory::createEmptyConfigProto() { return std::make_unique(); } -std::string HttpGrpcAccessLogFactory::name() const { return AccessLogNames::get().HttpGrpc; } +std::string HttpGrpcAccessLogFactory::name() const { return "envoy.access_loggers.http_grpc"; } /** * Static registration for the HTTP gRPC access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/grpc/tcp_config.cc b/source/extensions/access_loggers/grpc/tcp_config.cc index e93d6989c9bff..3c2c45b153a32 100644 --- a/source/extensions/access_loggers/grpc/tcp_config.cc +++ b/source/extensions/access_loggers/grpc/tcp_config.cc @@ -13,7 +13,6 @@ #include "extensions/access_loggers/grpc/config_utils.h" #include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" #include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -38,7 +37,7 @@ ProtobufTypes::MessagePtr TcpGrpcAccessLogFactory::createEmptyConfigProto() { return std::make_unique(); } -std::string TcpGrpcAccessLogFactory::name() const { return AccessLogNames::get().TcpGrpc; } +std::string TcpGrpcAccessLogFactory::name() const { return "envoy.access_loggers.tcp_grpc"; } /** * Static registration for the TCP gRPC access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/open_telemetry/BUILD b/source/extensions/access_loggers/open_telemetry/BUILD index cb85c6957fbf0..bc2609eaa0146 100644 --- a/source/extensions/access_loggers/open_telemetry/BUILD +++ b/source/extensions/access_loggers/open_telemetry/BUILD @@ -71,7 +71,6 @@ envoy_cc_extension( "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/open_telemetry:access_log_lib", "//source/extensions/access_loggers/open_telemetry:access_log_proto_descriptors_lib", "//source/extensions/access_loggers/open_telemetry:grpc_access_log_lib", diff --git a/source/extensions/access_loggers/open_telemetry/config.cc b/source/extensions/access_loggers/open_telemetry/config.cc index dd1bd6a8ea4d9..d5fff2ec4bed7 100644 --- a/source/extensions/access_loggers/open_telemetry/config.cc +++ b/source/extensions/access_loggers/open_telemetry/config.cc @@ -13,7 +13,6 @@ #include "extensions/access_loggers/open_telemetry/access_log_impl.h" #include "extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h" -#include "extensions/access_loggers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -53,7 +52,7 @@ ProtobufTypes::MessagePtr AccessLogFactory::createEmptyConfigProto() { envoy::extensions::access_loggers::open_telemetry::v3alpha::OpenTelemetryAccessLogConfig>(); } -std::string AccessLogFactory::name() const { return AccessLogNames::get().OpenTelemetry; } +std::string AccessLogFactory::name() const { return "envoy.access_loggers.open_telemetry"; } /** * Static registration for the OpenTelemetry (gRPC) access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/stream/BUILD b/source/extensions/access_loggers/stream/BUILD index f78092b3aedb3..2e94c47e56197 100644 --- a/source/extensions/access_loggers/stream/BUILD +++ b/source/extensions/access_loggers/stream/BUILD @@ -20,7 +20,6 @@ envoy_cc_extension( "//source/common/config:config_provider_lib", "//source/common/formatter:substitution_format_string_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/common:file_access_log_lib", "//source/extensions/access_loggers/common:stream_access_log_common_impl_lib", "@envoy_api//envoy/extensions/access_loggers/stream/v3:pkg_cc_proto", diff --git a/source/extensions/access_loggers/stream/config.cc b/source/extensions/access_loggers/stream/config.cc index 5fce7ea8cc3e4..e80cc5c82a990 100644 --- a/source/extensions/access_loggers/stream/config.cc +++ b/source/extensions/access_loggers/stream/config.cc @@ -15,7 +15,6 @@ #include "extensions/access_loggers/common/file_access_log_impl.h" #include "extensions/access_loggers/common/stream_access_log_common_impl.h" -#include "extensions/access_loggers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -35,7 +34,7 @@ ProtobufTypes::MessagePtr StdoutAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::stream::v3::StdoutAccessLog()}; } -std::string StdoutAccessLogFactory::name() const { return AccessLogNames::get().Stdout; } +std::string StdoutAccessLogFactory::name() const { return "envoy.access_loggers.stdout"; } /** * Static registration for the file access log. @see RegisterFactory. @@ -56,7 +55,7 @@ ProtobufTypes::MessagePtr StderrAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::stream::v3::StderrAccessLog()}; } -std::string StderrAccessLogFactory::name() const { return AccessLogNames::get().Stderr; } +std::string StderrAccessLogFactory::name() const { return "envoy.access_loggers.stderr"; } /** * Static registration for the `stderr` access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/wasm/BUILD b/source/extensions/access_loggers/wasm/BUILD index ebe064a25c6f4..6c1c5d86acdd1 100644 --- a/source/extensions/access_loggers/wasm/BUILD +++ b/source/extensions/access_loggers/wasm/BUILD @@ -17,7 +17,6 @@ envoy_cc_library( deps = [ "//include/envoy/access_log:access_log_interface", "//source/common/http:header_map_lib", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/common/wasm:wasm_lib", ], ) @@ -32,7 +31,6 @@ envoy_cc_extension( "//include/envoy/server:access_log_config_interface", "//source/common/config:datasource_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/common/wasm:wasm_lib", "@envoy_api//envoy/extensions/access_loggers/wasm/v3:pkg_cc_proto", ], diff --git a/source/extensions/access_loggers/wasm/config.cc b/source/extensions/access_loggers/wasm/config.cc index d6ba35aba1c9c..68a5c6b3f8603 100644 --- a/source/extensions/access_loggers/wasm/config.cc +++ b/source/extensions/access_loggers/wasm/config.cc @@ -8,7 +8,6 @@ #include "common/protobuf/protobuf.h" #include "extensions/access_loggers/wasm/wasm_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" #include "extensions/common/wasm/wasm.h" namespace Envoy { @@ -55,7 +54,7 @@ ProtobufTypes::MessagePtr WasmAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::wasm::v3::WasmAccessLog()}; } -std::string WasmAccessLogFactory::name() const { return AccessLogNames::get().Wasm; } +std::string WasmAccessLogFactory::name() const { return "envoy.access_loggers.wasm"; } /** * Static registration for the wasm access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h index 94910ef56712b..0369da5518d40 100644 --- a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h +++ b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h @@ -4,7 +4,6 @@ #include "common/common/logger.h" -#include "extensions/access_loggers/well_known_names.h" #include "extensions/common/wasm/wasm.h" namespace Envoy { diff --git a/source/extensions/access_loggers/well_known_names.h b/source/extensions/access_loggers/well_known_names.h deleted file mode 100644 index e3b7a375c8e2e..0000000000000 --- a/source/extensions/access_loggers/well_known_names.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace AccessLoggers { - -/** - * Well-known access logger names. - * NOTE: New access loggers should use the well known name: envoy.access_loggers.name. - */ -class AccessLogNameValues { -public: - // File access log - const std::string File = "envoy.access_loggers.file"; - // HTTP gRPC access log - const std::string HttpGrpc = "envoy.access_loggers.http_grpc"; - // Standard error access log - const std::string Stderr = "envoy.access_loggers.stderr"; - // Standard output access log - const std::string Stdout = "envoy.access_loggers.stdout"; - // TCP gRPC access log - const std::string TcpGrpc = "envoy.access_loggers.tcp_grpc"; - // OpenTelemetry gRPC access log - const std::string OpenTelemetry = "envoy.access_loggers.open_telemetry"; - // WASM access log - const std::string Wasm = "envoy.access_loggers.wasm"; -}; - -using AccessLogNames = ConstSingleton; - -} // namespace AccessLoggers -} // namespace Extensions -} // namespace Envoy diff --git a/test/common/tcp_proxy/BUILD b/test/common/tcp_proxy/BUILD index b84cdb0c6d6a4..4105647647b6d 100644 --- a/test/common/tcp_proxy/BUILD +++ b/test/common/tcp_proxy/BUILD @@ -26,7 +26,6 @@ envoy_cc_test_library( "//source/common/tcp_proxy", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/file:config", "//source/extensions/upstreams/http/generic:config", "//test/common/upstream:utility_lib", diff --git a/test/common/tcp_proxy/config_test.cc b/test/common/tcp_proxy/config_test.cc index 98f29fdbfb867..8bc1abec5a7e8 100644 --- a/test/common/tcp_proxy/config_test.cc +++ b/test/common/tcp_proxy/config_test.cc @@ -773,7 +773,7 @@ TEST(ConfigTest, HashWithSourceIpDefaultConfig) { TEST(ConfigTest, AccessLogConfig) { envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy config; envoy::config::accesslog::v3::AccessLog* log = config.mutable_access_log()->Add(); - log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + log->set_name("envoy.access_loggers.file"); { envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("some_path"); @@ -783,7 +783,7 @@ TEST(ConfigTest, AccessLogConfig) { } log = config.mutable_access_log()->Add(); - log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + log->set_name("envoy.access_loggers.file"); { envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("another path"); diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc index 43447d35a4119..fe8341663bad9 100644 --- a/test/common/tcp_proxy/tcp_proxy_test.cc +++ b/test/common/tcp_proxy/tcp_proxy_test.cc @@ -24,8 +24,6 @@ #include "common/tcp_proxy/tcp_proxy.h" #include "common/upstream/upstream_impl.h" -#include "extensions/access_loggers/well_known_names.h" - #include "test/common/tcp_proxy/tcp_proxy_test_base.h" #include "test/common/upstream/utility.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/common/tcp_proxy/tcp_proxy_test_base.h b/test/common/tcp_proxy/tcp_proxy_test_base.h index 7c3d5d7176709..e02e75d14048c 100644 --- a/test/common/tcp_proxy/tcp_proxy_test_base.h +++ b/test/common/tcp_proxy/tcp_proxy_test_base.h @@ -23,8 +23,6 @@ #include "common/tcp_proxy/tcp_proxy.h" #include "common/upstream/upstream_impl.h" -#include "extensions/access_loggers/well_known_names.h" - #include "test/common/upstream/utility.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" @@ -110,7 +108,7 @@ class TcpProxyTestBase : public testing::Test { accessLogConfig(const std::string& access_log_format) { envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy config = defaultConfig(); envoy::config::accesslog::v3::AccessLog* access_log = config.mutable_access_log()->Add(); - access_log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + access_log->set_name("envoy.access_loggers.file"); envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("unused"); file_access_log.mutable_log_format()->mutable_text_format_source()->set_inline_string( diff --git a/test/extensions/access_loggers/file/config_test.cc b/test/extensions/access_loggers/file/config_test.cc index 3cdaeca9c7b92..3eff3f56f70cd 100644 --- a/test/extensions/access_loggers/file/config_test.cc +++ b/test/extensions/access_loggers/file/config_test.cc @@ -7,7 +7,6 @@ #include "extensions/access_loggers/common/file_access_log_impl.h" #include "extensions/access_loggers/file/config.h" -#include "extensions/access_loggers/well_known_names.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/grpc/http_config_test.cc b/test/extensions/access_loggers/grpc/http_config_test.cc index 1b4a1956a3415..63ef230d80b0b 100644 --- a/test/extensions/access_loggers/grpc/http_config_test.cc +++ b/test/extensions/access_loggers/grpc/http_config_test.cc @@ -5,7 +5,6 @@ #include "envoy/stats/scope.h" #include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" #include "test/mocks/server/factory_context.h" @@ -26,7 +25,7 @@ class HttpGrpcAccessLogConfigTest : public testing::Test { void SetUp() override { factory_ = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().HttpGrpc); + "envoy.access_loggers.http_grpc"); ASSERT_NE(nullptr, factory_); message_ = factory_->createEmptyConfigProto(); diff --git a/test/extensions/access_loggers/open_telemetry/config_test.cc b/test/extensions/access_loggers/open_telemetry/config_test.cc index ed7070680c8e4..4082eeabfe867 100644 --- a/test/extensions/access_loggers/open_telemetry/config_test.cc +++ b/test/extensions/access_loggers/open_telemetry/config_test.cc @@ -6,7 +6,6 @@ #include "extensions/access_loggers/open_telemetry/access_log_impl.h" #include "extensions/access_loggers/open_telemetry/config.h" -#include "extensions/access_loggers/well_known_names.h" #include "test/mocks/server/factory_context.h" @@ -27,7 +26,7 @@ class OpenTelemetryAccessLogConfigTest : public testing::Test { void SetUp() override { factory_ = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().OpenTelemetry); + "envoy.access_loggers.open_telemetry"); ASSERT_NE(nullptr, factory_); message_ = factory_->createEmptyConfigProto(); diff --git a/test/extensions/access_loggers/stream/stream_test_base.h b/test/extensions/access_loggers/stream/stream_test_base.h index 57b1c04f1e82a..4abfe6a07749c 100644 --- a/test/extensions/access_loggers/stream/stream_test_base.h +++ b/test/extensions/access_loggers/stream/stream_test_base.h @@ -6,7 +6,6 @@ #include "extensions/access_loggers/common/file_access_log_impl.h" #include "extensions/access_loggers/stream/config.h" -#include "extensions/access_loggers/well_known_names.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/wasm/config_test.cc b/test/extensions/access_loggers/wasm/config_test.cc index 85cdde6141e0f..367481d0bd582 100644 --- a/test/extensions/access_loggers/wasm/config_test.cc +++ b/test/extensions/access_loggers/wasm/config_test.cc @@ -6,7 +6,6 @@ #include "extensions/access_loggers/wasm/config.h" #include "extensions/access_loggers/wasm/wasm_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" #include "extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" @@ -42,7 +41,7 @@ INSTANTIATE_TEST_SUITE_P(Runtimes, WasmAccessLogConfigTest, TEST_P(WasmAccessLogConfigTest, CreateWasmFromEmpty) { auto factory = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().Wasm); + "envoy.access_loggers.wasm"); ASSERT_NE(factory, nullptr); ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto(); @@ -66,7 +65,7 @@ TEST_P(WasmAccessLogConfigTest, CreateWasmFromWASM) { #endif auto factory = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().Wasm); + "envoy.access_loggers.wasm"); ASSERT_NE(factory, nullptr); envoy::extensions::access_loggers::wasm::v3::WasmAccessLog config;