fluent-plugin-rabbitmq 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba10e05d65915a58bac7723586f08bab88d3eb265a44cdc2a4fbf60d3153dead
-  data.tar.gz: 7c74417e879e6332f70c943b9c732e7628526687ec8e5613b45767835e36bcd5
+  metadata.gz: 0f8aa321e95ea389c5a2da190c4c899ab4377c3ea8215f07f89696d43c9b13f5
+  data.tar.gz: fa13e44c14381053880790dcd86548bfb00084c3fd2459c89f7abc88be649919
 SHA512:
-  metadata.gz: 11358bb5ae097666f025d6eafd3a975fa3295772ab97701c5084bb79d889db624e873d36088ff629015ffe99415ea0d3e2f5971216ce5ed4e10424284783cfd7
-  data.tar.gz: f07b05667ca3593c0d7c858b356d4ed39ab7b7451100493bf8c9cc52e79e728d974b1afa664693db7278a79d0ed3bf6dac7a8baee286c172c60a3251b2e29a92
+  metadata.gz: e00b8f18807b574404f2157648a144f1ed8e23e8b6ef15efb4e677aab1f1d28b85ceb78a095408caaff0b33becd57a888af1f8b758f6ba22fb0517e3d7433b9b
+  data.tar.gz: cc218b853f71edcb0c543a3927e695917610a488888e0dcb396a7d1e83cc79b179237b9bc064afccab9984fa517a6d374ad163d35fd5cc1d737315dc2a01df96

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 .gem
+*.gem
 .idea

data/README.md

@@ -34,8 +34,6 @@ fluentd >= 0.14.0
   <parse>
     @type json # or msgpack, ltsv, none
   </parse>
-  <buffer> # to use in buffered mode
-  </buffer>
 </source>
 ```
 
@@ -56,6 +54,8 @@ fluentd >= 0.14.0
 |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|
+|manual_ack|true|false|manual ACK|
+|queue_mode|"lazy"|nil|queue mode|
 
 ### Output
 
@@ -76,6 +76,8 @@ fluentd >= 0.14.0
   <format>
     @type json # or msgpack, ltsv, none
   </format>
+  <buffer> # to use in buffered mode
+  </buffer>
 </match>
 ```
 

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |test|
-  test.libs << "lib" << "test"
+  test.libs << "test"
   test.pattern = "test/**/test_*.rb"
   test.verbose = false
   test.warning = false

data/fluent-plugin-rabbitmq.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.0.7"
+  spec.version       = "0.1.0"
   spec.authors       = ["NTT Communications"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd", ">= 0.14.0"
 
-  spec.add_dependency "bunny", "~> 2.14.2"
+  spec.add_dependency "bunny", "~> 2.14.4"
 end

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -68,7 +68,11 @@ module Fluent::Plugin
     config_param :ttl, :integer, default: nil
 
     config_param :include_headers, :bool, default: false
+    config_param :include_delivery_info, :bool, default: false
     config_param :headers_key, :string, default: "headers"
+    config_param :delivery_info_key, :string, default: "delivery_info"
+    config_param :manual_ack, :bool, default: false
+    config_param :queue_mode, :string, default: nil
 
     def initialize
       super
@@ -94,7 +98,6 @@ module Fluent::Plugin
       bunny_options[:recovery_attempts] = @recovery_attempts
       bunny_options[:auth_mechanism] = @auth_mechanism if @auth_mechanism
       bunny_options[:heartbeat] = @heartbeat if @heartbeat
-      bunny_options[:logger] = log
 
       bunny_options[:tls] = @tls
       bunny_options[:tls_cert] = @tls_cert if @tls_cert
@@ -123,7 +126,9 @@ module Fluent::Plugin
           @bunny_exchange.bind(@exchange_to_bind, routing_key: @exchange_routing_key)
         end
       end
-      queue_arguments = {"x-message-ttl" => @ttl} if @ttl
+      queue_arguments = {}
+      queue_arguments["x-message-ttl"] = @ttl if @ttl
+      queue_arguments["x-queue-mode"] = @queue_mode if @queue_mode
       queue = channel.queue(
         @queue,
         durable: @durable,
@@ -134,7 +139,7 @@ module Fluent::Plugin
       if @exchange
         queue.bind(@exchange, routing_key: @routing_key)
       end
-      queue.subscribe do |delivery_info, properties, payload|
+      queue.subscribe(manual_ack: @manual_ack) do |delivery_info, properties, payload|
         @parser.parse(payload) do |time, record|
           time = if properties[:timestamp]
                     Fluent::EventTime.from_time(properties[:timestamp])
@@ -144,8 +149,12 @@ module Fluent::Plugin
           if @include_headers
             record[@headers_key] = properties.headers
           end
+          if @include_delivery_info
+            record[@delivery_info_key] = delivery_info
+          end
           router.emit(@tag, time, record)
         end
+        channel.ack(delivery_info.delivery_tag) if @manual_ack
       end
     end
     

data/lib/fluent/plugin/out_rabbitmq.rb

@@ -61,7 +61,7 @@ module Fluent::Plugin
     config_param :content_type, :string, default: nil
     config_param :content_encoding, :string, default: nil
     config_param :expiration, :integer, default: nil
-    config_param :message_type, :integer, default: nil
+    config_param :message_type, :string, default: nil
     config_param :priority, :integer, default: nil
     config_param :app_id, :string, default: nil
 
@@ -89,7 +89,6 @@ module Fluent::Plugin
       bunny_options[:recovery_attempts] = @recovery_attempts
       bunny_options[:auth_mechanism] = @auth_mechanism if @auth_mechanism
       bunny_options[:heartbeat] = @heartbeat if @heartbeat
-      bunny_options[:logger] = log
       bunny_options[:frame_max] = @frame_max if @frame_max
 
       bunny_options[:tls] = @tls
@@ -106,7 +105,7 @@ module Fluent::Plugin
       @publish_options[:persistent] = @persistent if @persistent
       @publish_options[:mandatory] = @mandatory if @mandatory
       @publish_options[:expiration] = @expiration if @expiration
-      @publish_options[:message_type] = @message_type if @message_type
+      @publish_options[:type] = @message_type if @message_type
       @publish_options[:priority] = @priority if @priority
       @publish_options[:app_id] = @app_id if @app_id
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - NTT Communications
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 2.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 2.14.4
 description: fluent plugin for rabbitmq (AMQP)
 email:
 - masaki.matsushita@ntt.com
@@ -129,7 +129,7 @@ homepage: https://github.com/nttcom/fluent-plugin-rabbitmq
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.21
+signing_key:
 specification_version: 4
 summary: fluent plugin for rabbitmq (AMQP)
 test_files: []