appydays 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1f73c4eb2c61d4b2e218bc3254ba6dffe3241737cae24ba7be92b20f63223d
-  data.tar.gz: 0b4f8eed51455f752dbe4885abeb9cbfb1178bbfb4e35397fd444858aabb0845
+  metadata.gz: cb1862009d51664566983d9878a212b53fbe7db55fa434e169460f86e946f7ed
+  data.tar.gz: 7eecb5b9dcbe494cdbfeb8724ac28f2e6a51db029caab5a39b5d5d8c2b08a7ea
 SHA512:
-  metadata.gz: 927b8d9fe9ce1fb67fbac6b0431230b68a081a7a01edbc3db7c7878cda8c1671c3297255ec3869188a8409006f5db8ad47d78cacb3d6edeea12f7848c5ede5d6
-  data.tar.gz: 161743e389b05dc0724dac0b034f40b19781e51a60b766e502cf5d2b370746353a137e38ddb0e952758a4625f15e959764762b9a2b5ede35aecc520f11687d0d
+  metadata.gz: 4a0c0fd8f35ac2e1d39a91cb6b9a32b753e57035c4f34e6ef42a16f32dd344ce7acd18b2198037b5b47e18132ddffcafeedae593dc5b9cf65c1b92756c6ff5c3
+  data.tar.gz: a9d3043afcb2e5c4338757fc83107b77d1bd67dccc863fed42e6114d512898794cc8723b07673f80f51fee4a527a03577c40a2476e43370ed0187b46833e6735

data/lib/appydays/loggable/request_logger.rb

@@ -42,29 +42,36 @@ class Appydays::Loggable::RequestLogger
     # so clear the request tags first thing.
     self.class.request_tags.clear
     began_at = Time.now
-    request_fields = self._request_tags(env, began_at)
-    status, header, body = SemanticLogger.named_tagged(request_fields) { @app.call(env) }
+    request_id = self._ensure_request_id(env)
+    # Only use the request_id as the context/correllation id for log messages,
+    # otherwise we end up with a lot of log spam.
+    status, header, body = SemanticLogger.named_tagged(request_id:) do
+      @app.call(env)
+    end
     header = Rack::Utils::HeaderHash.new(header)
-    body = Rack::BodyProxy.new(body) { self.log_finished(request_fields, began_at, status, header) }
+    body = Rack::BodyProxy.new(body) { self.log_finished(env, began_at, status, header) }
     [status, header, body]
   rescue StandardError => e
     began_at ||= nil
-    request_fields ||= {}
-    self.log_finished(request_fields, began_at, 599, {}, e)
+    self.log_finished(env, began_at, 599, {}, e)
     raise if @reraise
   end
 
-  protected def _request_tags(env, began_at)
-    req_id = SecureRandom.uuid.to_s
+  protected def _ensure_request_id(env)
+    req_id = env["HTTP_X_REQUEST_ID"] ||= SecureRandom.uuid.to_s
     env["HTTP_TRACE_ID"] ||= req_id
+    return req_id
+  end
+
+  protected def _request_tags(env, began_at)
     h = {
+      request_id: env["HTTP_X_REQUEST_ID"], # Added by _ensure_request_id
+      trace_id: env["HTTP_TRACE_ID"], # Legacy purposes
       remote_addr: env["HTTP_X_FORWARDED_FOR"] || env["REMOTE_ADDR"] || "-",
       request_started_at: began_at.to_s,
       request_method: env[Rack::REQUEST_METHOD],
       request_path: env[Rack::PATH_INFO],
       request_query: env.fetch(Rack::QUERY_STRING, "").empty? ? "" : "?#{env[Rack::QUERY_STRING]}",
-      request_id: req_id,
-      trace_id: env["HTTP_TRACE_ID"],
     }
     h.merge!(self.request_tags(env))
     return h
@@ -74,8 +81,9 @@ class Appydays::Loggable::RequestLogger
     return {}
   end
 
-  protected def log_finished(tags, began_at, status, header, exc=nil)
+  protected def log_finished(env, began_at, status, header, exc=nil)
     elapsed = (Time.now - began_at).to_f
+    tags = self._request_tags(env, began_at)
     tags.merge!(
       response_finished_at: Time.now.iso8601,
       response_status: status,

data/lib/appydays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appydays
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Lithic Tech