logjam_agent 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d512cc6fe0a7ce5767156b12a2a9d95e552ef36f2333e7ddabf75ed74f19c5
-  data.tar.gz: 2d671e9ba73b11f9140f343157d5d22746ed729e54deb0a4f717f1ee462f66fb
+  metadata.gz: 42a443531b0f42f9a5facc12e29186e0588e65a503ed066747d4a01e8545c4d7
+  data.tar.gz: e9b3e84141df640116d7992707e2e16d783d3c61aeff6204202cc177f64706c2
 SHA512:
-  metadata.gz: 8b22a1a1b6ad30072ac6d6ba07a1d4758d245b2ca98382c30dd5378082d6c6530e2f5723fff4db90b71d811fa9274eb8e8d56988f84eeb208dae687975bf6e09
-  data.tar.gz: 1f133bb814007b037158ed3088ae8f5f5bd77387c97e4e4036c23fdfb2f816a309cd309e8ed118ee038db8409c5582706108c419d009c14b00e86808a30298e8
+  metadata.gz: 3d4072d17788175b864c19bee9fd0e200fac5bc8bf9efa30d20d4eecc02c51f1ef95117c463c187e9fbd41f19a5604d598de0ebd3d65adeb4014bfb9dcd8e6ac
+  data.tar.gz: 9dd5d5b9a0a79e406567925ed7a18b2a93a8619d60042f4cf38ebd258018c32c023d38ce1e8911ac397c045c1f3799355ab4dcd99d0be9ff1cd8a701761138e7

data/README.md

