fluent-plugin-tagged_udp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea677c145728705289717a08674db7432f9abcd
-  data.tar.gz: 95cf849b3046a58d0ca038f391ada1654592a3d7
+  metadata.gz: b7d42d12afc1781ecc3f16ab20d4b13db8b59d79
+  data.tar.gz: 5836b906c9bc72da12df1c2acc9975090c6b21da
 SHA512:
-  metadata.gz: 39f5ef00240c71c440a03978fbd7577473c935c5476ea37ea0f8b3595a4ca34ceae9c8783779a3330af14b7a1b1d73599bd96c8473b533c6bdc4076c7131cc5e
-  data.tar.gz: 64946230b236198efc1c6acb77ba221442faedcdf23f6f092b2d194e827ea7aabe3bc807e54c6110d3936a9b939ff2fda96f0b2dbf4c0649bf1bc16da7ef6590
+  metadata.gz: 6d6d2cd5ab1d64b8097e3e4385e131c99138b74bb8b8c555c6cb5c4fb5b4b864ea63c6a5fed48cd00d43e082489eaeb62bd5ed8744e1d750bfc0a338f5d646a0
+  data.tar.gz: cf401b581f53b9b15314fc6c043ba43315d18f2019ed35d9d891cfb16e98d733e543c92ca5979260a23b8117ddeb98a96ba297d726f0c09fca44f3c21bd669f8

data/README.md

@@ -37,6 +37,9 @@ Input plugin can be used via source directive.
 Optional parameters are as follows:
 
 - tag_sep: separator of tag name. default is "\t"
+- recv_time: Add receive time to message in millisecond (ms) as integer for debug and performance/delay analysis
+- recv_time_key: An attribute of recv_time
+
 
 Output Plugin can be used via match directive.
 
@@ -50,6 +53,12 @@ Output Plugin can be used via match directive.
 
 ```
 
+Optional parameters are as follows:
+
+- tag_sep: separator of tag name. default is "\t"
+- send_time: Add send time to message in millisecond (ms) as integer for debug and performance/delay analysis
+- send_time_key: An attribute of recv_time
+
 ## Contributing
 
 1. Fork it ( http://github.com/toyokazu/fluent-plugin-tagged_udp/fork )

data/fluent-plugin-tagged_udp.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-tagged_udp"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/in_tagged_udp.rb

@@ -9,6 +9,8 @@ module Fluent
     config_param :port, :integer, :default => 1883
     config_param :tag_sep, :string, :default => "\t"
     config_param :format, :string, :default => 'json'
+    config_param :recv_time, :bool, :default => false
+    config_param :recv_time_key, :string, :default => "recv_time"
 
     require 'socket'
 
@@ -22,16 +24,11 @@ module Fluent
     # If the configuration is invalid, raise Fluent::ConfigError.
     def configure(conf)
       super
-
-      # You can also refer raw parameter via conf[name].
-      @bind ||= conf['bind']
-      @port ||= conf['port']
-      @tag_sep ||= conf['tag_sep']
       configure_parser(conf)
     end
 
     def configure_parser(conf)
-      @parser = Plugin.new_parser(conf['format'])
+      @parser = Plugin.new_parser(@format)
       @parser.configure(conf)
     end
 
@@ -45,20 +42,31 @@ module Fluent
       end
     end
 
+    def add_recv_time(record)
+      if @recv_time
+        # recv_time is recorded in ms
+        record.merge({@recv_time_key => Time.now.instance_eval { self.to_i * 1000 + (usec/1000) }})
+      else
+        record
+      end
+    end
+
     def start
       $log.debug "start udp server #{@bind}"
 
       @thread = Thread.new(Thread.current) do |parent|
-        begin
-          Socket.udp_server_loop(@bind, @port) do |msg, msg_src|
-            $log.debug("Received #{msg}")
-            tag, message = msg.split(@tag_sep)
-            time, record = parse(message)
-            $log.debug "#{tag}, #{time}, #{record}"
-            router.emit(tag, time, record)
+        while (true)
+          begin
+            Socket.udp_server_loop(@bind, @port) do |msg, msg_src|
+              $log.debug("Received #{msg}")
+              tag, message = msg.split(@tag_sep)
+              time, record = parse(message)
+              $log.debug "#{tag}, #{time}, #{add_recv_time(record)}"
+              router.emit(tag, time, add_recv_time(record))
+            end
+          rescue StandardError => e
+            $log.debug("In udp_server_loop, #{e.class}: #{e.message}")
           end
-        rescue StandardError => e
-          parent.raise(e)
         end
       end
     end

data/lib/fluent/plugin/out_tagged_udp.rb

@@ -10,6 +10,8 @@ module Fluent
     config_param :tag_sep, :string, :default => "\t"
     config_param :time_key, :string, :default => 'time'
     config_param :time_format, :string, :default => nil
+    config_param :send_time, :bool, :default => false
+    config_param :send_time_key, :string, :default => "send_time"
 
     require 'socket'
 
@@ -18,11 +20,6 @@ module Fluent
     # If the configuration is invalid, raise Fluent::ConfigError.
     def configure(conf)
       super
-
-      # You can also refer raw parameter via conf[name].
-      @host ||= conf['host']
-      @port ||= conf['port']
-      @tag_sep ||= conf['tag_sep']
       @socket = UDPSocket.new
     end
 
@@ -48,14 +45,23 @@ module Fluent
       end
     end
 
+    def add_send_time(record)
+      if @send_time
+        # send_time is recorded in ms
+        record.merge({@send_time_key => Time.now.instance_eval { self.to_i * 1000 + (usec/1000) }})
+      else
+        record
+      end
+    end
+
     def emit(tag, es, chain)
       begin
         es.each {|time,record|
-          $log.debug "#{tag}, #{format_time(time)}, #{record}"
+          $log.debug "#{tag}, #{format_time(time)}, #{add_send_time(record)}"
           @socket.send(
             # tag is inserted into the head of the message
-            "#{tag}#{@tag_sep}#{record.merge(timestamp_hash(time)).to_json}",
-            Socket::MSG_EOR, @host, @port
+            "#{tag}#{@tag_sep}#{add_send_time(record).merge(timestamp_hash(time)).to_json}",
+            0, @host, @port
           )
         }
         $log.flush

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tagged_udp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: []
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd