logjam_agent 0.32.4 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882e0807f2b78aa878d7af652e4cb3ab6d0a77115e2add1792fc85091c629d15
-  data.tar.gz: 0500627f55dd0c1e10013db3e2cdba1c23f15b587d3ceb440fe2bd0921cd3a2e
+  metadata.gz: dbd400c4a9aedda3d5659a550bd2da21e9a29696cd1e5c77c14cb1f15d8e7e50
+  data.tar.gz: d71e179fd331b16c0b2117a31a15e45278477b8f4709ffaf93d91c2a859d9a44
 SHA512:
-  metadata.gz: f37a0ce94d7a2cc233eb5ff2c9a84c39b2396b1c99a0349df185bae8716e46b24caf8e6d341bca6ed503914721b59142ee7db2221ada9d3c7a544c86648b80f8
-  data.tar.gz: d8c839977ec58a66e87381ca1cb76877988eacde9eaf59f7d4b2d102848c11c84ddc370c14bb1b0c559c1dab8e9a718de82a24d68982c61b94a49a69acd86fda
+  metadata.gz: d5fbde19a0225c1859940ab1add7a690ef67109f861154e7a9d80bbc33834ae18fc415d1ab90ca891d7c245c20761c96ab92d07e99ca011ac5866a740ba37376
+  data.tar.gz: ff9c7d40001b7902f5fbccb8db57b32d57f23760e74225412be354d046967c97c7e0eafec4bc31b7cd2c961920d31fbc2645671091081e441100001ce82c1d40

data/lib/logjam_agent/middleware.rb

@@ -50,9 +50,11 @@ module LogjamAgent
       env_name      = env["logjam_agent.environment_name"] || LogjamAgent.environment_name
       caller_id     = env["HTTP_X_LOGJAM_CALLER_ID"] || ""
       caller_action = env["HTTP_X_LOGJAM_ACTION"] || ""
+      trace_id      = env["HTTP_X_LOGJAM_TRACE_ID"] || ""
       extra_fields = {}
       extra_fields[:caller_id] = caller_id if caller_id.present?
       extra_fields[:caller_action] = caller_action if caller_action.present?
+      extra_fields[:trace_id] = trace_id if trace_id.present?
       LogjamAgent.start_request(app_name, env_name, extra_fields)
     end
 

data/lib/logjam_agent/request.rb

@@ -17,6 +17,7 @@ module LogjamAgent
       @uuid = LogjamAgent.generate_uuid
       @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname,
                                      :process_id => Process.pid, :lines => @lines)
+      @fields[:trace_id] ||= @uuid
       unless (revision = LogjamAgent.application_revision).blank?
         @fields[:revision] = revision
       end
@@ -70,6 +71,10 @@ module LogjamAgent
       @fields[:caller_action]
     end
 
+    def trace_id
+      @fields[:trace_id]
+    end
+
     def add_line(severity, timestamp, message)
       @mutex.synchronize do
         if @bytes_all_lines > @max_bytes_all_lines

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.32.4"
+  VERSION = "0.33.0"
 end

data/test/request_test.rb

@@ -44,6 +44,16 @@ module LogjamAgent
       assert_equal TRUNCATED_LINE, lines(@request)[1][2]
     end
 
+    def test_sets_trace_id_to_request_id_if_not_passed_in
+      assert_equal @request.uuid, @request.fields[:trace_id]
+    end
+
+    def test_sets_trace_id_to_passed_in_field_value
+      trace_id = "murks"
+      request = Request.new("app", "env", {trace_id: trace_id})
+      assert_equal trace_id, request.fields[:trace_id]
+    end
+
     private
 
     def lines(request)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.32.4
+  version: 0.33.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -275,16 +275,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam
 test_files:
+- test/request_test.rb
 - test/sinatra_app.rb
-- test/sinatra_classic_test.rb
 - test/sinatra_classic_app.rb
-- test/request_test.rb
-- test/zmq_forwarder_test.rb
-- test/util_test.rb
-- test/test_helper.rb
+- test/sinatra_classic_test.rb
 - test/sinatra_test.rb
+- test/test_helper.rb
+- test/util_test.rb
+- test/zmq_forwarder_test.rb