@@ -5,16 +5,11 @@ Client side library for logjam.
 Hooks into Rails, collects log lines, performance metrics, error/exception infomation and Rack
 environment information and sends this data to [Logjam](https://github.com/skaes/logjam_app).
 
-Currently two alternate mechanisms are available for data transport: AMQP or ZeroMQ.
+Currently only one mechanism is available for data transport:
+ZeroMQ. Support for AMQP has been dropped.
 
 ## Usage
 
-For AMQP, add
-
-```ruby
-gem "logjam_agent"
-gem "bunny"
-```
 For ZeroMQ, add
 
 ```ruby
@@ -50,9 +45,6 @@ module LogjamAgent
                 :rcv_timeo => 5000,
                 :snd_timeo => 5000)
 
-  # Configure request data forwarder for AMQP.
-  # add_forwarder(:amqp, :host => "message.broker.at.your.org")
-
   # Configure ip obfuscation. Defaults to no obfuscation.
   self.obfuscate_ips = true
 
@@ -162,8 +154,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
-
-
-

data/lib/logjam_agent.rb

@@ -30,7 +30,6 @@ end
 
 require "logjam_agent/version"
 require "logjam_agent/util"
-require "logjam_agent/amqp_forwarder"
 require "logjam_agent/zmq_forwarder"
 require "logjam_agent/forwarders"
 require "logjam_agent/request"
@@ -269,7 +268,7 @@ module LogjamAgent
   def self.add_forwarder(type, *args)
     case type
     when :zmq then Forwarders.add(ZMQForwarder.new(*args))
-    when :amqp then Forwarders.add(AMQPForwarder.new(*args))
+    when :amqp then ArgumentError.new("logjam amqp transport no longer supported")
     else raise ArgumentError.new("unkown logjam transport: '#{type}'")
     end
   end

data/lib/logjam_agent/forwarders.rb

@@ -16,8 +16,7 @@ module LogjamAgent
       @@forwarders.each_value {|f| f.reset}
     end
 
-    # properly close AMQP connections on program termination
-    # this avoids 'connection_closed_abruptly' in the rabbit logs
+    # properly close open sockets on program termination
     at_exit { reset }
 
     def inspect

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.27.0"
+  VERSION = "0.28.0"
 end

data/logjam_agent.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "time_bandits", [">= 0.6.0"]
+  s.add_runtime_dependency "ffi-rzmq-core", [">= 1.0.5"]
+  s.add_runtime_dependency "ffi-rzmq", [">= 2.0.4"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 description: Logjam logger and request information forwarding
 email:
 - stefan.kaes@xing.com
@@ -149,7 +177,6 @@ files:
 - Rakefile
 - lib/logjam_agent.rb
 - lib/logjam_agent/actionpack/lib/action_dispatch/middleware/remote_ip.rb
-- lib/logjam_agent/amqp_forwarder.rb
 - lib/logjam_agent/buffered_logger.rb
 - lib/logjam_agent/forwarders.rb
 - lib/logjam_agent/middleware.rb
@@ -162,7 +189,6 @@ files:
 - lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec
 - script/console
-- test/amqp_forwarder_test.rb
 - test/request_test.rb
 - test/test_helper.rb
 - test/util_test.rb
@@ -186,12 +212,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logjam_agent
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Logjam client library to be used with logjam
 test_files:
-- test/amqp_forwarder_test.rb
 - test/request_test.rb
 - test/test_helper.rb
 - test/util_test.rb

data/lib/logjam_agent/amqp_forwarder.rb

@@ -1,108 +0,0 @@
-module LogjamAgent
-  class AMQPForwarder
-
-    RETRY_AFTER = 10.seconds
-
-    attr_reader :app, :env
-
-    include LogjamAgent::Util
-
-    def initialize(*args)
-      opts = args.extract_options!
-      @app = args[0] || LogjamAgent.application_name
-      @env = args[1] || LogjamAgent.environment_name
-      @app_env = "#{@app}-#{@env}"
-      @config = default_options.merge!(opts)
-      @exchanges = {}
-      @bunny = nil
-      @sequence = 0
-      @paused = nil
-      ensure_bunny_gem_is_available
-    end
-
-    def default_options
-      {
-        :host                 => "localhost",
-        :exchange_durable     => true,
-        :exchange_auto_delete => false,
-      }
-    end
-
-    # TODO: mutex!
-    def forward(data, options = {})
-      return if paused?
-      app_env = options[:app_env] || @app_env
-      key = options[:routing_key] || "logs.#{app_env.sub('-','.')}"
-      if engine = options[:engine]
-        key += ".#{engine}"
-      end
-      msg = LogjamAgent.encode_payload(data)
-      publish(app_env, key, msg)
-    rescue => error
-      reraise_expectation_errors!
-      pause(error)
-    end
-
-    def publish(app_env, key, data)
-      info = pack_info(@sequence = next_fixnum(@sequence))
-      exchange(app_env).publish(data, :key => key, :persistent => false, :headers => {:info => info})
-    end
-
-    def reset(exception=nil)
-      return unless @bunny
-      if exception
-        @bunny.__send__(:close_socket)
-      else
-        @bunny.stop
-      end
-    rescue
-      # swallow StandardError
-    ensure
-      # if bunny throws an exception here, its not usable anymore anyway
-      @exchanges = {}
-      @bunny = nil
-    end
-
-    private
-
-    if defined?(Mocha)
-      def reraise_expectation_errors! #:nodoc:
-        raise if $!.is_a?(Mocha::ExpectationError)
-      end
-    else
-      def reraise_expectation_errors! #:nodoc:
-        # noop
-      end
-    end
-
-    def pause(exception)
-      @paused = Time.now
-      reset(exception)
-      raise ForwardingError.new("Could not log to AMQP exchange (#{exception.message})")
-    end
-
-    def paused?
-      @paused && @paused > RETRY_AFTER.ago
-    end
-
-    def exchange(app_env)
-      @exchanges[app_env] ||=
-        begin
-          bunny.start unless bunny.connected?
-          bunny.exchange("request-stream-#{app_env}",
-                         :durable => @config[:exchange_durable],
-                         :auto_delete => @config[:exchange_auto_delete],
-                         :type => :topic)
-        end
-    end
-
-    #TODO: verify socket_timout for ruby 1.9
-    def bunny
-      @bunny ||= Bunny.new(:host => @config[:host], :socket_timeout => 1.0)
-    end
-
-    def ensure_bunny_gem_is_available
-      require "bunny" unless defined?(Bunny)
-    end
-  end
-end

data/test/amqp_forwarder_test.rb

@@ -1,32 +0,0 @@
-require_relative "test_helper.rb"
-
-module LogjamAgent
-  class AMQPForwarderTest < MiniTest::Test
-    def setup
-      AMQPForwarder.any_instance.expects(:ensure_bunny_gem_is_available)
-    end
-
-    def teardown
-      LogjamAgent.compression_method = NO_COMPRESSION
-    end
-
-    test "encodes the payload" do
-      data = {a: 1, b: "str"}
-      msg = LogjamAgent.encode_payload(data)
-      f = AMQPForwarder.new
-      f.expects(:publish).with("a-b", "x", msg)
-      f.forward(data, :routing_key => "x", :app_env => "a-b")
-    end
-
-    test "compressed message using snappy can be uncompressed" do
-      data = {a: 1, b: "str"}
-      normal_msg = LogjamAgent.encode_payload(data)
-      LogjamAgent.compression_method = SNAPPY_COMPRESSION
-      compressed_msg = LogjamAgent.encode_payload(data)
-      assert_equal normal_msg, Snappy.inflate(compressed_msg)
-      f = AMQPForwarder.new
-      f.expects(:publish).with("a-b", "x", compressed_msg)
-      f.forward(data, :routing_key => "x", :app_env => "a-b")
-    end
-  end
-end