lib/timber/log_entry.rb in timber-1.0.13 vs lib/timber/log_entry.rb in timber-1.1.0

@@ -1,51 +1,65 @@
 module Timber
   # Represents a new log entry into the log. This is an intermediary class between
   # `Logger` and the log device that you set it up with.
   class LogEntry #:nodoc:
     DT_PRECISION = 6.freeze
+    SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/1.2.3/schema.json".freeze
 
-    attr_reader :level, :time, :progname, :message, :context, :event
+    attr_reader :context_snapshot, :event, :level, :message, :progname, :tags, :time
 
     # Creates a log entry suitable to be sent to the Timber API.
     # @param severity [Integer] the log level / severity
     # @param time [Time] the exact time the log message was written
     # @param progname [String] the progname scope for the log message
-    # @param message [#to_json] structured data representing the log line event, this can
-    #   be anything that responds to #to_json
+    # @param message [String] Human readable log message.
+    # @param context_snapshot [Hash] structured data representing a snapshot of the context at
+    #   the given point in time.
+    # @param event [Timber.Event] structured data representing the log line event. This should be
+    #   an instance of `Timber.Event`.
     # @return [LogEntry] the resulting LogEntry object
-    def initialize(level, time, progname, message, context, event)
+    def initialize(level, time, progname, message, context_snapshot, event, tags)
       @level = level
       @time = time.utc
       @progname = progname
       @message = message
-      @context = context
+      @tags = tags
+
+      context_snapshot = {} if context_snapshot.nil?
+      system_context = Contexts::System.new(pid: Process.pid)
+      context_snapshot[system_context.keyspace] = system_context.as_json
+
+      @context_snapshot = context_snapshot
       @event = event
     end
 
     def as_json(options = {})
       options ||= {}
-      hash = {level: level, dt: formatted_dt, message: message}
+      hash = {:level => level, :dt => formatted_dt, :message => message, :tags => tags}
 
       if !event.nil?
         hash[:event] = event
       end
 
-      if !context.nil? && context.length > 0
-        hash[:context] = context
+      if !context_snapshot.nil? && context_snapshot.length > 0
+        hash[:context] = context_snapshot
       end
 
-      if options[:only]
+      hash[:"$schema"] = SCHEMA
+
+      hash = if options[:only]
         hash.select do |key, _value|
           options[:only].include?(key)
         end
       elsif options[:except]
         hash.select do |key, _value|
           !options[:except].include?(key)
         end
       else
         hash
       end
+
+      Util::Hash.compact(hash)
     end
 
     def to_json(options = {})
       as_json(options).to_json
     end
\ No newline at end of file