fluent-plugin-gelf-test 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39535ed482a01c4831fb9d0ed5f9a0e248cc5537cf3d258add5e3d75a8bc7f0
-  data.tar.gz: 0dcfbb1246ddc964106d8f40da08e72fb68b168eb9e8b46d1e904853fd4433a0
+  metadata.gz: c1408d928adbef9988d61d6b26f28cca70faa0f4b741c96f5fa088809c2aae5e
+  data.tar.gz: 49e761a209740b73c76089dd795ec34a8734359e4641348586a2b4b78c8db7a5
 SHA512:
-  metadata.gz: 6aab2208596356f9ccd62f78d8142935f88e71995a02af3d94b54a807ebad4f606d7b4437ba8dc2a64f93a6ad4527440b0e9befb259a06ce6a5198841a8c0b85
-  data.tar.gz: a9d540ef9f9432e2bf8f23579a465b75f29e903cfac80c9f93db8abc60a4493725a4836db91e95aabe0754a0785e863d9ffd7b6b4831591d80e70bcf62acfbe7
+  metadata.gz: 061a64fd057e3d704f3cf8555adbf96ca58270b41893852eb23bc5e138ca9f91acb575dc426d98f3dd047548b1b7fdf283808c6e51114243c7fb2fb50328aac7
+  data.tar.gz: 1f8ed1a5a8200ae44b95c515e4e4ba2b9c4a0f111e41c1454ee864002728fa328befbf5b64def806acef781674ec2413cbae6b88942b526e945903d5a789f8c8

data/lib/fluent/plugin/formatter_gelf.rb

@@ -1,4 +1,3 @@
-# typed: false
 require "fluent/plugin/formatter"
 require "fluent/plugin/gelf_plugin_util"
 require 'oj'
@@ -24,13 +23,15 @@ module Fluent
       end
 
       def format(tag, time, record)
+
         begin
+
           gelfentry = make_gelfentry(
-            tag, time, record,
+            tag,time,record,
             {
-              use_record_host: @use_record_host,
-              add_msec_time: @add_msec_time,
-              max_bytes: @max_bytes
+              :use_record_host => @use_record_host,
+              :add_msec_time => @add_msec_time,
+              :max_bytes => @max_bytes
             }
           )
 

data/lib/fluent/plugin/gelf_plugin_util.rb

@@ -1,4 +1,3 @@
-# typed: false
 module Fluent
   module GelfPluginUtil
     require "gelf"
@@ -16,7 +15,7 @@ module Fluent
     }.freeze
 
     def make_gelfentry(tag, time, record, conf = {})
-      gelfentry = {'_fluentd_tag' => tag, 'timestamp' => calculate_timestamp(time)}
+      gelfentry = {'_fluentd_tag' => tag, 'timestamp' => time}
 
       record.each_pair do |k, v|
         gelfentry.merge!(process_record_entry(k, v, conf, gelfentry))
@@ -28,14 +27,6 @@ module Fluent
 
     private
 
-    def calculate_timestamp(time)
-      if defined?(Fluent::EventTime) && time.is_a?(Fluent::EventTime)
-        time.sec + (time.nsec.to_f / 1_000_000_000).round(3)
-      else
-        time
-      end
-    end
-
     def process_record_entry(k, v, conf, gelfentry)
       # Truncate values longer than max_bytes
       v = (v.respond_to?(:bytesize) && v.bytesize > conf[:max_bytes]) ? "#{v.byteslice(0, conf[:max_bytes] - 3)}..." : v

data/lib/fluent/plugin/out_gelf.rb

@@ -1,4 +1,3 @@
-# typed: true
 require "fluent/plugin/output"
 require "fluent/plugin/gelf_plugin_util"
 
@@ -15,7 +14,7 @@ module Fluent
       config_param :host, :string, :default => nil
       config_param :port, :integer, :default => 12201
       config_param :protocol, :string, :default => 'udp'
-      config_param :max_chunk_size_type, :string, :default => 'LAN'
+      config_param :udp_transport_type, :string, :default => 'LAN'
       config_param :tls, :bool, :default => false
       config_param :tls_options, :hash, :default => {}
 
@@ -47,11 +46,20 @@ module Fluent
         # a destination hostname or IP address must be provided
         raise Fluent::ConfigError.new("'host' parameter (hostname or address of Graylog2 server) is required") unless conf.has_key?('host')
 
+        # validate udp_transport_type if protocol is udp
+        if @protocol == 'udp'
+          unless %w[WAN LAN].include?(@udp_transport_type)
+            raise Fluent::ConfigError.new("'udp_transport_type' parameter should be either 'WAN' or 'LAN'")
+          end
+        end
+
         # choose protocol to pass to gelf-rb Notifier constructor
-        # (@protocol is used instead of conf['protocol'] to leverage config_param default)
-        if @protocol == 'udp' then @proto = GELF::Protocol::UDP
-        elsif @protocol == 'tcp' then @proto = GELF::Protocol::TCP
-        else raise Fluent::ConfigError.new("'protocol' parameter should be either 'udp' (default) or 'tcp'")
+        if @protocol == 'udp'
+          @proto = GELF::Protocol::UDP
+        elsif @protocol == 'tcp'
+          @proto = GELF::Protocol::TCP
+        else
+          raise Fluent::ConfigError.new("'protocol' parameter should be either 'udp' (default) or 'tcp'")
         end
       end
 
@@ -66,7 +74,7 @@ module Fluent
           options[:tls] = @tls_options
         end
 
-        @conn = GELF::Notifier.new(@host, @port, @max_chunk_size_type, options)
+        @conn = GELF::Notifier.new(@host, @port, @udp_transport_type, options)
 
         # Errors are not coming from Ruby so we use direct mapping
         @conn.level_mapping = 'direct'
@@ -79,10 +87,15 @@ module Fluent
       end
 
       def format(tag, time, record)
+        if defined? Fluent::EventTime and time.is_a? Fluent::EventTime then
+          timestamp = time.to_i + (time.nsec.to_f/1000000000).round(3)
+        else
+          timestamp = time.to_i
+        end
 
         begin
           make_gelfentry(
-            tag,time,record,
+            tag,timestamp,record,
             {
               :use_record_host => @use_record_host,
               :add_msec_time => @add_msec_time,

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf-test
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Alex Yamauchi
 - Eric Searcy
 - Bartosz Michaliewicz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,38 +30,24 @@ dependencies:
   name: gelf_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.16.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.16.9
-- !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -69,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +82,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - bartosz.michalkiewicz@outlook.com
 executables: []
@@ -112,7 +98,7 @@ homepage: https://github.com/bmichalkiewicz/fluent-plugin-gelf-best
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Sends Fluentd events Graylog2 by GELF
 test_files: []