json_tagged_logger 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f290019420ad4691086787da1f7c2982383eaae9812bc2eb1874778ce5d00718
-  data.tar.gz: 9a52e70773163bd3428612d56b1f723bd50550763f84710eda06aec1a02cd9a7
+  metadata.gz: ca97d589d38e918e570eab76849c3589dcb4afcffdc40d225f41ea5a61933dba
+  data.tar.gz: a7bcb458e29394d91f312cf2b0cb478a43a46f546810fdad6837221456ca2ffc
 SHA512:
-  metadata.gz: 902135acc6779b5d4a5f63313a8f0ced0125d08998d61ebf77064dd4159764cb14bac9353a11f0efc70a02cc99bed628eaea25dbbd95169dc79c3ef5b782d786
-  data.tar.gz: 3ad70d7851f82976ac866d1ad3553670f3122c8476429de4064d71333214cadbebcfb7e9af1d013151c04f83ff5d8038ce52cc7fd88fb453c7bf8529074aae50
+  metadata.gz: 3509d3b59ed3c6f4d77e78ae8c105f1eb7301ff706857a817689d2da97f2e23ca0b7400d90cae961d0ec51d01a6bbe86c375e4ecc4322fb307cba18575ea473f
+  data.tar.gz: 168f3b44c2db71af307c5dff9b2ad73858872093e6f0e22e41728b0c97d407e76e4bb56692a368800c840921749310a9bee6b869faed1b4f55ccd21737c54db7

data/README.md

@@ -21,7 +21,7 @@ Rails.application.configure do
     :host,
     ->(request) { { my_param: request.query_parameters["my_param"] }.to_json },
     JsonTaggedLogger::TagFromSession.get(:user_id),
-    JsonTaggedLogger::TagFromHeaders.get(:my_custom_header, "X-Custom-Header"),
+    JsonTaggedLogger::TagFromHeaders.get(my_custom_header: "X-Custom-Header"),
   )
 
   logger = ActiveSupport::Logger.new(STDOUT)

data/lib/json_tagged_logger/tag_from_headers.rb

@@ -1,8 +1,12 @@
 module JsonTaggedLogger
   module TagFromHeaders
-    def self.get(log_label, header_key)
+    def self.get(*header_keys, **labeled_header_keys)
+      labels = header_keys + labeled_header_keys.keys
+      header_keys = header_keys + labeled_header_keys.values
+
       lambda do |request|
-        { log_label => request.headers[header_key] }.to_json
+        values = header_keys.map { |hk| request.headers[hk] }
+        labels.zip(values).to_h.compact.to_json
       end
     end
   end

data/lib/json_tagged_logger/tag_from_session.rb

@@ -2,20 +2,24 @@ require 'action_dispatch'
 
 module JsonTaggedLogger
   module TagFromSession
-    def self.get(log_label, session_key = log_label)
+    def self.get(*simple_tags, **labeled_tags)
+      labels = simple_tags + labeled_tags.keys
+      session_keys = simple_tags + labeled_tags.values
+
       lambda do |request|
-        { log_label => get_value_from_session(request, session_key) }.to_json
+        values = get_values_from_session(request, session_keys)
+        labels.zip(values).to_h.compact.to_json
       end
     end
 
     private
 
-    def self.get_value_from_session(request, key)
+    def self.get_values_from_session(request, keys)
       session_options = Rails.application.config.session_options
       session_store = Rails.application.config.session_store.new(Rails.application, session_options)
       session = ActionDispatch::Request::Session.create(session_store, request, session_options)
 
-      session[key]
+      keys.map { |k| session[k] }
     ensure
       # Clean up side effects from loading the session so it can be loaded as
       # usual during the normal request cycle. Leaving these headers in place

data/lib/json_tagged_logger/version.rb

@@ -1,3 +1,3 @@
 module JsonTaggedLogger
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_tagged_logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sean Santry