logstash-input-rabbitmq 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5caab21a9bb09f1d4af8660f26558c9bde6e9968
-  data.tar.gz: 522d2d66e0c768a06dc14f7dea3e38cc3e4419c0
+  metadata.gz: 234eccd39f2d2459784e232bfee4aca303c51956
+  data.tar.gz: 8ff9cd86fbd139dd7a3623316f1b60749a9bfe57
 SHA512:
-  metadata.gz: 1d8a4404784a9de832e23c4b1c9272a87997fbeb4fc5984380c27e6c52a1e8f3661f170e8909eb59bfe7fad15c7af4303e327e44da23ce89632e65a737d1b47b
-  data.tar.gz: 5f01768900d95ddba5259bff24c01856297684c3a46642d78643c96b16d2f508eb37052cb309bc13d8829a6ca3154d97275d85ab96e0c4e22240be6fce2039d7
+  metadata.gz: 8e7947a49fc82d0066c9d0563b2dd9ca16d5780ffec7bca130b58a5e1776c3ca7bfaf18528ca1e3f4982ae794f0636e0d029d7e330d6ec9e207bd3117813518a
+  data.tar.gz: efb6b29abfdd37f47cf9ea707789561ab5848f2c00e1e59dc66958802527ef793d871b264cc4d9f86b7757f4c96b1243e14bfd4c7017aa346e2fcd222b3589d3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.0
+ - Fix a regression in 3.2.0 that reinstated behavior that duplicated consumers
+ - Always declare exchanges used, the exchange now need not exist before LS starts
+ - Allow a precise specification of the exchange type
+
 ## 3.2.0
  - The properties and headers of the messages are now saved in the [@metadata][rabbitmq_headers] and [@metadata][rabbitmq_properties] fields.
  - Logstash now shuts down if the server sends a basic.cancel method.

data/lib/logstash/inputs/rabbitmq.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'logstash/plugin_mixins/rabbitmq_connection'
 require 'logstash/inputs/threadable'
+require 'logstash/event'
 
 module LogStash
   module Inputs
@@ -142,6 +143,9 @@ module LogStash
       # The name of the exchange to bind the queue to.
       config :exchange, :validate => :string
 
+      # The type of the exchange to bind to
+      config :exchange_type, :validate => :string
+
       # The routing key to use when binding a queue to the exchange.
       # This is only relevant for direct or topic exchanges.
       #
@@ -174,6 +178,7 @@ module LogStash
 
       def bind_exchange!
         if @exchange
+          @hare_info.exchange = declare_exchange!(@hare_info.channel, @exchange, @exchange_type, @durable)
           @hare_info.queue.bind(@exchange, :routing_key => @key)
         end
       end
@@ -199,8 +204,7 @@ module LogStash
         # that we rely on MarchHare to do the reconnection for us with auto_reconnect.
         # Unfortunately, while MarchHare does the reconnection work it won't re-subscribe the consumer
         # hence the logic below.
-        @consumer = @hare_info.queue.build_consumer(:block => true,
-                                                    :on_cancellation => Proc.new { on_cancellation }) do |metadata, data|
+        @consumer = @hare_info.queue.build_consumer(:on_cancellation => Proc.new { on_cancellation }) do |metadata, data|
           @codec.decode(data) do |event|
             decorate(event)
             event["@metadata"]["rabbitmq_headers"] = get_headers(metadata)

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '3.2.0'
+  s.version         = '3.3.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from 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/plugin install gemname. This gem is not a stand-alone program"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
   s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 2.3.0', '< 3.0.0'
 
   s.add_runtime_dependency 'logstash-codec-json'

data/spec/inputs/rabbitmq_spec.rb

@@ -2,6 +2,7 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/rabbitmq"
 require "thread"
+require 'logstash/event'
 
 Thread.abort_on_exception = true
 
@@ -72,9 +73,22 @@ describe LogStash::Inputs::RabbitMQ do
         let(:key) { "routing key" }
         let(:rabbitmq_settings) { super.merge("exchange" => exchange, "key" => key) }
 
-        it "should bind to the exchange" do
-          instance.register
-          expect(queue).to have_received(:bind).with(exchange, :routing_key => key)
+        before do
+          allow(instance).to receive(:declare_exchange!)
+        end
+
+        context "on register" do
+          before do
+            instance.register
+          end
+
+          it "should bind to the exchange" do
+            expect(queue).to have_received(:bind).with(exchange, :routing_key => key)
+          end
+
+          it "should declare the exchange" do
+            expect(instance).to have_received(:declare_exchange!)
+          end
         end
 
         context "but not immediately available" do
@@ -165,15 +179,21 @@ describe "with a live server", :integration => true do
     expect(instance.instance_variable_get(:@hare_info).channel.prefetch).to eql(256)
   end
 
-  describe "receiving a message with a queue specified" do
-    let(:config) { super.merge("queue" => queue_name) }
+  describe "receiving a message with a queue + exchange specified" do
+    let(:config) { super.merge("queue" => queue_name, "exchange" => exchange_name, "exchange_type" => "fanout") }
     let(:event) { output_queue.pop }
-    let(:queue) { test_channel.queue(queue_name, :auto_delete => true) }
+    let(:exchange) { test_channel.exchange(exchange_name, :type => "fanout") }
+    let(:exchange_name) { "logstash-input-rabbitmq-#{rand(0xFFFFFFFF)}" }
+    #let(:queue) { test_channel.queue(queue_name, :auto_delete => true) }
     let(:queue_name) { "logstash-input-rabbitmq-#{rand(0xFFFFFFFF)}" }
 
+    after do
+      exchange.delete
+    end
+
     context "when the message has a payload but no message headers" do
       before do
-        queue.publish(message)
+        exchange.publish(message)
       end
 
       let(:message) { "Foo Message" }
@@ -193,7 +213,7 @@ describe "with a live server", :integration => true do
       before do
         # Don't test every single property but select a few with
         # different characteristics to get sufficient coverage.
-        queue.publish("",
+        exchange.publish("",
                       :properties => {
                         :app_id    => app_id,
                         :timestamp => Java::JavaUtil::Date.new(epoch * 1000),
@@ -215,16 +235,16 @@ describe "with a live server", :integration => true do
         props = event["@metadata"]["rabbitmq_properties"]
         expect(props["app-id"]).to eq(app_id)
         expect(props["delivery-mode"]).to eq(1)
-        expect(props["exchange"]).to eq("")
+        expect(props["exchange"]).to eq(exchange_name)
         expect(props["priority"]).to eq(priority)
-        expect(props["routing-key"]).to eq(queue_name)
+        expect(props["routing-key"]).to eq("")
         expect(props["timestamp"]).to eq(epoch)
       end
     end
 
     context "when message headers are available" do
       before do
-        queue.publish("", :properties => { :headers => headers })
+        exchange.publish("", :properties => { :headers => headers })
       end
 
       let (:headers) {
@@ -245,8 +265,6 @@ describe "with a live server", :integration => true do
   end
 
   describe LogStash::Inputs::RabbitMQ do
-    it_behaves_like "an interruptible input plugin" do
-
-    end
+    it_behaves_like "an interruptible input plugin"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -24,7 +24,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0