fluent-plugin-amqp 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e93fe77ace14180d097374471e736a137036749d
-  data.tar.gz: 6cb705baeaa7630379a9796a0ebb72e8f4c3cba7
+SHA256:
+  metadata.gz: 83133837639cc240c17c319ddc075ff365e4ed599e393439216f00a7ba62ec12
+  data.tar.gz: 51005871d326dd9ee209f77e96c602892e2ef8bda5a126753007bd5e82770470
 SHA512:
-  metadata.gz: 2e426235e9caaa1b2f33ee7684820e48b2e73fcdb1c82bebe5e018e343924f6e61fcfb8064f4ff99b4e77bcc148e88f557290007e0d0bddb6c36108728f8bba9
-  data.tar.gz: 6bf70391454be18dc1ef97e157bc2dcd87ec8da28e95103e5a04c42d01feed1dcb22fc899ef922e3c1f5ee52af1a5161973634f4c4106bf08441722713f14cc5
+  metadata.gz: 8bd4d7ca5e802b74fcee42bd7050dc63e20d4ee0fdbbf15ab8b3084df3c302ec674b1452ada1ff19ba48a0d4c59affc191f71bd93f35277b115d0aff42fef228
+  data.tar.gz: 88494f525f1b9c6d3b211068e1a3a5ee04b4dc03a34dded4415534046e6329fe9ad480e04cc12d4ea08104c3837d8f2ae7c4f70d0fd09d64a76b1f5930a70b6d

data/lib/fluent/plugin/in_amqp.rb

@@ -44,6 +44,8 @@ module Fluent::Plugin
     config_param :bind_exchange, :bool, default: false
     config_param :exchange, :string, default: ""
     config_param :routing_key, :string, default: "#"                       # The routing key used to bind queue to exchange - # = matches all, * matches section (tag.*.info)
+    config_param :include_headers, :bool, default: false
+    config_param :auth_mechanism, :string, default: nil
 
     def configure(conf)
       conf['format'] ||= conf['payload_format'] # legacy
@@ -83,8 +85,10 @@ module Fluent::Plugin
       end
 
       q.subscribe do |delivery, meta, msg|
-        log.debug "Recieved message #{@msg}"
-        payload = parse_payload(msg)
+        log.debug "Recieved message #{msg}"
+        log.debug "Recieved message  MetaData #{meta}"
+        payload = parse_payload(msg, meta)
+        log.debug "Parsed Payload #{payload}"
         router.emit(parse_tag(delivery, meta), parse_time(meta), payload)
       end
     end # AMQPInput#run
@@ -100,20 +104,25 @@ module Fluent::Plugin
     end
 
     private
-    def parse_payload(msg)
+    def parse_payload(msg, meta)
+      parsed = nil
       if @parser
-        parsed = nil
         @parser.parse msg do |_, payload|
           if payload.nil?
             log.warn "failed to parse #{msg}"
-            parsed = { "message" => msg }
+            parsed = { 'message' => msg }
           else
             parsed = payload
           end
         end
-        parsed
       else
-        { "message" => msg }
+        parsed = { 'message' => msg }
+      end
+      if @include_headers
+        log.debug 'Adding headers'
+        { 'headers' => meta[:headers] }.merge(parsed)
+      else
+        parsed
       end
     end
 
@@ -142,7 +151,8 @@ module Fluent::Plugin
         pass: @pass, user: @user, ssl: @ssl,
         verify_ssl: @verify_ssl, heartbeat: @heartbeat,
         tls: @tls,
-        verify_peer: @tls_verify_peer
+        verify_peer: @tls_verify_peer,
+        auth_mechanism: @auth_mechanism
       }
       # Include additional optional TLS configurations
       opts[:tls_key] = @tls_key if @tls_key

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Hiromi Ishii
 - Team Giraffi
 - HiganWorks LLC
 - Toby Jackson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -151,7 +151,7 @@ homepage: http://github.com/giraffi/fluent-plugin-amqp
 licenses:
 - Apache License, Version 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,9 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: AMQP input/output plugin or fluentd
 test_files: []