fluent-plugin-gelf-test 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 511579748f55d71a47298c8a14dd28819c0282e6b0985fe11c3804e2c2434f44
-  data.tar.gz: 4de6adc83deefd6fa870557b5391d9a614426a58d6cd6b374dec97c7a1cd0043
+  metadata.gz: 4a3a61aabe9d35fce2c7f0c9b3314f75e524fce2d3c953c7625a6b821858c470
+  data.tar.gz: b675cb1e5fbba9752476cb159b5360de8083bd12c46e430a22b611371ee25aeb
 SHA512:
-  metadata.gz: e3a73909ebef2e21186617333517a32cac0807989a7820a15f80b66662b8a32e3f60c2dd8543fce8115091500694e5d811a2526ed3043dd68be9a77d1a160eea
-  data.tar.gz: 56cfebea89bdb7255e3f2bd8118b13470aee4134fb163a34d3916425c579c49e223f11b535e8ecf2879641db76a074d2931a5adc09f0be9430b5a14188d4f597
+  metadata.gz: d8ce0e64cda5d098eaa671521c7c8ea84f59215176d1f963a5ef9da9abbde7b32585de7f7f88f95fccba0b0f9a5ee697c455bcc9f2a6aecaaed943106d681e07
+  data.tar.gz: 2fb5eb142b6d7289387a5ed5173d44a302ec105946918847c5f4142f80edc8f03508ae9ae24b1d9035adc79a98ecbaff4e0864702be53de4f28f6cf32a322c33

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 => 'WAN'
       config_param :tls, :bool, :default => false
       config_param :tls_options, :hash, :default => {}
 
@@ -66,7 +65,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 +78,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf-test
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Alex Yamauchi
 - Eric Searcy
 - Bartosz Michaliewicz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2025-03-19 00:00:00.000000000 Z
@@ -16,52 +16,38 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   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: []