diff --git a/.github/workflows/mobile-perf.yml b/.github/workflows/mobile-perf.yml index 807f1eda861b..241199383f08 100644 --- a/.github/workflows/mobile-perf.yml +++ b/.github/workflows/mobile-perf.yml @@ -70,6 +70,7 @@ jobs: source/server/guarddog_impl.h source/server/watchdog_impl.h source/server/options_impl.cc + source/extensions/access_loggers/common/file_access_log_impl.h target: size-current - name: Main size args: >- diff --git a/source/server/BUILD b/source/server/BUILD index f656303df03e..c86be8637fc7 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -54,10 +54,10 @@ envoy_cc_library( "//source/common/network:socket_option_lib", "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/access_loggers/common:file_access_log_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", ], ) diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc index b5c01e101646..7070baf2097d 100644 --- a/source/server/configuration_impl.cc +++ b/source/server/configuration_impl.cc @@ -10,6 +10,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/config/trace/v3/http_tracer.pb.h" +#include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "envoy/network/connection.h" #include "envoy/runtime/runtime.h" #include "envoy/server/instance.h" @@ -23,7 +24,6 @@ #include "source/common/config/utility.h" #include "source/common/network/socket_option_factory.h" #include "source/common/protobuf/utility.h" -#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Server { @@ -276,11 +276,13 @@ void InitialImpl::initAdminAccessLog(const envoy::config::bootstrap::v3::Bootstr } if (!admin.access_log_path().empty()) { - Filesystem::FilePathAndType file_info{Filesystem::DestinationType::File, - admin.access_log_path()}; - admin_.access_logs_.emplace_back(new Extensions::AccessLoggers::File::FileAccessLog( - file_info, {}, Formatter::HttpSubstitutionFormatUtils::defaultSubstitutionFormatter(), - factory_context.serverFactoryContext().accessLogManager())); + envoy::extensions::access_loggers::file::v3::FileAccessLog config; + config.mutable_format(); + config.set_path(admin.access_log_path()); + + auto factory = Config::Utility::getFactoryByName( + "envoy.file_access_log"); + admin_.access_logs_.emplace_back(factory->createAccessLogInstance(config, {}, factory_context)); } }