fluent-plugin-input-gelf 0.1.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7100acddd4910c56b36af50f13695d2773b4ff6b
-  data.tar.gz: e1d860e9bc6541e7b0a35afad2b7149eee717b7b
+SHA256:
+  metadata.gz: 02bd5fa91b5ed4ae973eb263a442407248fd8826e3dfd1ed1769f63084a6e1da
+  data.tar.gz: 5a09d5e7f2554da332b0dc9473783f03ece3cfbe2c06b146dab124d4f8c741ed
 SHA512:
-  metadata.gz: 9ae80360cd1ad43d94601711aae40b753cd78f2257d274554532af22d634ac1a5e92ac82a23757bd597307f5444ad9d559ded507a9af692ab66839df681a7c8b
-  data.tar.gz: cb307f962df7291b71e24a8f351bdb3266a3bd40ec7d392e94a5cd52add9fdb2e90259499de2d58e8c62bd3cc505e537ae715add132f27d4cad3eb6277da2d76
+  metadata.gz: 10e6f1291630ff6132756346ec107a3aef63e4da756b2da6e6b0c4558a477d015aed0ddd908eb34a30eec3013956102892dd231b60d95d48317969b1186dc506
+  data.tar.gz: 7fe77c5b71561cbb0d5cbe70dffb1b81ffee52d832e04c0da9759d6eee518de386594eeece56c7702cf6258d7ed4f770aa0eaff2a8707e00406962e70b317757

data/.travis.yml

@@ -1,17 +1,33 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2.2
-  - 2.3.0
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- 2.5
 
 gemfile:
-  - Gemfile
+- Gemfile
 
 branches:
   only:
-    - master
+  - master
+  # Tagged commits
+  - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 
 script: bundle exec rake test
+
+jobs:
+  include:
+  - stage: gem release
+    rvm: 2.3
+    script: echo "Deploying to rubygems.org ..."
+    deploy:
+      provider: rubygems
+      api_key:
+        secure: R06ICCYHjZ+bk+CocD+eZROiTsfDnmUlugdSIqND0f9Z+Vi8ALOZmIEhlpBvloRaOLU0pz3d9juj74vHMJ1boJN6Qgn+CtAGSDzesxm6vcd/AP87mEzAaJvvHRme7bNLy7gt1RvrmVzDjyOe2fF8kcVAz19bEArJ1rqBXeLiLY+fOPenCsWRNrOt2+yOH5qRgdFs+n2NQ6oQrDEq18uZJVQ74WnSyKGylIhPfXj+TcgMrDGJtxqWYmL+DeuzOVk73REMHiw+9ljvhjVIdMxiU/oXge9y7Ua7q6OlkJgmChaWrs06bHiwhJHz6yh+OXebVFbxHTsPdsw4w+Uv9/MB961zgR58yLVi6AJr5xosM8l92S/OJeG9paO43xuQGeX+mch7m/827VbeM8aLtRGXjNILC3BW+l9O++Yg0eF6YC4c6NobNOX4ZpfGNopDsoyYI19Yj9SoKvoqw3WtAZsX2T5CrAdG1PHLKNDwyCbuiYjlNKAAHy5ZCB7X63JrDAKgwUQSnYEPEGNVzisnNfyqVxQnvTDZLwgzWcYxTBCjXoO09+qsbB9lpgecT45UI80VgW70nokEzilmyXARG+eBGKhz2iJli+mrdZbpfzws/PD/Hr5dubgn8mNX5/e6DRMoTr9xQOGrvdXhET+ygiTEWg1VMzfcZ2WpeJTveV9h2BQ=
+      gem: fluent-plugin-input-gelf
+      on:
+        tags: true
+        repo: MerlinDMC/fluent-plugin-input-gelf

data/fluent-plugin-input-gelf.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/MerlinDMC/fluent-plugin-input-gelf"
   gem.summary     = gem.description
