logstash-input-rabbitmq 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb14e843e2e8a5ffa9d5287a135436a18de98f38
-  data.tar.gz: 105d5170c63d71319f80376fd3ac4ea205ab4fc3
+  metadata.gz: 5bbc361233870f8603a06c201360af9d3cf2e71e
+  data.tar.gz: b5bef45caa6dee094909facac753a29a6912675d
 SHA512:
-  metadata.gz: 96fc611d5cc99111d6f5f5aa6841e52fdaf3dbee3bb78172e43f94673062433318ad0e0f64cbe0f398c54674f38bca16b243054fc6ae37869ac622639ead169f
-  data.tar.gz: d886b8190230a07e197c326ffbe8370e85a476fe808a77bb6a751ee8798132308741b160ab927992cb608c6bce012af747199feed82cff7fdf77104b62be1755
+  metadata.gz: 0aceac02e2d7635f18136aa6110ea88b78cd168ede6ca625e5c6cd06574b36c5a8b9096f740a00253225e4fd3c41a4906ef1a592f7a2d9a070db29076c655d61
+  data.tar.gz: cf3256a1527207d78dd5b2aae519a34535f5ce805fd53bb5cd8554611ee06fab703eb86dc93daccc79dccbd18803bf1597596b6455f9cab95d1e1825f3821bb0

data/CHANGELOG.md

@@ -1,7 +1,7 @@
-## 4.1.0
- - Depend on new mixin with fixed TLS options
-## 4.0.1
- - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+## 5.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
+# 4.0.1
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 ## 4.0.0
  - Ensure the consumer is done processing messages before closing channel. Fixes shutdown errors.
  - Use an internal queue + separate thread to accelerate processing

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/lib/logstash/inputs/rabbitmq.rb

@@ -250,8 +250,11 @@ module LogStash
           @codec.decode(data) do |event|
             decorate(event)
             if @metadata_enabled
-              event["@metadata"]["rabbitmq_headers"] = get_headers(metadata)
-              event["@metadata"]["rabbitmq_properties"] = get_properties(metadata)
+              meta = {
+                "rabbitmq_headers" => get_headers(metadata),
+                "rabbitmq_properties" => get_properties(metadata)
+              }
+              event.set("@metadata", meta)
             end
             @output_queue << event if event
           end

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '4.1.0'
+  s.version         = '5.0.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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
-  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 4.1.1', '< 5.0.0'
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.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

@@ -199,13 +199,13 @@ describe "with a live server", :integration => true do
       let(:message) { "Foo Message" }
 
       it "should process the message and store the payload" do
-        expect(event["message"]).to eql(message)
+        expect(event.get("message")).to eql(message)
       end
 
       it "should save an empty message header hash" do
         expect(event).to include("@metadata")
-        expect(event["@metadata"]).to include("rabbitmq_headers")
-        expect(event["@metadata"]["rabbitmq_headers"]).to eq({})
+        expect(event.get("@metadata")).to include("rabbitmq_headers")
+        expect(event.get("[@metadata][rabbitmq_headers]")).to eq({})
       end
     end
 
@@ -230,9 +230,9 @@ describe "with a live server", :integration => true do
 
       it "should save message properties into a @metadata field" do
         expect(event).to include("@metadata")
-        expect(event["@metadata"]).to include("rabbitmq_properties")
+        expect(event.get("@metadata")).to include("rabbitmq_properties")
 
-        props = event["@metadata"]["rabbitmq_properties"]
+        props = event.get("[@metadata][rabbitmq_properties")
         expect(props["app-id"]).to eq(app_id)
         expect(props["delivery-mode"]).to eq(1)
         expect(props["exchange"]).to eq(exchange_name)
@@ -258,8 +258,8 @@ describe "with a live server", :integration => true do
 
       it "should save message headers into a @metadata field" do
         expect(event).to include("@metadata")
-        expect(event["@metadata"]).to include("rabbitmq_headers")
-        expect(event["@metadata"]["rabbitmq_headers"]).to include(headers)
+        expect(event.get("@metadata")).to include("rabbitmq_headers")
+        expect(event.get("[@metadata][rabbitmq_headers]")).to include(headers)
       end
     end
   end

metadata

@@ -1,92 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
+        version: '2.0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-mixin-rabbitmq_connection
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logstash-mixin-rabbitmq_connection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
-    - - <
+        version: 2.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
-  prerelease: false
+        version: 3.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+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
 email: info@elastic.co
 executables: []
 extensions: []
@@ -107,24 +109,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Pull events from a RabbitMQ exchange.
 test_files: