logstash-input-rabbitmq 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9717be7fd0104ed684844927a5a69a0fda982052
-  data.tar.gz: 8b9d5fc15f6b107b73f8f9c5a94a446b7c443ea4
+  metadata.gz: 158655501a87fa5ca7beb4a9f5ef3819851a0d30
+  data.tar.gz: 05ed03e1cc8fdeae916bc6d5d2c6016236b7de37
 SHA512:
-  metadata.gz: ced6c3f699db3b007d8bd0f374f62eba27dd0f6bf60ce3c9347a12f635c3b0213d9a6d54088618f1602b7785d39dddbb2dc3b9aebc9b986f1b2f5812460acf21
-  data.tar.gz: 1234e882f423de759d0774fa8f232c3b88b5ebb3e16b7f9bb649b2408da0c12c02a163751aa870601a9fa23a55b916c7849fba46960ce1938e078fd19c0b8646
+  metadata.gz: f5af5e745f43667b28c668a8083b91c1b915f43929abd874f042fb88e8e1e223cb15c8f31ccd1502e77f367b9b8897494641a70ef3f4e9fbe53b973f26ba6f13
+  data.tar.gz: 19f8415dadf49ecc52db3827cfe2e55352979e20dba60bd6023f87a21d18a658d2c0901897cc7a06f9bea5032d18e3d1d31738d6f98dc6a84b3f85c1b519cbda

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.2.3
+ - Fix metadata decoration so that `add_field` and friends aren't overwritten by headers and properties
+
 ## 5.2.2
  - Remove legacy header normalization code. MarchHare does this directly now.
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -253,11 +253,8 @@ module LogStash
           @codec.decode(data) do |event|
             decorate(event)
             if @metadata_enabled
-              meta = {
-                "rabbitmq_headers" => get_headers(metadata),
-                "rabbitmq_properties" => get_properties(metadata)
-              }
-              event.set("@metadata", meta)
+              event.set("[@metadata][rabbitmq_headers]", get_headers(metadata))
+              event.set("[@metadata][rabbitmq_properties]", get_properties(metadata))
             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         = '5.2.2'
+  s.version         = '5.2.3'
   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"

data/spec/inputs/rabbitmq_spec.rb

@@ -130,7 +130,7 @@ end
 
 describe "with a live server", :integration => true do
   let(:klass) { LogStash::Inputs::RabbitMQ }
-  let(:config) { {"host" => "127.0.0.1", "auto_delete" => true, "codec" => "plain" } }
+  let(:config) { {"host" => "127.0.0.1", "auto_delete" => true, "codec" => "plain", "add_field" => {"[@metadata][foo]" => "bar"} } }
   let(:instance) { klass.new(config) }
   let(:hare_info) { instance.instance_variable_get(:@hare_info) }
   let(:output_queue) { Queue.new }
@@ -265,6 +265,10 @@ describe "with a live server", :integration => true do
         expect(event.get("@metadata")).to include("rabbitmq_headers")
         expect(event.get("[@metadata][rabbitmq_headers]")).to include(headers)
       end
+
+      it "should properly decorate the event" do
+        expect(event.get("[@metadata][foo]")).to eq("bar")
+      end
     end
   end
 

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core-plugin-api
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -30,8 +28,11 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-mixin-rabbitmq_connection
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -39,10 +40,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
-  name: logstash-mixin-rabbitmq_connection
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -50,48 +48,50 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :development
-  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: []