pier_logging 0.1.15 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b9f495421c7b6e2b36d0cd8a0ff5978cba36feaf25350a383900347f58b9eb
-  data.tar.gz: 64339331f573395e582b713b460278ff41df69906b6584765b14f3a6f2f8f122
+  metadata.gz: a68a14c994124359699bf1e907d76b47f06efe6f46d20bc2d68a13180b76ada8
+  data.tar.gz: 671bc7adb48ffb3d33e694c17b7dcd68f6a1743220bcd22ba74f7c9f933efa18
 SHA512:
-  metadata.gz: 9cbc2402ac849f1b89938d17e3b33c47829148e5bc67eda1250e189fb0b394385ffbc58877e875c8437cfabf7ddb8e0c524f3e3fce42adec755b5afc4a097cac
-  data.tar.gz: ef22e8acb1ec18fc43b54e60454759a7f2728375344feb9c97b3d8de24db0dfe1bb28cd3e824ba9f9518d03aa8e9db399a3b37856192b43ef9d225b2c9d06a18
+  metadata.gz: 72a2b35a68c812a341bf59dd24360ec0ed7b381f0873cc1d492e5507e4d7a7e527fe42f1d0b190afd8fcba3ca53a0e77bbc665bee224facb5c7abe2aa870962a
+  data.tar.gz: 4fdb6ae38a9aa3d68d7437e34f2264f44e2721d3dab531a04236a169e6ff471987fd40fecb8cadc4e1b2c156158ee275e19a0a05ff4b33f0729e397c464cd532

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,12 +50,13 @@ module PierLogging
         duration: ((ends_at - starts_at)*1000).to_i,
         context: {
           user: get_user_info_from_headers(request_headers),
-          correlation_id: env['action_dispatch.request_id'],
+          request_id: env['action_dispatch.request_id'],
+          correlation_id: get_correlation_id(env, request_headers)
         },
         request: {
           headers: request_headers,
           href: request.url,
-          body: parse_body(request.POST)
+          body: parse_body(request.body)
         },
         response: {
           status: status,
@@ -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.call(env, headers) || headers['X-CORRELATION-ID']
+    end
+
     def parse_body(body)
       body_object = get_body_object(body)
       Oj.load(body_object, allow_blank: true)
@@ -140,4 +145,4 @@ module PierLogging
       500
     end
   end
-end
+end

data/lib/pier_logging/version.rb

@@ -1,3 +1,3 @@
 module PierLogging
-  VERSION = "0.1.15"
+  VERSION = "0.2.4"
 end

metadata

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