bug logging: fix OTLP logger forwarding

commit_hash:a2a1547e3b2c9a714cb3368d7e3cfdd7dfce96cc

otlp/src/otlp/logs/logger.cpp

@@ -1,7 +1,6 @@
 #include "logger.hpp"
 
 #include <chrono>
-#include <iostream>
 
 #include <userver/engine/async.hpp>
 #include <userver/formats/parse/common_containers.hpp>
@@ -172,7 +171,7 @@ void Logger::PrependCommonTags(logging::impl::TagWriter writer) const {
 
 bool Logger::DoShouldLog(logging::Level level) const noexcept { return logging::impl::default_::DoShouldLog(level); }
 
-void Logger::Log(logging::Level, logging::impl::formatters::LoggerItemRef item) {
+void Logger::Log(logging::Level level, logging::impl::formatters::LoggerItemRef item) {
     UASSERT(dynamic_cast<Item*>(&item));
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-static-cast-downcast)
     auto& log = static_cast<Item&>(item);
@@ -184,10 +183,16 @@ void Logger::Log(logging::Level, logging::impl::formatters::LoggerItemRef item)
             ++stats_.dropped;
         }
     }
+
+    if (default_logger_ && log.forwarded_formatter) {
+        auto& fwd_item = log.forwarded_formatter->ExtractLoggerItem();
+        default_logger_->Log(level, fwd_item);
+    }
 }
 
 logging::impl::formatters::BasePtr Logger::MakeFormatter(logging::Level level, logging::LogClass log_class) {
-    return std::make_unique<Formatter>(level, log_class, config_.logs_sink, default_logger_, *this);
+    auto sink = log_class == logging::LogClass::kLog ? config_.logs_sink : config_.tracing_sink;
+    return std::make_unique<Formatter>(level, log_class, sink, default_logger_, *this);
 }
 
 void Logger::SetAttributeValue(

otlp/tests/service_test.cpp

@@ -5,6 +5,7 @@
 #include <otlp/logs/logger.hpp>
 #include <userver/engine/sleep.hpp>
 
+#include <userver/logging/impl/mem_logger.hpp>
 #include <userver/ugrpc/tests/service_fixtures.hpp>
 #include <userver/utest/default_logger_fixture.hpp>
 
@@ -89,16 +90,20 @@ class TraceService final : public opentelemetry::proto::collector::trace::v1::Tr
 class LogServiceTest : public Service<LogService, TraceService>, public utest::DefaultLoggerFixture<::testing::Test> {
 public:
     LogServiceTest() : Service({}) {
+        otlp::LoggerConfig config;
+        config.logs_sink = otlp::SinkType::kBoth;
         logger_ = std::make_shared<otlp::Logger>(
             MakeClient<opentelemetry::proto::collector::logs::v1::LogsServiceClient>(),
             MakeClient<opentelemetry::proto::collector::trace::v1::TraceServiceClient>(),
-            otlp::LoggerConfig{}
+            otlp::LoggerConfig{config}
         );
         SetDefaultLogger(logger_);
     }
 
     ~LogServiceTest() override { logger_->Stop(); }
 
+    otlp::Logger& GetLogger() { return *logger_; }
+
 private:
     std::shared_ptr<otlp::Logger> logger_;
 };
@@ -112,6 +117,15 @@ UTEST_F(LogServiceTest, NoInfiniteLogsInTrace) {
     EXPECT_EQ(GetService1().logs.size(), 1);
 }
 
+UTEST_F(LogServiceTest, ForwardLogs) {
+    auto mem_logger = std::make_shared<logging::impl::MemLogger>();
+
+    GetLogger().SetDefaultLogger(mem_logger);
+    LOG_INFO() << "dummy log";
+
+    EXPECT_EQ(mem_logger->GetPendingLogsCount(), 1);
+}
+
 UTEST_F(LogServiceTest, SmokeLogs) {
     auto timestamp =
         std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch());

universal/include/userver/logging/impl/mem_logger.hpp

@@ -30,6 +30,8 @@ class MemLogger final : public LoggerBase {
 
     void DropLogs();
 
+    size_t GetPendingLogsCount();
+
 protected:
     bool DoShouldLog(Level) const noexcept override;
 

universal/src/logging/impl/mem_logger.cpp

@@ -41,6 +41,11 @@ void MemLogger::DropLogs() {
     pimpl_->data_.clear();
 }
 
+size_t MemLogger::GetPendingLogsCount() {
+    std::unique_lock lock(pimpl_->mutex_);
+    return pimpl_->data_.size();
+}
+
 void MemLogger::Log(Level level, formatters::LoggerItemRef msg) {
     UASSERT(dynamic_cast<formatters::LogItem*>(&msg));
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-static-cast-downcast)