fluent-plugin-rabbitmq 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976e5bca2df7402adf2d3a8ec78776c18d875711901d9043c94c3ad0fec43143
-  data.tar.gz: 23428a5b0a5f80a75dfec1deb8c78c82e07618a9c51583ddb288d3aef7d6890a
+  metadata.gz: d19f4fe4911a5441010f37f67a288b18e47ff6bb8864bc934bf672b8fc66691f
+  data.tar.gz: 72c7d7999c485d04775acfb10e542f5b35291e6a8aadc76bd4bee627d5acc97d
 SHA512:
-  metadata.gz: ed027afd80649651f7b64136fc97fb5f44b995c396a66e00fa11c6060822316a089b92ed1ede709a7e25b4ed1a5b4bbd1a6bfb51a176c0334d02ac9710345826
-  data.tar.gz: c873ad03d0233ca3b91bdef9fad657a2a654926ce035d9e5f7c92d630353ed85419bb1dc54d318d8fd714a483d71e7a270414e642988f94cb1b86ee289374f79
+  metadata.gz: d4784b7fbb892914c5605d64d30f1be87b4fbb13328ece921cc00443ca98319b2582b77b51bac19cb3552dfe205f5de20da68a630787fec4bd4f41bdfc588d14
+  data.tar.gz: 95bc51c1becff3512b1929cb08e453bba8bc8c3d774c72e9c811f08c25d39a5ead02055fb46ce6b5fde1b5d08e622fb6b3681a3ea310d76c80e652271c860281

data/README.md

@@ -47,16 +47,20 @@ fluentd >= 0.14.0
 |durable|true|false|set durable flag of the queue|
 |exclusive|true|false|set exclusive flag of the queue|
 |auto_delete|true|false|set auto_delete flag of the queue|
+|queue_no_declare|true|false|passive declare option for queue|
 |ttl|60000|nil|queue ttl in ms|
 |prefetch_count|10|nil||
 |consumer_pool_size|5|nil||
 |include_headers|true|false|include headers in events|
 |headers_key|string|header|key name of headers|
+|include_properties|true|false|include AMQP basic properties (content_type, content_encoding, delivery_mode, priority, correlation_id, reply_to, expiration, message_id, timestamp, type, user_id, app_id, cluster_id) in events|
+|properties_key|string|properties|key name of properties|
 |create_exchange|true|false|create exchange or not|
 |exchange_to_bind|string|nil|exchange to bind created exchange|
 |exchange_type|direct|topic|type of created exchange|
 |exchange_routing_key|hoge|nil|created exchange routing key|
 |exchange_durable|true|false|durability of create exchange|
+|exchange_no_declare|true|false|passive declare option for exchange|
 |manual_ack|true|false|manual ACK|
 |queue_mode|"lazy"|nil|queue mode|
 |queue_type|"quorum"|nil|queue type|

data/fluent-plugin-rabbitmq.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.1.4"
-  spec.authors       = ["NTT Communications"]
+  spec.version       = "0.1.6"
+  spec.authors       = ["NTT DOCOMO BUSINESS"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 
   spec.summary       = %q{fluent plugin for rabbitmq (AMQP)}
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ltsv"
   spec.add_development_dependency "msgpack"
 
-  spec.add_runtime_dependency "fluentd", ">= 1.0.0"
+  spec.add_runtime_dependency "fluentd", ">= 1.0"
 
-  spec.add_dependency "bunny", "~> 2.14.4"
+  spec.add_dependency "bunny", "~> 3.4"
 end

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -53,6 +53,7 @@ module Fluent::Plugin
     config_param :exchange_type, :string, default: "topic"
     config_param :exchange_routing_key, :string, default: nil
     config_param :exchange_durable, :bool, default: false
+    config_param :exchange_no_declare, :bool, default: false
     
     config_param :tls, :bool, default: false
     config_param :tls_cert, :string, default: nil
@@ -64,13 +65,16 @@ module Fluent::Plugin
     config_param :durable, :bool, default: false
     config_param :exclusive, :bool, default: false
     config_param :auto_delete, :bool, default: false
+    config_param :queue_no_declare, :bool, default: false
     config_param :prefetch_count, :integer, default: nil
     config_param :ttl, :integer, default: nil
 
     config_param :include_headers, :bool, default: false
     config_param :include_delivery_info, :bool, default: false
+    config_param :include_properties, :bool, default: false
     config_param :headers_key, :string, default: "headers"
     config_param :delivery_info_key, :string, default: "delivery_info"
+    config_param :properties_key, :string, default: "properties"
     config_param :manual_ack, :bool, default: false
     config_param :queue_mode, :string, default: nil
     config_param :queue_type, :string, default: nil
@@ -120,7 +124,8 @@ module Fluent::Plugin
       if @create_exchange
         exchange_options = {
             durable: @exchange_durable,
-            auto_delete: @auto_delete
+            auto_delete: @auto_delete,
+            no_declare: @exchange_no_declare
         }
         @bunny_exchange = Bunny::Exchange.new(channel, @exchange_type, @exchange, exchange_options)
         if @exchange_to_bind
@@ -136,6 +141,7 @@ module Fluent::Plugin
         durable: @durable,
         exclusive: @exclusive,
         auto_delete: @auto_delete,
+        no_declare: @queue_no_declare,
         arguments: queue_arguments
       )
       if @exchange
@@ -149,12 +155,30 @@ module Fluent::Plugin
                    else
                      time
                    end
+            record ||= {}
             if @include_headers
               record[@headers_key] = properties.headers
             end
             if @include_delivery_info
               record[@delivery_info_key] = delivery_info
             end
+            if @include_properties
+              record[@properties_key] = {
+                "content_type"     => properties[:content_type],
+                "content_encoding" => properties[:content_encoding],
+                "delivery_mode"    => properties[:delivery_mode],
+                "priority"         => properties[:priority],
+                "correlation_id"   => properties[:correlation_id],
+                "reply_to"         => properties[:reply_to],
+                "expiration"       => properties[:expiration],
+                "message_id"       => properties[:message_id],
+                "timestamp"        => properties[:timestamp] ? properties[:timestamp].to_i : nil,
+                "type"             => properties[:type],
+                "user_id"          => properties[:user_id],
+                "app_id"           => properties[:app_id],
+                "cluster_id"       => properties[:cluster_id]
+              }
+            end
             router.emit(@tag, time, record)
           end
         rescue Fluent::Plugin::Parser::ParserError => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
-- NTT Communications
+- NTT DOCOMO BUSINESS
 bindir: bin
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,28 +85,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.4'
 description: fluent plugin for rabbitmq (AMQP)
 email:
 - masaki.matsushita@ntt.com
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.7.0
 specification_version: 4
 summary: fluent plugin for rabbitmq (AMQP)
 test_files: []