integrate <rsl/kwargs>

Author: Tsche

example/spans.cpp

@@ -1,8 +1,8 @@
+#define RSL_DOLLAR_MACROS
 #include <rsl/log>
 
 void bar() {
-  // TODO
-  RSL_LOG_CONTEXT("bar", rsl::log_level::INFO, x=1, y=2);
+  $context("bar", rsl::log_level::INFO, x=1, y=2);
   rsl::info("from bar");
 }
 
@@ -15,12 +15,10 @@ void foo() {
 int main() {
   rsl::error("error before main context");
 
-  // rsl::logging::ContextGuard context{INFO, "main"};
   auto x = 42;
   auto ctx = rsl::log::context("main", rsl::log_level::INFO);
-  // ctx.extra = ExtraFields{{rsl::_log_impl::Field(^^x).set_ptr(&x)}};
   ctx.enter();
-  rsl::error("test error");
+  rsl::error("test error", $args(foo=123));
   foo();
   ctx.exit();
 }

include/rsl/log

@@ -11,9 +11,8 @@
 #include <utility>
 
 #include <rsl/kwargs>
-#  define RSL_LOG_CONTEXT(name, level, ...) \
-    rsl::log::context_guard _(name, level, RSL_LOG_ARGS, RSL_KWARGS(__VA_ARGS__))
-
+#define RSL_LOG_CONTEXT(name, level, ...) \
+  rsl::log::context_guard _(name, level, RSL_LOG_ARGS, RSL_KWARGS(__VA_ARGS__))
 
 #define RSL_TRACE(...)                                      \
   (void)(is_enabled_for(::rsl::logging::LogLevel::TRACE) && \
@@ -36,7 +35,7 @@
 
 #ifdef RSL_DOLLAR_MACROS
 #  define $log_args           RSL_LOG_ARGS
-#  define $context(name, ...) RSL_LOG_CONTEXT(name, __VA_ARGS__)
+#  define $context(...)       RSL_LOG_CONTEXT(__VA_ARGS__)
 #  define $trace(...)         RSL_TRACE(__VA_ARGS__)
 #  define $debug(...)         RSL_DEBUG(__VA_ARGS__)
 #  define $info(...)          RSL_INFO(__VA_ARGS__)

include/rsl/logging/_impl/formatter.hpp

@@ -11,6 +11,7 @@
 
 #include <rsl/source_location>
 #include <rsl/format>
+#include <rsl/kwargs>
 
 #include <rsl/logging/event.hpp>
 #include <rsl/logging/context.hpp>
@@ -76,7 +77,11 @@ void emit_event(ExtraFields const* fnc_args,
                          .context   = context ? *context : Context(),
                          .arguments = fnc_args ? *fnc_args : ExtraFields{},
                          .sloc      = fmt.sloc};
-
+    if constexpr (sizeof...(Args) > 0) {
+      if constexpr (is_kwargs<std::remove_cvref_t<Args...[sizeof...(Args) - 1]>>) {
+        meta.extra = ExtraFields(args...[sizeof...(Args) - 1]);
+      }
+    }
     selected_logger<Empty...>.emit(meta, fmt, std::forward<Args>(args)...);
   }
 }

include/rsl/logging/event.hpp

@@ -19,6 +19,7 @@ struct Metadata {
   std::thread::id thread_id;
   Context context;
   ExtraFields arguments;
+  ExtraFields extra;
 
   // set by the formatter
   rsl::source_location sloc;

include/rsl/logging/field.hpp

@@ -194,7 +194,9 @@ struct ExtraFields {
   ExtraFields() = default;
 
   template <std::size_t N>
-  explicit(false) ExtraFields(std::array<Field, N> const& fields) {}
+  explicit(false) ExtraFields(std::array<Field, N> const& fields) {
+    // TODO
+  }
 
   explicit(false) ExtraFields(std::vector<Field> fields) : fields(std::move(fields)) {}
   template <typename T>

src/sinks/terminal.cpp

@@ -5,6 +5,9 @@
 namespace rsl::logging {
 void TerminalSink::emit_event(Event const& event) {
   std::println("{} ({: >8} {}) {}", event.meta.timestamp, event.meta.context.name, event.meta.context.id, std::string(event.text));
+  for (auto const& extra : event.meta.extra) {
+    std::println("  {} = {}", extra.name, extra.to_string());
+  }
 }
 
 void TerminalSink::enter_context(Metadata const& meta, bool handover) {