logjam_agent 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c6ecbf3ed8bc61db07e66fb6d5626e1734e6765781a29ad4bbafb261ccf890
-  data.tar.gz: 67a2ef0e834278c2241aafceac7805a72457a1cb68348a48bb0ec95f99658924
+  metadata.gz: dbd400c4a9aedda3d5659a550bd2da21e9a29696cd1e5c77c14cb1f15d8e7e50
+  data.tar.gz: d71e179fd331b16c0b2117a31a15e45278477b8f4709ffaf93d91c2a859d9a44
 SHA512:
-  metadata.gz: '08137b0a31ce7054b3965ffea84c267d45e08752234f93ad4e2777ac28a0e4954dc4bf0f9dd2e6f1fd02f8979fd5a39a28e5dfa00138f4a6ca8f3a0ac21ba354'
-  data.tar.gz: e0405de81c09f70eecfe77842d25bd150c0fe6a13f028c0cdcbc7d01c029ec786da1b722774a6c4a162112dd1dda04bed0de918469810f3da965241f7d38e322
+  metadata.gz: d5fbde19a0225c1859940ab1add7a690ef67109f861154e7a9d80bbc33834ae18fc415d1ab90ca891d7c245c20761c96ab92d07e99ca011ac5866a740ba37376
+  data.tar.gz: ff9c7d40001b7902f5fbccb8db57b32d57f23760e74225412be354d046967c97c7e0eafec4bc31b7cd2c961920d31fbc2645671091081e441100001ce82c1d40

data/lib/logjam_agent.rb

@@ -1,5 +1,6 @@
 require "socket"
 require "time_bandits"
+require "logjam_agent/monkey_patches/ffi-rzmq-patch"
 
 module LogjamAgent
   module RequestHandling
@@ -76,12 +77,9 @@ module LogjamAgent
   self.parameter_filters = []
 
   def self.get_hostname
-    n = Socket.gethostname
-    if n.split('.').size > 1
-      n
-    else
-      Socket.gethostbyname(n).first rescue n
-    end
+    name = Socket.gethostname
+    host = name.split('.').first
+    Addrinfo.getaddrinfo(host, nil, nil, :STREAM, nil, Socket::AI_CANONNAME).first.canonname rescue name
   end
 
   mattr_accessor :hostname

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/monkey_patches/ffi-rzmq-patch.rb

@@ -0,0 +1,19 @@
+# see https://github.com/chuckremes/ffi-rzmq/pull/133
+
+require 'ffi-rzmq'
+require 'ffi-rzmq/message'
+
+module ZMQ
+  class Message
+    def copy_in_bytes bytes, len
+      data_buffer = LibC.malloc len
+      # writes the exact number of bytes, no null byte to terminate string
+      data_buffer.put_bytes 0, bytes, 0, len
+
+      # use libC to call free on the data buffer; earlier versions used an
+      # FFI::Function here that called back into Ruby, but Rubinius won't
+      # support that and there are issues with the other runtimes too
+      LibZMQ.zmq_msg_init_data @pointer, data_buffer, len, LibC::Free, nil
+    end
+  end
+end

data/lib/logjam_agent/railtie.rb

@@ -90,9 +90,9 @@ module LogjamAgent
           # Rails 5 fires on_load events multiple times, so we need to protect against endless recursion
           next if ActionController::TestCase::Behavior.instance_methods.include?(:process_without_logjam)
           module ActionController::TestCase::Behavior
-            def process_with_logjam(*args)
+            def process_with_logjam(action, **opts)
               LogjamAgent.start_request
-              process_without_logjam(*args)
+              process_without_logjam(action, **opts)
             ensure
               LogjamAgent.finish_request
             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.1"
+  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.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -236,6 +236,7 @@ files:
 - lib/logjam_agent/buffered_logger.rb
 - lib/logjam_agent/forwarders.rb
 - lib/logjam_agent/middleware.rb
+- lib/logjam_agent/monkey_patches/ffi-rzmq-patch.rb
 - lib/logjam_agent/rack/logger.rb
 - lib/logjam_agent/rack/rails_support.rb
 - lib/logjam_agent/rack/sinatra_request.rb
@@ -274,16 +275,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+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