Skip to content

common: fix ENVOY_LOG_EVENT_TO_LOGGER #17853

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
snowp merged 1 commit into from
Aug 26, 2021
Merged

common: fix ENVOY_LOG_EVENT_TO_LOGGER #17853

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
2 changes: 1 addition & 1 deletion source/common/common/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ class EscapeMessageJsonString : public spdlog::custom_flag_formatter {

#define ENVOY_LOG_EVENT_TO_LOGGER(LOGGER, LEVEL, EVENT_NAME, ...) \
do { \
ENVOY_LOG(LEVEL, ##__VA_ARGS__); \
ENVOY_LOG_TO_LOGGER(LOGGER, LEVEL, ##__VA_ARGS__); \
if (ENVOY_LOG_COMP_LEVEL(LOGGER, LEVEL)) { \
::Envoy::Logger::Registry::getSink()->logWithStableName(EVENT_NAME, #LEVEL, (LOGGER).name(), \
##__VA_ARGS__); \
Expand Down
6 changes: 6 additions & 0 deletions test/common/common/logger_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "gtest/gtest.h"

using testing::_;
using testing::Invoke;

namespace Envoy {
namespace Logger {
Expand Down Expand Up @@ -177,6 +178,11 @@ TEST_F(NamedLogTest, NamedLogsAreSentToSink) {
EXPECT_CALL(sink, log(_));
EXPECT_CALL(sink, logWithStableName("test_event", "debug", "assert", "test log 1"));
ENVOY_LOG_EVENT(debug, "test_event", "test {} {}", "log", 1);

// Verify that ENVOY_LOG_EVENT_TO_LOGGER does the right thing.
EXPECT_CALL(sink, log(_)).WillOnce(Invoke([](auto log) { EXPECT_TRUE(log.find("[misc]")); }));
EXPECT_CALL(sink, logWithStableName("misc_event", "debug", "misc", "log"));
ENVOY_LOG_EVENT_TO_LOGGER(Registry::getLog(Id::misc), debug, "misc_event", "log");
}

} // namespace Logger
Expand Down