remove log level from log structs, use conventional logging interface - .info, .warning, etc.

Author: ndbroadbent

lib/log_struct/concerns/error_handling.rb

@@ -43,7 +43,7 @@ def log_error(error, source:, context: nil)
             error,
             context || {}
           )
-          LogStruct.log(error_log)
+          LogStruct.error(error_log)
         end
 
         # Report an error using the configured handler or MultiErrorReporter

lib/log_struct/concerns/logging.rb

@@ -1,7 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "../enums/level"
 require_relative "../log"
 
 module LogStruct
@@ -11,26 +10,34 @@ module Logging
       module ClassMethods
         extend T::Sig
 
-        # Type-safe interface for Rails.logger
+        # Log a log struct at debug level
         sig { params(log: Log::Interfaces::CommonFields).void }
-        def log(log)
-          level = log.level
-          case level
-          when Level::Debug
-            Rails.logger.debug(log)
-          when Level::Info
-            Rails.logger.info(log)
-          when Level::Warn
-            Rails.logger.warn(log)
-          when Level::Error
-            Rails.logger.error(log)
-          when Level::Fatal
-            Rails.logger.fatal(log)
-          when Level::Unknown
-            Rails.logger.error(log) # Log unknown severity as error
-          else
-            T.absurd(level)
-          end
+        def debug(log)
+          Rails.logger.debug(log)
+        end
+
+        # Log a log struct at info level
+        sig { params(log: Log::Interfaces::CommonFields).void }
+        def info(log)
+          Rails.logger.info(log)
+        end
+
+        # Log a log struct at warn level
+        sig { params(log: Log::Interfaces::CommonFields).void }
+        def warn(log)
+          Rails.logger.warn(log)
+        end
+
+        # Log a log struct at error level
+        sig { params(log: Log::Interfaces::CommonFields).void }
+        def error(log)
+          Rails.logger.error(log)
+        end
+
+        # Log a log struct at fatal level
+        sig { params(log: Log::Interfaces::CommonFields).void }
+        def fatal(log)
+          Rails.logger.fatal(log)
         end
       end
     end

lib/log_struct/formatter.rb

@@ -193,7 +193,7 @@ def call(severity, time, progname, log_value)
       data[:src] ||= Source::App
       data[:evt] ||= Event::Log
       data[:ts] ||= time.iso8601(3)
-      data[:lvl] ||= level_enum # Just a fallback, Log structs store their own level field
+      data[:lvl] = level_enum # Set level from severity parameter
       data[:prog] = progname if progname.present?
 
       generate_json(data)

lib/log_struct/integrations/action_mailer/error_handling.rb

@@ -58,7 +58,7 @@ def log_structured_error(mailer, error, message)
           )
 
           # Log the structured error
-          LogStruct.log(exception_data)
+          LogStruct.error(exception_data)
         end
 
         # Log when email delivery fails
@@ -106,7 +106,7 @@ def handle_error_notifications(error, notify, report, reraise)
             )
 
             # Log the exception with structured data
-            LogStruct.log(exception_data)
+            LogStruct.error(exception_data)
 
             # Call the error handler
             LogStruct.handle_exception(error, source: Source::Mailer, context: context)
@@ -131,7 +131,7 @@ def log_notification_event(error)
           )
 
           # Log the error at info level since it's not a critical error
-          LogStruct.log(exception_data)
+          LogStruct.info(exception_data)
         end
 
         sig { params(error: StandardError).returns(String) }

lib/log_struct/integrations/action_mailer/event_logging.rb

@@ -65,13 +65,12 @@ def log_mailer_event(event_type, level = :info, additional_data = {})
           # Create a structured log entry
           log_data = Log::ActionMailer.new(
             event: event_type,
-            level: Level::Info,
             to: to,
             from: from,
             subject: subject,
             additional_data: data
           )
-          LogStruct.log(log_data)
+          LogStruct.info(log_data)
           log_data
         end
 

lib/log_struct/integrations/active_storage.rb

@@ -85,7 +85,7 @@ def self.process_active_storage_event(event, config)
         )
 
         # Log structured data
-        LogStruct.log(log_data)
+        LogStruct.info(log_data)
       end
     end
   end

lib/log_struct/integrations/rack_error_handler/middleware.rb

@@ -97,7 +97,7 @@ def call(env)
               referer: request.referer,
               request_id: request.request_id
             )
-            LogStruct.log(security_log)
+            LogStruct.error(security_log)
 
             # Report to error reporting service and/or re-raise
             context = extract_request_context(env)
@@ -116,7 +116,7 @@ def call(env)
               error,
               context
             )
-            LogStruct.log(exception_log)
+            LogStruct.error(exception_log)
 
             # Re-raise any standard errors to let Rails or error reporter handle it.
             # Rails will also log the request details separately

lib/log_struct/log/interfaces/common_fields.rb

@@ -3,7 +3,6 @@
 
 require_relative "../../enums/source"
 require_relative "../../enums/event"
-require_relative "../../enums/level"
 
 module LogStruct
   module Log
@@ -27,10 +26,6 @@ def event; end
         sig { abstract.returns(Time) }
         def timestamp; end
 
-        # The log level of the log entry (JSON property: lvl)
-        sig { abstract.returns(Level) }
-        def level; end
-
         # All logs must define a custom serialize method
         # If the class is a T::Struct that responds to serialize then we can be sure
         # we're getting symbols as keys and don't need to call #serialize.deep_symbolize_keys

lib/log_struct/log/plain.rb

@@ -29,7 +29,6 @@ class Plain < T::Struct
       const :source, Source, default: T.let(Source::App, Source)
       const :event, PlainEvent, default: T.let(Event::Log, PlainEvent)
       const :timestamp, Time, factory: -> { Time.now }
-      const :level, Level, default: T.let(Level::Info, Level)
 
       # Plain log messages can be any type (String, Number, Array, Hash, etc.)
       # Developers might do something like Rails.logger.info(123) or Rails.logger.info(@variable)

lib/log_struct/log/shared/serialize_common.rb

@@ -20,8 +20,7 @@ def serialize_common(strict = true)
         {
           LOG_KEYS.fetch(:source) => source.serialize,
           LOG_KEYS.fetch(:event) => event.serialize,
-          LOG_KEYS.fetch(:timestamp) => timestamp.iso8601(3),
-          LOG_KEYS.fetch(:level) => level.serialize
+          LOG_KEYS.fetch(:timestamp) => timestamp.iso8601(3)
         }
       end
     end