logjam_agent 0.31.0 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b543de9e4f7a8d5ae896a7c2fa4524a8b220a1dad8a6b4e1be6b5eee4c8110e
-  data.tar.gz: 62f2aee617a120107307e625b2ba2df8fb461f53ba9fa3baff0ce0187fc1325f
+  metadata.gz: 882e0807f2b78aa878d7af652e4cb3ab6d0a77115e2add1792fc85091c629d15
+  data.tar.gz: 0500627f55dd0c1e10013db3e2cdba1c23f15b587d3ceb440fe2bd0921cd3a2e
 SHA512:
-  metadata.gz: ec3578d040a1033e06029caf81256e6524a66a7c8c24493e986e467a603564e53b22cc05eadf243a3310ccfb8b3b065c012759e5d21d2acd9e64b597e4fb6710
-  data.tar.gz: ed17803ea6301229c58b82e2886cf82bb36fa88554567f5864e0d38df653a2b2a07fe76160b49de55ef03619b745608e95648364532f3f7e465021a558ae7ae1
+  metadata.gz: f37a0ce94d7a2cc233eb5ff2c9a84c39b2396b1c99a0349df185bae8716e46b24caf8e6d341bca6ed503914721b59142ee7db2221ada9d3c7a544c86648b80f8
+  data.tar.gz: d8c839977ec58a66e87381ca1cb76877988eacde9eaf59f7d4b2d102848c11c84ddc370c14bb1b0c559c1dab8e9a718de82a24d68982c61b94a49a69acd86fda

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/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/version.rb

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

data/lib/logjam_agent/zmq_forwarder.rb

@@ -16,6 +16,7 @@ module LogjamAgent
       @sequence = SEQUENCE_START
       @socket = nil
       @ping_ensured = false
+      @socket_mutex = Mutex.new
     end
 
     def connection_specs
@@ -35,11 +36,11 @@ module LogjamAgent
       }
     end
 
-    @@mutex = Mutex.new
+    @@context_mutex = Mutex.new
     @@zmq_context = nil
 
     def self.context
-      @@mutex.synchronize do
+      @@context_mutex.synchronize do
         @@zmq_context ||=
           begin
             require 'ffi-rzmq'
@@ -50,29 +51,9 @@ module LogjamAgent
       end
     end
 
-    def socket
-      return @socket if @socket
-      @socket = self.class.context.socket(ZMQ::DEALER)
-      raise "ZMQ error on socket creation: #{ZMQ::Util.error_string}" if @socket.nil?
-      if LogjamAgent.ensure_ping_at_exit
-        ensure_ping_at_exit
-      else
-        at_exit { reset }
-      end
-      @socket.setsockopt(ZMQ::LINGER, @config[:linger])
-      @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
-      @socket.setsockopt(ZMQ::RCVHWM, @config[:rcv_hwm])
-      @socket.setsockopt(ZMQ::RCVTIMEO, @config[:rcv_timeo])
-      @socket.setsockopt(ZMQ::SNDTIMEO, @config[:snd_timeo])
-      spec = connection_specs.sort_by{rand}.first
-      @socket.connect(spec)
-      @socket
-    end
-
     def reset
-      if @socket
-        @socket.close
-        @socket = nil
+      @socket_mutex.synchronize do
+        reset_without_locking
       end
     end
 
@@ -89,16 +70,47 @@ module LogjamAgent
         key += ".#{engine}"
       end
       msg = LogjamAgent.encode_payload(data)
-      if options[:sync]
-        send_receive(app_env, key, msg)
-      else
-        publish(app_env, key, msg)
+      @socket_mutex.synchronize do
+        if options[:sync]
+          send_receive(app_env, key, msg)
+        else
+          publish(app_env, key, msg)
+        end
       end
     rescue => error
       reraise_expectation_errors!
       raise ForwardingError.new(error.message)
     end
 
+    private
+
+    def reset_without_locking
+      if @socket
+        @socket.close
+        @socket = nil
+      end
+    end
+
+    # this method assumes the caller holds the socket mutex
+    def socket
+      return @socket if @socket
+      @socket = self.class.context.socket(ZMQ::DEALER)
+      raise "ZMQ error on socket creation: #{ZMQ::Util.error_string}" if @socket.nil?
+      if LogjamAgent.ensure_ping_at_exit
+        ensure_ping_at_exit
+      else
+        at_exit { reset }
+      end
+      @socket.setsockopt(ZMQ::LINGER, @config[:linger])
+      @socket.setsockopt(ZMQ::SNDHWM, @config[:snd_hwm])
+      @socket.setsockopt(ZMQ::RCVHWM, @config[:rcv_hwm])
+      @socket.setsockopt(ZMQ::RCVTIMEO, @config[:rcv_timeo])
+      @socket.setsockopt(ZMQ::SNDTIMEO, @config[:snd_timeo])
+      spec = connection_specs.sort_by{rand}.first
+      @socket.connect(spec)
+      @socket
+    end
+
     def publish(app_env, key, data)
       info = pack_info(@sequence = next_fixnum(@sequence))
       parts = [app_env, key, data, info]
@@ -109,8 +121,6 @@ module LogjamAgent
       end
     end
 
-    private
-
     def log_warning(message)
       LogjamAgent.error_handler.call ForwardingWarning.new(message)
     end
@@ -123,12 +133,12 @@ module LogjamAgent
       answer_parts = []
       if socket.send_strings(request_parts) < 0
         log_warning "ZMQ error on sending: #{ZMQ::Util.error_string}"
-        reset
+        reset_without_locking
         return nil
       end
       if socket.recv_strings(answer_parts) < 0
         log_warning "ZMQ error on receiving: #{ZMQ::Util.error_string}"
-        reset
+        reset_without_locking
         return nil
       end
       if answer_parts.first != "" || !VALID_RESPONSE_CODES.include?(answer_parts.second.to_s.to_i)
@@ -138,8 +148,10 @@ module LogjamAgent
     end
 
     def ping
-      if @socket && !send_receive("ping", @app_env, "{}", NO_COMPRESSION)
-        log_warning "failed to receive pong"
+      @socket_mutex.synchronize do
+        if @socket && !send_receive("ping", @app_env, "{}", NO_COMPRESSION)
+          log_warning "failed to receive pong"
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.4
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-02-25 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,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam