pier_logging 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c102d9c566bc2227233c2fb698f87f99a13061194f25d0d4728bc356ed2c1593
-  data.tar.gz: 76d4d43102a6e10693dffb9f7b6671ecff73a2b22f47add8d2dbe9635b3c2044
+  metadata.gz: da3fa5137127ab906fa13b90b251d005ada38bd22c2168ca1e1afef1ac7b684e
+  data.tar.gz: f72e2e957911e257624334db0ea5db3b49c37db016b59890a0e24d23f5f32bf5
 SHA512:
-  metadata.gz: f98a44d5ca1c3b360301550e14a20327301e12c40b8fc07286432068b9943bed4820472ba8f2d2c78aa87eefb0c3440c89153c4a1bbd1b78e5705c22aee8cfb9
-  data.tar.gz: e072ab069990dd67224e1bfd7e3c32c446ef76849f222499adb94cd5c67ea50260ac25f7d36da8d5cda8cd43463482cb9e4327bb547a8a0d493665d100257d8a
+  metadata.gz: e113be9d8b60c8899d51aac9fe3e44ac251d5f90ac702a986744b2044b33b9f9b9c66f9a18ac21126c10926fc3885e3955d466060ffec675bfd91c7eddfb8354
+  data.tar.gz: 172f984d32d3a4979a10e9dc790454d4ab431f67879b80ec80d8de2aa93c588dbd5a1240084acab9f094cf0c121277dbf88bb1ce7b4378098f3076b588c59355

data/lib/pier_logging.rb

@@ -54,14 +54,16 @@ module PierLogging
   end
 
   class RequestLoggerConfiguration
-    attr_reader :enabled, :user_info_getter, :hide_response_body_for_paths, :log_response, :hide_request_headers
+    attr_reader :enabled, :user_info_getter, :hide_response_body_for_paths, 
+                :log_response, :hide_request_headers, :correlation_id_getter
 
     def initialize
-      @user_info_getter = nil
+      @user_info_getter = ->(_ = nil) { nil }
       @enabled = false
       @hide_response_body_for_paths = nil
       @log_response = true
       @hide_request_headers = nil
+      @correlation_id_getter = ->(_ = nil, _ = nil) { nil }
     end
 
     def user_info_getter=(proc)
@@ -93,5 +95,10 @@ module PierLogging
       raise ArgumentError, "Config 'enabled' must be a 'boolean'" unless !!enabled == enabled
       @enabled = enabled
     end
+
+    def correlation_id_getter=(proc)
+      raise ArgumentError, "Config 'correlation_id_getter' must be a 'Proc'" unless proc.is_a? Proc
+      @correlation_id_getter = proc
+    end
   end
 end

data/lib/pier_logging/request_logger.rb

@@ -50,7 +50,8 @@ module PierLogging
         duration: ((ends_at - starts_at)*1000).to_i,
         context: {
           user: get_user_info_from_headers(request_headers),
-          correlation_id: request_headers['X-CORRELATION-ID'],
+          request_id: env['action_dispatch.request_id'],
+          correlation_id: get_correlation_id(env, headers)
         },
         request: {
           headers: request_headers,
@@ -101,6 +102,10 @@ module PierLogging
       PierLogging.request_logger_configuration.user_info_getter.call(headers)
     end
 
+    def get_correlation_id(env, headers)
+      PierLogging.request_logger_configuration.correlation_id_getter(env, headers) || headers['X-CORRELATION-ID']
+    end
+
     def parse_body(body)
       body_object = get_body_object(body)
       Oj.load(body_object, allow_blank: true)

data/lib/pier_logging/version.rb

@@ -1,3 +1,3 @@
 module PierLogging
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pier_logging
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mauricio Banduk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ougai