-  gem.version     = "0.1.1"
+  gem.version     = "0.3.2"
   gem.authors     = ["Daniel Malon"]
   gem.email       = "daniel.malon@me.com"
   gem.has_rdoc    = false
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency "fluentd"
-  gem.add_runtime_dependency "gelfd", ">= 0.2.0"
+  gem.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
+  gem.add_runtime_dependency "gelfd2", ">= 0.3.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

data/lib/fluent/plugin/in_gelf.rb

@@ -4,73 +4,57 @@ require 'time'
 require 'cool.io'
 require 'yajl'
 
-require 'fluent/input'
+require 'gelfd2'
 
-module Fluent
-  class GelfInput < Fluent::Input
+require 'fluent/plugin/input'
+
+module Fluent::Plugin
+  class GelfInput < Fluent::Plugin::Input
     Fluent::Plugin.register_input('gelf', self)
 
+    helpers :server, :parser, :compat_parameters
+
+    DEFAULT_PARSER = 'json'.freeze
+
     def initialize
       super
-      require 'fluent/plugin/socket_util'
-      require 'gelfd'
     end
 
     desc "The value is the tag assigned to the generated events."
     config_param :tag, :string
-    desc 'The format of the payload.'
-    config_param :format, :string, default: 'json'
     desc 'The port to listen to.'
     config_param :port, :integer, default: 12201
     desc 'The bind address to listen to.'
     config_param :bind, :string, default: '0.0.0.0'
     desc 'The transport protocol used to receive logs.(udp, tcp)'
-    config_param :protocol_type, default: :udp do |val|
-      case val.downcase
-      when 'tcp'
-        :tcp
-      when 'udp'
-        :udp
-      else
-        raise ConfigError, "gelf input protocol type should be 'tcp' or 'udp'"
-      end
-    end
-    config_param :blocking_timeout, :time, default: 0.5
+    config_param :protocol_type, :enum, list: [:udp, :tcp], default: :udp
     desc 'Strip leading underscore'
     config_param :strip_leading_underscore, :bool, default: true
 
+    config_section :parse do
+      config_set_default :@type, DEFAULT_PARSER
+    end
+
     def configure(conf)
+      compat_parameters_convert(conf, :parser)
       super
 
-      @parser = Plugin.new_parser(@format)
-      @parser.configure(conf)
+      @parser = parser_create
     end
 
     def start
-      @loop = Coolio::Loop.new
-      @handler = listen(method(:receive_data))
-      @loop.attach(@handler)
+      super
 
-      @thread = Thread.new(&method(:run))
+      listen
     end
 
     def shutdown
-      @loop.watchers.each { |w| w.detach }
-      @loop.stop
-      @handler.close
-      @thread.join
-    end
-
-    def run
-      @loop.run(@blocking_timeout)
-    rescue
-      log.error 'unexpected error', error: $!.to_s
-      log.error_backtrace
+      super
     end
 
     def receive_data(data, addr)
       begin
-        msg = Gelfd::Parser.parse(data)
+        msg = Gelfd2::Parser.parse(data)
       rescue => e
         log.warn 'Gelfd failed to parse a message', error: e.to_s
         log.warn_backtrace
@@ -86,10 +70,10 @@ module Fluent
         end
 
         # Use the recorded event time if available
-        time = record.delete('timestamp').to_i if record.key?('timestamp')
+        time = record.delete('timestamp').to_f if record.key?('timestamp')
 
         # Postprocess recorded event
-        strip_leading_underscore(record) if @strip_leading_underscore
+        strip_leading_underscore_(record) if @strip_leading_underscore
 
         emit(time, record)
       }
@@ -98,14 +82,19 @@ module Fluent
       log.error_backtrace
     end
 
-    def listen(callback)
+    def listen
       log.info "listening gelf socket on #{@bind}:#{@port} with #{@protocol_type}"
       if @protocol_type == :tcp
