logjam_agent 0.33.0 → 0.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd400c4a9aedda3d5659a550bd2da21e9a29696cd1e5c77c14cb1f15d8e7e50
-  data.tar.gz: d71e179fd331b16c0b2117a31a15e45278477b8f4709ffaf93d91c2a859d9a44
+  metadata.gz: eb075dc1c42d045d800df979adde0ba2a4861de680c5154e42fb04552d2d4019
+  data.tar.gz: 6f0bf552907f852f0d6e16dcbf05f66b7d0ec5488c36e206046ae4edd5319db3
 SHA512:
-  metadata.gz: d5fbde19a0225c1859940ab1add7a690ef67109f861154e7a9d80bbc33834ae18fc415d1ab90ca891d7c245c20761c96ab92d07e99ca011ac5866a740ba37376
-  data.tar.gz: ff9c7d40001b7902f5fbccb8db57b32d57f23760e74225412be354d046967c97c7e0eafec4bc31b7cd2c961920d31fbc2645671091081e441100001ce82c1d40
+  metadata.gz: 30597a450700826424e80d43bdd1e210b0a11e27ba1576bdfe3498fa71d3bd122d30e36b8ba5038a1e2544e30e0a7b63b2ef2e3214df7719276fbdd311d8693f
+  data.tar.gz: 271462e2feac5b3ef4eaa29197b64b7d627b6f2561b699f3f0f24ec90a567ef3925d888486e40820f69b410528215f5f790d5f6a0248a2e4a66ec22dd323e7ca

data/README.md

@@ -10,7 +10,8 @@ Has experimental support for Sinatra.
 Currently only one mechanism is available for data transport:
 ZeroMQ. Support for AMQP has been dropped.
 
