datadog-json_logger 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868149fa27f3bc6c4900011c73346154d535609f63fd8d897b25fca9f22253ce
-  data.tar.gz: 1cc23b123383d43bee6ad7e786be0091877f4a663bbf36a9f5947bd258a8f796
+  metadata.gz: 836874a1c02962352440db10da65b626a68794a8ce7a6587bb5ab3158cebf1f5
+  data.tar.gz: a16b5252652d557495cf9a13ffbdd64ce6d412c2d581555c6e69c0d65e85eee7
 SHA512:
-  metadata.gz: 82e4528f5fd85701d6bf6527df76548968949df48c677a05d9c6178534159248b99044e6f730a93602886e3f21c001c8c4212f2d0578f9df8cef98e32eaec195
-  data.tar.gz: 4ec4aee5f7e99ec413e36c0adbfc3b73ac026571305704b93757744fc6aa25cc708672d6f92693a17ea3bcb24920d4f561ff579f0f3935484ce20e50c30ee375
+  metadata.gz: 862e0ec3099f4fa33e0fb331beaedd778cfdfcb07e04bb4e3d6e79ec98c1b50fc3255e453c182d20db48ea1abef0e316661ae8feb678bd067bd24fca69153929
+  data.tar.gz: 715af0cff7b051bad08cf37ba75a52f23f42de62b1d97720ae367a2d218d3bc2d2a57dbb4cdcb1887ddd669eed430c5f4f4477c4c4ca63e39f3032438d4c4143

data/lib/datadog/configuration.rb

@@ -2,14 +2,20 @@
 
 module Datadog
   class Configuration
-    attr_accessor :current_user, :controller_key, :resource_key, :action_key
+    attr_accessor :current_user, :custom_context, :controller_key, :resource_key, :action_key
 
-    # @param current_user [Lambda] A lambda that returns the current user
-    # e.g. ->(env) { env["current_user"] }
+    # @param current_user [Proc] A proc that returns the current user
+    # e.g. ->(env) { env["current_user"] } # Current user is logged on each rack log if set
+
+    # @param custom_context [Proc] A proc that returns a hash of custom context
+    # @param controller_key [String] The key to use for the controller name in the log
+    # @param resource_key [String] The key to use for the resource name in the log
+    # @param action_key [String] The key to use for the action name in the log
 
     # @return [Datadog::Configuration]
     def initialize
       @current_user   = nil
+      @custom_context = -> { {} }
       @controller_key = "sinatra.controller_name"
       @resource_key   = "sinatra.resource_name"
       @action_key     = "sinatra.action_name"

data/lib/datadog/json_logger.rb

@@ -22,6 +22,10 @@ module Datadog
       yield(config)
     end
 
+    def config
+      self.class.config
+    end
+
     private
 
     def default_output

data/lib/datadog/loggers/json_formatter.rb

@@ -22,15 +22,24 @@ module Datadog
           dd: correlation_hash,
           timestamp: datetime.to_s,
           severity: severity.ljust(5).to_s,
-          progname: progname.to_s
+          progname: progname.to_s,
+          **custom_context
         }
       end
 
+      def self.custom_context
+        context = Datadog::JSONLogger.config.custom_context
+        return {} unless context.respond_to?(:call)
+
+        context.call
+      end
+
       def self.formatter_for(msg)
         case msg
         when Hash then HashFormatter
         when Exception then ExceptionFormatter
         when String then StringFormatter
+        when Proc then ProcFormatter
         else DefaultFormatter
         end
       end
@@ -77,6 +86,14 @@ module Datadog
         end
       end
 
+      module ProcFormatter
+        module_function
+
+        def format(log_hash, msg)
+          log_hash[:message] = msg.call
+        end
+      end
+
       module DefaultFormatter
         module_function
 

data/lib/datadog/loggers/version.rb

@@ -2,6 +2,6 @@
 
 module Datadog
   module Loggers
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-json_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Eth3rnit3