-        Coolio::TCPServer.new(@bind, @port, SocketUtil::TcpHandler, log, "\n", callback)
+        server_create(:in_tcp_server, @port, bind: @bind) do |data, conn|
+          receive_data(data, conn)
+        end
       else
-        @usock = SocketUtil.create_udp_socket(@bind)
-        @usock.bind(@bind, @port)
-        SocketUtil::UdpHandler.new(@usock, log, 8192, callback)
+        # Graylog is ready to accept 8192 bytes of GELF, but with
+        # chunking we need to accept at least 12 bytes of chunk header
+        # as well. But we don't need to pin us down to that either.
+        server_create(:in_udp_server, @port, proto: :udp, bind: @bind, max_bytes: 65536) do |data, sock|
+          receive_data(data, sock)
+        end
       end
     end
 
@@ -117,7 +106,7 @@ module Fluent
 
     private
 
-    def strip_leading_underscore(record)
+    def strip_leading_underscore_(record)
       record.keys.each { |k|
         next unless k[0,1] == '_'
         record[k[1..-1]] = record.delete(k)

data/test/plugin/test_in_gelf.rb

@@ -20,7 +20,7 @@ class GelfInputTest < Test::Unit::TestCase
   !
 
   def create_driver(conf)
-    Fluent::Test::InputTestDriver.new(Fluent::GelfInput).configure(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::GelfInput).configure(conf)
   end
 
   def test_configure
@@ -31,7 +31,7 @@ class GelfInputTest < Test::Unit::TestCase
       d = create_driver(v)
       assert_equal PORT, d.instance.port
       assert_equal k, d.instance.bind
-      assert_equal 'json', d.instance.format
+      assert_equal 'json', d.instance.parser_configs.first["@type"]
     }
   end
 
@@ -48,22 +48,19 @@ class GelfInputTest < Test::Unit::TestCase
         {:short_message => 'short message', :full_message => 'full message', :timestamp => 12345678.12345}
       ]
 
-      d.run do
+      d.run(expect_emits: 2)  do
         n = GELF::Notifier.new(k, PORT)
 
         tests.each { |test|
           n.notify!(test)
         }
-
-        sleep 1
       end
 
-      emits = d.emits
+      emits = d.events
       assert_equal tests.length, emits.length, 'missing emitted events'
       emits.each_index { |i|
-        puts emits[i].to_s
         assert_equal 'gelf', emits[i][0]
-        assert_equal tests[i][:timestamp].to_i, emits[i][1] unless tests[i][:timestamp].nil?
+        assert_equal tests[i][:timestamp].to_f, emits[i][1] unless tests[i][:timestamp].nil?
         assert_equal tests[i][:short_message], emits[i][2]['short_message']
         assert_equal tests[i][:full_message], emits[i][2]['full_message']
       }
@@ -95,22 +92,19 @@ class GelfInputTest < Test::Unit::TestCase
         }
       ]
 
-      d.run do
+      d.run(expect_emits: 1) do
         n = GELF::Notifier.new(k, PORT)
 
         tests.each { |test|
           n.notify!(test[:given])
         }
-
-        sleep 1
       end
 
-      emits = d.emits
+      emits = d.events
       assert_equal tests.length, emits.length, 'missing emitted events'
       emits.each_index { |i|
-        puts emits[i].to_s
         assert_equal 'gelf', emits[i][0]
-        assert_equal tests[i][:timestamp].to_i, emits[i][1] unless tests[i][:timestamp].nil?
+        assert_equal tests[i][:timestamp].to_f, emits[i][1] unless tests[i][:timestamp].nil?
         assert_block "expectation not met: #{tests[i][:expected]}" do
           emits[i][2].merge(tests[i][:expected]) == emits[i][2]
         end

data/test/test_helper.rb

@@ -13,16 +13,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
+require 'fluent/test/driver/input'
 require 'fluent/plugin/in_gelf'
 
 def unused_port

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-input-gelf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Daniel Malon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: gelfd
+  name: gelfd2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A GELF input plugin for fluentd