-[![Travis](https://travis-ci.org/skaes/logjam_agent.svg?branch=master)](https://travis-ci.org/github/skaes/logjam_agent)
+
+![Build](https://github.com/skaes/logjam_agent/actions/workflows/run-tests.yml/badge.svg)
 
 
 ## Usage

data/lib/logjam_agent/rack/logger.rb

@@ -32,23 +32,16 @@ module LogjamAgent
 
       def call_app(request, env)
         start_time = Time.now
-        start_time_header = env['HTTP_X_STARTTIME']
-        if start_time_header
-          if start_time_header =~ /\At=(\d+)\z/
-            # HTTP_X_STARTTIME is microseconds since the epoch (UTC)
-            http_start_time = Time.at($1.to_f / 1_000_000.0)
-          elsif start_time_header =~ /\Ats=(\d+)(?:\.(\d+))?\z/
-            # HTTP_X_STARTTIME is seconds since the epoch (UTC) with a milliseconds resolution
-            http_start_time = Time.at($1.to_f + $2.to_f / 1000)
-          end
-
-          if http_start_time && (wait_time_ms = (start_time - http_start_time) * 1000) > 0
+        wait_time_ms = 0.0
+        if http_start_time = extract_http_start_time(env)
+          wait_time_ms = (start_time - http_start_time) * 1000
+          if wait_time_ms > 0
             start_time = http_start_time
+          else
+            wait_time_ms = 0.0
           end
-        else
-          wait_time_ms = 0.0
         end
-        before_dispatch(request, env, start_time)
+        before_dispatch(request, env, start_time, wait_time_ms)
         result = @app.call(env)
       rescue ActionDispatch::RemoteIp::IpSpoofAttackError
         result = [403, {}, ['Forbidden']]
@@ -57,6 +50,20 @@ module LogjamAgent
         after_dispatch(env, result, run_time_ms, wait_time_ms)
       end
 
+      def extract_http_start_time(env)
+        start_time_header = env['HTTP_X_STARTTIME']
+        if start_time_header
+          if start_time_header =~ /\At=(\d+)\z/
+            # HTTP_X_STARTTIME is microseconds since the epoch (UTC)
+            return Time.at($1.to_f / 1_000_000.0)
+          elsif start_time_header =~ /\Ats=(\d+)(?:\.(\d+))?\z/
+            # HTTP_X_STARTTIME is seconds since the epoch (UTC) with a milliseconds resolution
+            return Time.at($1.to_f + $2.to_f / 1000)
+          end
+        end
+        return nil
+      end
+
       def compute_tags(request)
         @taggers.collect do |tag|
           case tag
@@ -78,7 +85,7 @@ module LogjamAgent
         false
       end
 
-      def before_dispatch(request, env, start_time)
+      def before_dispatch(request, env, start_time, wait_time_ms)
         logger.formatter.reset_attributes if logger.formatter.respond_to?(:reset_attributes)
         TimeBandits.reset
         Thread.current.thread_variable_set(:time_bandits_completed_info, nil)
@@ -90,6 +97,7 @@ module LogjamAgent
 
         logjam_request.start_time = start_time
         logjam_fields = logjam_request.fields
+        logjam_fields[:wait_time] = wait_time_ms if wait_time_ms > 0.0
         spoofed = nil
         ip = nil
         begin
@@ -125,7 +133,6 @@ module LogjamAgent
 
         if wait_time_ms < 0
           warn LogjamAgent::NegativeWaitTime.new("#{wait_time_ms} ms")
-          wait_time_ms = 0.0
         end
 
         message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % run_time_ms
@@ -135,7 +142,6 @@ module LogjamAgent
         ActiveSupport::LogSubscriber.flush_all!
         request_info = { :total_time => run_time_ms, :code => status }
         request_info[:view_time] = view_time if view_time
-        request_info[:wait_time] = wait_time_ms if wait_time_ms > 0
         logjam_request.fields.merge!(request_info)
 
         env["time_bandits.metrics"] = TimeBandits.metrics

data/lib/logjam_agent/version.rb

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

data/lib/logjam_agent/zmq_forwarder.rb

@@ -45,7 +45,8 @@ module LogjamAgent
           begin
             require 'ffi-rzmq'
             context = ZMQ::Context.new(1)
-            at_exit { context.terminate }
+            pid = Process.pid
+            at_exit { context.terminate if Process.pid == pid }
             context
           end
       end
@@ -59,7 +60,8 @@ module LogjamAgent
 
     def ensure_ping_at_exit
       return if @ping_ensured
-      at_exit { ping; reset }
+      pid = Process.pid
+      at_exit { (ping; reset) if Process.pid == pid }
       @ping_ensured = true
     end
 
@@ -99,7 +101,8 @@ module LogjamAgent
       if LogjamAgent.ensure_ping_at_exit
         ensure_ping_at_exit
       else
-        at_exit { reset }
+        pid = Process.pid
+        at_exit { reset if Process.pid == pid}
       end
       @socket.setsockopt(ZMQ::LINGER, @config[:linger])
       @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
@@ -141,7 +144,7 @@ module LogjamAgent
         reset_without_locking
         return nil
       end
-      if answer_parts.first != "" || !VALID_RESPONSE_CODES.include?(answer_parts.second.to_s.to_i)
+      if answer_parts.first != app_env || !VALID_RESPONSE_CODES.include?(answer_parts.second.to_s.to_i)
         log_warning "unexpected answer from logjam broker: #{answer_parts.inspect}"
       end
       answer_parts.second

data/test/sinatra_test.rb

@@ -37,6 +37,7 @@ module LogjamAgent
       assert_kind_of String, payload["started_at"]
       assert_kind_of Integer, payload["started_ms"]
       assert_kind_of String, payload["ip"]
+      assert_nil payload["wait_time"]
       # assert_kind_of Float, payload["view_time"]
       lines = payload["lines"]
       assert_match(/Started GET.*password=\[FILTERED\]/, lines[0][2])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.33.3
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-07 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam