fluent-plugin-rabbitmq 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb39b34d1e433753ccc9147fb471c96eca6a99c683529711be46556224fe8efd
-  data.tar.gz: 0e5339fbc5edf3e1e37d22a7e8cd6b49fcf8a7a28e374e8cfbf7ad9ed4acac13
+  metadata.gz: 0fa22768ed1823cd072d1e226c9f6ea44cd3b0b2396e90066edcc76ae552124f
+  data.tar.gz: bf85c005c06eef232a104e561ef5cd6e90c35618099f957c4c401adbf226d899
 SHA512:
-  metadata.gz: c1c6d8e9987b7d52e72137c2e63af0c63290c0bad884a4aa277ea744bbac54c7b761f25da41349e423f945e08f918be20277f6436303f3c66c91f1bea2207782
-  data.tar.gz: f935b733e4fe986cf17d190d1eccc002c08507254c2a4cb82f0a50c321411474368e31dfe86947bc83c30d94084926b3e8263aa78a990db5f26553d6fbd64ac7
+  metadata.gz: 9cae2d54e168c4f6158f8d0c32e114a1b136d5e596ed8ec64afc2cef1767c8ea6a7e6958a57b15a0f84b5a464ad7378fb7c1cc2fdbf191a45942ab59d110f37c
+  data.tar.gz: b2668f14ef34eaffaefed06b3a80394a7f2a404a3d0c94c002dd91a5c42e1fd2ef5597002e2e06504b5a0cf4633042a777bf4395195d73c6b18cac30502e90e5

data/README.md

@@ -1,7 +1,5 @@
 # fluent-plugin-rabbitmq
 
-[![Build Status](https://travis-ci.org/nttcom/fluent-plugin-rabbitmq.svg?branch=master)](https://travis-ci.org/nttcom/fluent-plugin-rabbitmq)
-
 ## Overview
 
 This repository includes input/output plugins for RabbitMQ.
@@ -14,6 +12,11 @@ fluentd >= 0.14.0
 
     $ fluent-gem install fluent-plugin-rabbitmq
 
+## Testing
+
+    $ rabbitmq-server
+    $ rake test
+
 ## Configuration
 
 ### Input
@@ -34,8 +37,6 @@ fluentd >= 0.14.0
   <parse>
     @type json # or msgpack, ltsv, none
   </parse>
-  <buffer> # to use in buffered mode
-  </buffer>
 </source>
 ```
 
@@ -56,6 +57,10 @@ 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|
+|queue_type|"quorum"|nil|queue type|
+
 
 ### Output
 
@@ -76,6 +81,8 @@ fluentd >= 0.14.0
   <format>
     @type json # or msgpack, ltsv, none
   </format>
+  <buffer> # to use in buffered mode
+  </buffer>
 </match>
 ```
 

data/fluent-plugin-rabbitmq.gemspec

@@ -1,9 +1,9 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.0.9"
+  spec.version       = "0.1.1"
   spec.authors       = ["NTT Communications"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 
@@ -15,13 +15,15 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.5"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "ltsv"
   spec.add_development_dependency "msgpack"
 
-  spec.add_runtime_dependency "fluentd", ">= 0.14.0"
+  spec.add_runtime_dependency "fluentd", ">= 1.0.0"
 
   spec.add_dependency "bunny", "~> 2.14.4"
 end

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -71,6 +71,9 @@ module Fluent::Plugin
     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
+    config_param :queue_type, :string, default: nil
 
     def initialize
       super
@@ -102,6 +105,7 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
+      bunny_options[:logger] = log
 
       @parser = parser_create
 
@@ -124,7 +128,10 @@ 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_arguments["x-queue-type"] = @queue_type if @queue_type
       queue = channel.queue(
         @queue,
         durable: @durable,
@@ -135,7 +142,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])
@@ -150,6 +157,7 @@ module Fluent::Plugin
           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

@@ -41,7 +41,6 @@ module Fluent::Plugin
     config_param :heartbeat, default: nil do |param|
       param == "server" ? :server : Integer(param)
     end
-    config_param :threaded, :bool, default: true
     config_param :frame_max, :integer, default: nil
 
     config_param :tls, :bool, default: false
@@ -61,7 +60,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
 
@@ -96,6 +95,7 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
+      bunny_options[:logger] = log
 
       @bunny = Bunny.new(bunny_options)
 
@@ -105,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.9
+  version: 0.1.1
 platform: ruby
 authors:
 - NTT Communications
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -137,15 +137,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: fluent plugin for rabbitmq (AMQP)
 test_files: []