fluent-plugin-time-cutoff 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860bdde6a6a5565e1a616eb997797e1e99327e08844fd81c8477e4c0d8dc5eb8
-  data.tar.gz: 2ba3321e65c12978715fcbde4f72e08a4fbfe703ccbb69f629a0b0edc3563bcf
+  metadata.gz: 77b479a1cb54f5eb1a189032c5c0acfde4a99f0f813afb800ec84d39a4e09e2e
+  data.tar.gz: 3d27e8cee579842f6705467ddbd8577f47aa72db134f592a82676c01ef758166
 SHA512:
-  metadata.gz: e613c8a76899d5d72e5cb7b1ab477a76019d729324834e2341cc401bd035ef5c1865f3531dc7a10ef1d7fa04d99fc212c1c7015e41c75552971388263ba17367
-  data.tar.gz: e76aa2dd315073688e674335a6e6386df284f6bde032571287d9ff7ddf455147817b7d9bd303295c63555f324b8db26648ba2d703d417e343ef3bbbab3377186
+  metadata.gz: 12ea75e58112114c23637be4f19083324040a64bd1528f9628da85077316c52b285aaafd54162a50421da9eff4df4e02d08754399a20cde5f87f374ec357a258
+  data.tar.gz: c4731fb66d9b66fc6778a5a614e5534d2f600f61c15ab26adaa75687fdcede90ebccf9714a97b1be69d27761ecf412d2f66917834e9e46ecbb211d365a09d381

data/fluent-plugin-time-cutoff.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-time-cutoff'
-  spec.version = '0.1.2'
+  spec.version = '0.2.0'
   spec.authors = ['Qrator Labs', 'Serge Tkatchouk']
   spec.email   = ['devops@qrator.net', 'st@qrator.net']
 

data/lib/fluent/plugin/filter_time_cutoff.rb

@@ -82,7 +82,10 @@ module Fluent
         when :epoch_float
           time.to_f
         when :iso8601
-          time.to_time.strftime(TIME_ISO8601)
+          # NOTE: Time.at(int) is used instead of EventTime#to_time, which was
+          # only added to Fluentd in v1.8.0. This keeps us compatible with the
+          # older Fluentd releases declared in the gemspec.
+          Time.at(time.to_i).strftime(TIME_ISO8601)
         end
       end
 
@@ -115,6 +118,38 @@ module Fluent
         log.warn log_line
       end
 
+      # Normalize time to Fluent::EventTime if it's plain int or float.
+      # @param time [Integer|Float] incoming event time
+      # @return [Fluent::EventTime] event time normalized to Fluentd's internal format
+      def normalize_time(time)
+        case time
+        when Integer
+          Fluent::EventTime.new(time)
+        when Float
+          time_int, time_frac = time.divmod(1)
+          Fluent::EventTime.new(time_int, (time_frac * 10**9).to_i)
+        else
+          log.warn "Unknown time format given (#{time.class}): \"#{time.inspect}\"."
+          numeric = coerce_to_number(time)
+          numeric ? normalize_time(numeric) : Fluent::EventTime.now
+        end
+      end
+
+      # Try to coerce an arbitrary value into a number, or return nil.
+      # Uses begin/rescue rather than the Integer()/Float() "exception:"
+      # keyword (Ruby 2.6+) so the plugin keeps working on older Rubies.
+      # @param value the value to coerce
+      # @return [Integer,Float,nil] the parsed number, or nil if not numeric
+      def coerce_to_number(value)
+        Integer(value)
+      rescue ArgumentError, TypeError
+        begin
+          Float(value)
+        rescue ArgumentError, TypeError
+          nil
+        end
+      end
+
       # Process the record according to its determined "age"
       # @param tag [String] log/stream's tag name
       # @param time [Fluent::EventTime] the original event time
@@ -123,6 +158,9 @@ module Fluent
       # @param action [Symbol] determined action for this record
       # @param age [Symbol] detemined age for this record (:old or :new)
       def process_record(tag, time, record, do_log, action, age) # rubocop:disable Metrics/ParameterLists
+        ## Safeguard against rogue integer time.
+        time = normalize_time(time) unless time.is_a?(Fluent::EventTime)
+
         log_record(tag, time, record, action, age) if do_log
 
         case action

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-time-cutoff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Qrator Labs
 - Serge Tkatchouk
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -92,7 +91,6 @@ homepage: https://github.com/QratorLabs/fluent-plugin-time-cutoff
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 4.0.9
 specification_version: 4
 summary: Fluentd time-based filter plugin.
 test_files: []