pass command paraser

AntonKanug · AntonKanug · commit a69afac6dd00 · 2026-02-09T03:10:20.000-05:00
Signed-off-by: Anton Kanugalawattage &lt;antondilon@gmail.com&gt;
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc
@@ -37,11 +37,14 @@ TLSProperties_TLSVersion tlsVersionStringToEnum(const std::string& tls_version)
 
 } // namespace
 
-CommonPropertiesConfig::CommonPropertiesConfig(const ProtoCommonGrpcAccessLogConfig& config)
+CommonPropertiesConfig::CommonPropertiesConfig(
+    const ProtoCommonGrpcAccessLogConfig& config,
+    const std::vector<Formatter::CommandParserPtr>& command_parsers)
     : filter_states_to_log(config.filter_state_objects_to_log().begin(),
                            config.filter_state_objects_to_log().end()) {
   for (const auto& custom_tag : config.custom_tags()) {
-    const auto tag_applier = Tracing::CustomTagUtility::createCustomTag(custom_tag);
+    const auto tag_applier =
+        Tracing::CustomTagUtility::createCustomTag(custom_tag, command_parsers);
     custom_tags.push_back(tag_applier);
   }
 }
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.h b/source/extensions/access_loggers/grpc/grpc_access_log_utils.h
@@ -5,6 +5,7 @@
 #include "envoy/access_log/access_log.h"
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
+#include "envoy/formatter/substitution_formatter_base.h"
 #include "envoy/stream_info/stream_info.h"
 
 namespace Envoy {
@@ -16,7 +17,8 @@ using ProtoCommonGrpcAccessLogConfig =
     envoy::extensions::access_loggers::grpc::v3::CommonGrpcAccessLogConfig;
 
 struct CommonPropertiesConfig {
-  CommonPropertiesConfig(const ProtoCommonGrpcAccessLogConfig& config);
+  CommonPropertiesConfig(const ProtoCommonGrpcAccessLogConfig& config,
+                         const std::vector<Formatter::CommandParserPtr>& command_parsers = {});
   absl::flat_hash_set<std::string> filter_states_to_log;
   std::vector<Tracing::CustomTagConstSharedPtr> custom_tags;
 };
diff --git a/source/extensions/access_loggers/grpc/http_config.cc b/source/extensions/access_loggers/grpc/http_config.cc
@@ -21,7 +21,7 @@ namespace HttpGrpc {
 AccessLog::InstanceSharedPtr HttpGrpcAccessLogFactory::createAccessLogInstance(
     const Protobuf::Message& config, AccessLog::FilterPtr&& filter,
     Server::Configuration::GenericFactoryContext& context,
-    std::vector<Formatter::CommandParserPtr>&&) {
+    std::vector<Formatter::CommandParserPtr>&& command_parsers) {
   GrpcCommon::validateProtoDescriptors();
 
   const auto& proto_config = MessageUtil::downcastAndValidate<
@@ -30,7 +30,8 @@ AccessLog::InstanceSharedPtr HttpGrpcAccessLogFactory::createAccessLogInstance(
 
   return std::make_shared<HttpGrpcAccessLog>(
       std::move(filter), proto_config, context.serverFactoryContext().threadLocal(),
-      GrpcCommon::getGrpcAccessLoggerCacheSingleton(context.serverFactoryContext()));
+      GrpcCommon::getGrpcAccessLoggerCacheSingleton(context.serverFactoryContext()),
+      command_parsers);
 }
 
 ProtobufTypes::MessagePtr HttpGrpcAccessLogFactory::createEmptyConfigProto() {
diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc
@@ -25,14 +25,14 @@ HttpGrpcAccessLog::ThreadLocalLogger::ThreadLocalLogger(
     GrpcCommon::GrpcAccessLoggerSharedPtr logger)
     : logger_(std::move(logger)) {}
 
-HttpGrpcAccessLog::HttpGrpcAccessLog(AccessLog::FilterPtr&& filter,
-                                     const HttpGrpcAccessLogConfig config,
-                                     ThreadLocal::SlotAllocator& tls,
-                                     GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache)
+HttpGrpcAccessLog::HttpGrpcAccessLog(
+    AccessLog::FilterPtr&& filter, const HttpGrpcAccessLogConfig config,
+    ThreadLocal::SlotAllocator& tls, GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache,
+    const std::vector<Formatter::CommandParserPtr>& command_parsers)
     : Common::ImplBase(std::move(filter)),
       config_(std::make_shared<const HttpGrpcAccessLogConfig>(std::move(config))),
       tls_slot_(tls.allocateSlot()), access_logger_cache_(std::move(access_logger_cache)),
-      common_properties_config_(config.common_config()) {
+      common_properties_config_(config.common_config(), command_parsers) {
   for (const auto& header : config_->additional_request_headers_to_log()) {
     request_headers_to_log_.emplace_back(header);
   }
diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h
@@ -32,7 +32,8 @@ class HttpGrpcAccessLog : public Common::ImplBase {
 public:
   HttpGrpcAccessLog(AccessLog::FilterPtr&& filter, const HttpGrpcAccessLogConfig config,
                     ThreadLocal::SlotAllocator& tls,
-                    GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache);
+                    GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache,
+                    const std::vector<Formatter::CommandParserPtr>& command_parsers = {});
 
 private:
   /**
diff --git a/source/extensions/access_loggers/grpc/tcp_config.cc b/source/extensions/access_loggers/grpc/tcp_config.cc
@@ -21,7 +21,7 @@ namespace TcpGrpc {
 AccessLog::InstanceSharedPtr TcpGrpcAccessLogFactory::createAccessLogInstance(
     const Protobuf::Message& config, AccessLog::FilterPtr&& filter,
     Server::Configuration::GenericFactoryContext& context,
-    std::vector<Formatter::CommandParserPtr>&&) {
+    std::vector<Formatter::CommandParserPtr>&& command_parsers) {
   GrpcCommon::validateProtoDescriptors();
 
   const auto& proto_config = MessageUtil::downcastAndValidate<
@@ -30,7 +30,8 @@ AccessLog::InstanceSharedPtr TcpGrpcAccessLogFactory::createAccessLogInstance(
 
   return std::make_shared<TcpGrpcAccessLog>(
       std::move(filter), proto_config, context.serverFactoryContext().threadLocal(),
-      GrpcCommon::getGrpcAccessLoggerCacheSingleton(context.serverFactoryContext()));
+      GrpcCommon::getGrpcAccessLoggerCacheSingleton(context.serverFactoryContext()),
+      command_parsers);
 }
 
 ProtobufTypes::MessagePtr TcpGrpcAccessLogFactory::createEmptyConfigProto() {
diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc
@@ -21,11 +21,12 @@ TcpGrpcAccessLog::ThreadLocalLogger::ThreadLocalLogger(GrpcCommon::GrpcAccessLog
 TcpGrpcAccessLog::TcpGrpcAccessLog(AccessLog::FilterPtr&& filter,
                                    const TcpGrpcAccessLogConfig config,
                                    ThreadLocal::SlotAllocator& tls,
-                                   GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache)
+                                   GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache,
+                                   const std::vector<Formatter::CommandParserPtr>& command_parsers)
     : Common::ImplBase(std::move(filter)),
       config_(std::make_shared<const TcpGrpcAccessLogConfig>(std::move(config))),
       tls_slot_(tls.allocateSlot()), access_logger_cache_(std::move(access_logger_cache)),
-      common_properties_config_(config.common_config()) {
+      common_properties_config_(config.common_config(), command_parsers) {
   THROW_IF_NOT_OK(Config::Utility::checkTransportVersion(config_->common_config()));
   tls_slot_->set(
       [config = config_, access_logger_cache = access_logger_cache_](Event::Dispatcher&) {
diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h
@@ -31,7 +31,8 @@ class TcpGrpcAccessLog : public Common::ImplBase {
 public:
   TcpGrpcAccessLog(AccessLog::FilterPtr&& filter, const TcpGrpcAccessLogConfig config,
                    ThreadLocal::SlotAllocator& tls,
-                   GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache);
+                   GrpcCommon::GrpcAccessLoggerCacheSharedPtr access_logger_cache,
+                   const std::vector<Formatter::CommandParserPtr>& command_parsers = {});
 
 private:
   /**
diff --git a/source/extensions/filters/udp/dns_filter/BUILD b/source/extensions/filters/udp/dns_filter/BUILD
@@ -14,15 +14,13 @@ envoy_cc_library(
     srcs = [
         "dns_filter.cc",
         "dns_filter_access_log.cc",
-        "dns_filter_command_parser_factory.cc",
         "dns_filter_resolver.cc",
         "dns_filter_utils.cc",
         "dns_parser.cc",
     ],
     hdrs = [
         "dns_filter.h",
         "dns_filter_access_log.h",
-        "dns_filter_command_parser_factory.h",
         "dns_filter_constants.h",
         "dns_filter_resolver.h",
         "dns_filter_utils.h",
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_command_parser_factory.cc b/source/extensions/filters/udp/dns_filter/dns_filter_command_parser_factory.cc
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_command_parser_factory.h b/source/extensions/filters/udp/dns_filter/dns_filter_command_parser_factory.h
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc
@@ -5,7 +5,6 @@
 #include "source/common/stream_info/stream_info_impl.h"
 #include "source/extensions/filters/udp/dns_filter/dns_filter.h"
 #include "source/extensions/filters/udp/dns_filter/dns_filter_access_log.h"
-#include "source/extensions/filters/udp/dns_filter/dns_filter_command_parser_factory.h"
 #include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h"
 #include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
@@ -43,8 +42,7 @@ Api::IoCallUint64Result makeNoError(uint64_t rc) {
 class TestAccessLog : public AccessLog::Instance {
 public:
   TestAccessLog() {
-    DnsFilterCommandParserFactory factory;
-    auto parser = factory.createCommandParser();
+    auto parser = createDnsFilterCommandParser();
     query_name_formatter_ = parser->parse("QUERY_NAME", "", absl::nullopt);
     query_type_formatter_ = parser->parse("QUERY_TYPE", "", absl::nullopt);
     query_class_formatter_ = parser->parse("QUERY_CLASS", "", absl::nullopt);
@@ -414,8 +412,7 @@ stat_prefix: "my_prefix"
 
 // Test custom DNS command parser formatters
 TEST(DnsFilterCommandParserTest, QueryNameFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_NAME", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -446,8 +443,7 @@ TEST(DnsFilterCommandParserTest, QueryNameFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, QueryTypeFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_TYPE", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -473,8 +469,7 @@ TEST(DnsFilterCommandParserTest, QueryTypeFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, AnswerCountFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("ANSWER_COUNT", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -502,8 +497,7 @@ TEST(DnsFilterCommandParserTest, AnswerCountFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, ResponseCodeFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("RESPONSE_CODE", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -528,8 +522,7 @@ TEST(DnsFilterCommandParserTest, ResponseCodeFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, ParseStatusFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("PARSE_STATUS", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -554,8 +547,7 @@ TEST(DnsFilterCommandParserTest, ParseStatusFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, MissingMetadata) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_NAME", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -570,8 +562,7 @@ TEST(DnsFilterCommandParserTest, MissingMetadata) {
 }
 
 TEST(DnsFilterCommandParserTest, QueryClassFormatter) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_CLASS", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -597,15 +588,13 @@ TEST(DnsFilterCommandParserTest, QueryClassFormatter) {
 }
 
 TEST(DnsFilterCommandParserTest, UnknownCommand) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("UNKNOWN_COMMAND", "", absl::nullopt);
   EXPECT_EQ(formatter, nullptr);
 }
 
 TEST(DnsFilterCommandParserTest, EmptyCommandArg) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
 
   // All DNS commands should work without command args
   EXPECT_NE(parser->parse("QUERY_NAME", "", absl::nullopt), nullptr);
@@ -617,8 +606,7 @@ TEST(DnsFilterCommandParserTest, EmptyCommandArg) {
 }
 
 TEST(DnsFilterCommandParserTest, CaseSensitiveCommands) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
 
   // Commands should be case-sensitive
   EXPECT_NE(parser->parse("QUERY_NAME", "", absl::nullopt), nullptr);
@@ -628,8 +616,7 @@ TEST(DnsFilterCommandParserTest, CaseSensitiveCommands) {
 }
 
 TEST(DnsFilterCommandParserTest, FormatValueStringType) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_NAME", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -654,8 +641,7 @@ TEST(DnsFilterCommandParserTest, FormatValueStringType) {
 }
 
 TEST(DnsFilterCommandParserTest, FormatValueNullWhenMissing) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
   auto formatter = parser->parse("QUERY_NAME", "", absl::nullopt);
   ASSERT_NE(formatter, nullptr);
 
@@ -672,8 +658,7 @@ TEST(DnsFilterCommandParserTest, FormatValueNullWhenMissing) {
 }
 
 TEST(DnsFilterCommandParserTest, EmptyQueriesInContext) {
-  DnsFilterCommandParserFactory factory;
-  auto parser = factory.createCommandParser();
+  auto parser = createDnsFilterCommandParser();
 
   Event::SimulatedTimeSystem test_time;
   auto connection_info = std::make_shared<Network::ConnectionInfoSetterImpl>(nullptr, nullptr);
