datadog-json_logger 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a3bd99fbe42f4f151f466f1d4881ac2e402a56998a0b6a2b1b0bd543a79102
-  data.tar.gz: 4987ddc088b69f67eead916c24200b0fc9370a7153a17acc9a2108748b6c87ae
+  metadata.gz: 836874a1c02962352440db10da65b626a68794a8ce7a6587bb5ab3158cebf1f5
+  data.tar.gz: a16b5252652d557495cf9a13ffbdd64ce6d412c2d581555c6e69c0d65e85eee7
 SHA512:
-  metadata.gz: d63a90d6b53893695969dcf752823146d45f5c50e1b420b9d18bdb24150c58022dc531e9d615e35796a53f94debcd0b5ecad3862c64e4a3d3c359cc92fc6f08e
-  data.tar.gz: 75216849fe27f732e4a00bd60e46cda2871df68bb2dd86c4c509a9cadae74f26c93bb1ac0a3adfdf3fc4eeaaedd664afd7147e08481eafd3263a5bd2550079bf
+  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/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.8"
+    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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Eth3rnit3