logstash-output-rabbitmq 5.0.3-java → 5.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c097811756fa78460301fbdad94c779c3a6b65778b55555e738f230b1b8e6998
-  data.tar.gz: cd67152827ef4762d92b7734bba053868781322df3654a8dc61309e5b25817ac
+  metadata.gz: 803d787d5f5a3fddb6c4d96d06fce0c293f413ae75cbfe2020b16943d754c3ee
+  data.tar.gz: b6e8410d0bc521f557304be2f2d55053fc2dc5b385c9341e604870822ba8b5bf
 SHA512:
-  metadata.gz: 785e5f832d33b7bcabc3ad74d1326af12ab8ce5cd2e670e39f0aa9e868d8b2eb3facdff39169eced37fc4ae11828aca1dfe758d8652540ba38f17c00b9cef4b8
-  data.tar.gz: 38900f94b2b77f312c3ee92feda4707396ee4843235b05b2b918002906fc4f9329f74dab3bd7447b400349bf70eb002b09ac351a49db7dcf33c027ed0647abb8
+  metadata.gz: c2aacec385fd40029381cf15ee2e0afbfd2eb0c2e9cfac5b7ab385341a70708c0c45a01a6f02df7ed133e93c15603d1edb3d5c24431eb4031a428e32e84ec36c
+  data.tar.gz: b52cf1d8e1adb9dae4827d2e175703c7b90bc6ad6f9cdb3b81a3344948a6d9ef34b5802d84b866646f3628747cdf328b2113215e1394d45f7894aaa8efae2109

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1.0
+  _ Use shared concurrency / multiple channels for performance
+
 ## 5.0.3
   - Update gemspec summary
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/outputs/rabbitmq.rb

@@ -17,6 +17,8 @@ module LogStash
       include LogStash::PluginMixins::RabbitMQConnection
 
       config_name "rabbitmq"
+      
+      concurrency :shared
 
       # The default codec for this plugin is JSON. You can override this to suit your particular needs however.
       default :codec, "json"
@@ -44,22 +46,24 @@ module LogStash
       def register
         connect!
         @hare_info.exchange = declare_exchange!(@hare_info.channel, @exchange, @exchange_type, @durable)
-        @codec.on_event(&method(:publish))
+        # The connection close should close all channels, so it is safe to store thread locals here without closing them
+        @thread_local_channel = java.lang.ThreadLocal.new
+        @thread_local_exchange = java.lang.ThreadLocal.new
       end
 
       def symbolize(myhash)
         Hash[myhash.map{|(k,v)| [k.to_sym,v]}]
       end
 
-      def receive(event)
-        @codec.encode(event)
-      rescue StandardError => e
-        @logger.warn("Error encoding event", :exception => e, :event => event)
+      def multi_receive_encoded(events_and_data)
+        events_and_data.each do |event, data|
+          publish(event, data)
+        end
       end
 
       def publish(event, message)
         raise ArgumentError, "No exchange set in HareInfo!!!" unless @hare_info.exchange
-        @hare_info.exchange.publish(message, :routing_key => event.sprintf(@key), :properties => symbolize(@message_properties.merge(:persistent => @persistent)))
+        local_exchange.publish(message, :routing_key => event.sprintf(@key), :properties => symbolize(@message_properties.merge(:persistent => @persistent)))
       rescue MarchHare::Exception, IOError, AlreadyClosedException, TimeoutException => e
         @logger.error("Error while publishing. Will retry.",
                       :message => e.message,
@@ -70,6 +74,24 @@ module LogStash
         retry
       end
 
+      def local_exchange
+        exchange = @thread_local_exchange.get
+        if !exchange
+          exchange = declare_exchange!(local_channel, @exchange, @exchange_type, @durable)
+          @thread_local_exchange.set(exchange)
+        end
+        exchange
+      end
+
+      def local_channel
+        channel = @thread_local_channel.get
+        if !channel
+          channel = @hare_info.connection.create_channel
+          @thread_local_channel.set(channel)
+        end
+        channel
+      end
+
       def close
         close_connection
       end

data/logstash-output-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-rabbitmq'
-  s.version         = '5.0.3'
+  s.version         = '5.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pushes events to a RabbitMQ exchange"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/rabbitmq_spec.rb

@@ -163,6 +163,7 @@ describe "with a live server", :integration => true do
     sleep 1
   end
   let(:message) { LogStash::Event.new("message" => "Foo Message", "extra_field" => "Blah") }
+  let(:encoded) { message.to_json }
   let(:test_connection) { MarchHare.connect(instance.send(:rabbitmq_settings)) }
   let(:test_channel) { test_connection.create_channel }
   let(:test_queue) {
@@ -196,7 +197,7 @@ describe "with a live server", :integration => true do
     end
 
     it 'applies per message settings' do
-      instance.receive(message)
+      instance.multi_receive_encoded([[message, encoded]])
       sleep 1.0
 
       message, payload = test_queue.pop
@@ -213,7 +214,7 @@ describe "with a live server", :integration => true do
         @received = payload
       end
 
-      instance.receive(message)
+      instance.multi_receive_encoded([[message, encoded]])
 
       until @received
         sleep 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Pushes events to a RabbitMQ exchange