fluent-plugin-kafka 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a3a2247250b5f3c839378914e21ff82906986f
-  data.tar.gz: e1f643b5798a8b07f12f7874391e449c5cd16f05
+  metadata.gz: 268cd322294a6f01fd118de3ef04c22997602d7c
+  data.tar.gz: 570de398931cf778f147d08738eab20ad78b8a9c
 SHA512:
-  metadata.gz: 3dae82784298f2b431568805c5b4955cb64bb11e0e09f41bb95068c58f815fbd0b370dc5262a3254e196c28a08cf77f822c9b6ad91d2829901ef4983b4e80424
-  data.tar.gz: 589d4ad5267d694732a2e5cf93d669516ea21f25d1d6872c4410ecd652fdd6cb24319e19db0ebf3aaba5639e44743c3c6fd4579c9d3e2fd1f61e6bb463a59df3
+  metadata.gz: 8e81f53b95cb3ad41c9cb46779ba941021de37ae667f3d7d2be7d24b80e6f1603de95ba673e0bb86d9c4ec54a7b34243b5201cdfc35b7598b2eaa4807221b066
+  data.tar.gz: f804bd9ea046af9dcc4e66081af471100fdcff044add13c0fd26bc3fe1c5241a6b758102b8a55649ef01c0fd0875d2bc1e2f0d87feca6f90b4e5959222e654a3

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.5.6 - 2017/07/10
+
+	* output: Add ActiveSupport notification support
+
 Release 0.5.5 - 2017/04/19
 
 	* output: Some trace log level changed to debug

data/fluent-plugin-kafka.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-kafka"
   gem.require_paths = ["lib"]
-  gem.version       = '0.5.5'
+  gem.version       = '0.5.6'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/out_kafka.rb

@@ -60,6 +60,12 @@ DESC
   config_param :max_buffer_bytesize, :integer, :default => nil,
                :desc => "Maximum size in bytes to be buffered."
 
+  config_param :active_support_notification_regex, :string, :default => nil,
+               :desc => <<-DESC
+Add a regular expression to capture ActiveSupport notifications from the Kafka client
+requires activesupport gem - records will be generated under fluent_kafka_stats.**
+DESC
+
   include Fluent::KafkaPluginUtil::SSLSettings
 
   attr_accessor :output_data_type
@@ -130,6 +136,15 @@ DESC
     @producer_opts[:compression_codec] = @compression_codec.to_sym if @compression_codec
     @producer_opts[:max_buffer_size] = @max_buffer_size if @max_buffer_size
     @producer_opts[:max_buffer_bytesize] = @max_buffer_bytesize if @max_buffer_bytesize
+    if @active_support_notification_regex
+      require 'active_support/notifications'
+      require 'active_support/core_ext/hash/keys'
+      ActiveSupport::Notifications.subscribe(Regexp.new(@active_support_notification_regex)) do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        message = event.payload.respond_to?(:stringify_keys) ? event.payload.stringify_keys : event.payload
+        @router.emit("fluent_kafka_stats.#{event.name}", Time.now.to_i, message)
+      end
+    end
   end
 
   def start

data/lib/fluent/plugin/out_kafka2.rb

@@ -43,6 +43,12 @@ DESC
                  :desc => <<-DESC
 The codec the producer uses to compress messages.
 Supported codecs: (gzip|snappy)
+DESC
+
+    config_param :active_support_notification_regex, :string, :default => nil,
+                 :desc => <<-DESC
+Add a regular expression to capture ActiveSupport notifications from the Kafka client
+requires activesupport gem - records will be generated under fluent_kafka_stats.**
 DESC
 
     config_section :buffer do
@@ -96,6 +102,15 @@ DESC
       @producer_opts = {max_retries: @max_send_retries, required_acks: @required_acks}
       @producer_opts[:ack_timeout] = @ack_timeout if @ack_timeout
       @producer_opts[:compression_codec] = @compression_codec.to_sym if @compression_codec
+      if @active_support_notification_regex
+        require 'active_support/notifications'
+        require 'active_support/core_ext/hash/keys'
+        ActiveSupport::Notifications.subscribe(Regexp.new(@active_support_notification_regex)) do |*args|
+          event = ActiveSupport::Notifications::Event.new(*args)
+          message = event.payload.respond_to?(:stringify_keys) ? event.payload.stringify_keys : event.payload
+          @router.emit("fluent_kafka_stats.#{event.name}", Time.now.to_i, message)
+        end
+      end
     end
 
     def multi_workers_ready?

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -67,6 +67,12 @@ DESC
 
   config_param :time_format, :string, :default => nil
 
+  config_param :active_support_notification_regex, :string, :default => nil,
+               :desc => <<-DESC
+Add a regular expression to capture ActiveSupport notifications from the Kafka client
+requires activesupport gem - records will be generated under fluent_kafka_stats.**
+DESC
+
   include Fluent::KafkaPluginUtil::SSLSettings
 
   attr_accessor :output_data_type
@@ -148,6 +154,16 @@ DESC
       log.warn "'discard_kafka_delivery_failed' option discards events which cause delivery failure, e.g. invalid topic or something."
       log.warn "If this is unexpected, you need to check your configuration or data."
     end
+
+    if @active_support_notification_regex
+      require 'active_support/notifications'
+      require 'active_support/core_ext/hash/keys'
+      ActiveSupport::Notifications.subscribe(Regexp.new(@active_support_notification_regex)) do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        message = event.payload.respond_to?(:stringify_keys) ? event.payload.stringify_keys : event.payload
+        @router.emit("fluent_kafka_stats.#{event.name}", Time.now.to_i, message)
+      end
+    end
   end
 
   def start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd