fluent-plugin-fluent-plugin-json-size-limit 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 591d68308d420614aa3ea9c6c4379a77f489afa72b42adaa22356686f403ee9e
-  data.tar.gz: 600efc817220c04458478cd2d1b44025f17a01eb77f2fadf43a650f382437938
+  metadata.gz: 73d82be0721ff66686b415ed8264f699b7ec5943c343442246591d7ffff2a691
+  data.tar.gz: 0c7373794b14bb31a8378a5095959f29baba102a28c7060d5b5dbc59e62a48ee
 SHA512:
-  metadata.gz: 2c865638c22f747a6f42c9f0a2a6469463d85567837c6381858fcc569f8cffd5a46e55b65142bba9d00f4f7fa629e3a1870821bcc3c27c0556c947e0b6f6c29e
-  data.tar.gz: b285917dba21b70b9b2937b89d91da7273b33bbd4f3f2855ee4a6eef541ff2f8657266ba81be3bc26e932702b7376b68f432170bd3936e605db4a6ad0d9c0a19
+  metadata.gz: 2e59c251899fdc1172ab144af0cc4d5aaa53b1c667d0b2ed7f22cbdf11d1b3f02992ce6e930ac604c8418108b5eec77502aee1272ab2261cf475769e19e7f635
+  data.tar.gz: e05efd4111d3a46ac60bd2b0b856359b408b98b1daf7cb831138ff64e76d456397670eaea83652980f428206cbc091dd5e2b6fbf24d453b58ee75d316f0f27d1

data/fluent-plugin-fluent-plugin-json-size-limit.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-fluent-plugin-json-size-limit"
-  spec.version = "0.1.29"
+  spec.version = "0.1.30"
   spec.authors = ["Mykola Panin"]
   spec.email   = ["mykola.panin@creatoriq.com"]
 

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -20,26 +20,16 @@ module Fluent
     class JsonSizeLimitFilter < Filter
       Fluent::Plugin.register_filter('jsonsizelimit', self)
 
-      # Configuration parameter for maximum JSON size
       config_param :max_size, :size, default: 250 * 1024
-      # Configuration parameter for maximum attempts to reduce JSON size
-      config_param :max_attempts, :integer, default: 100
 
       def configure(conf)
         super
-        log.debug "Configuring JsonSizeLimitFilter with max_size: #{@max_size} and max_attempts: #{@max_attempts}"
+        log.debug "Configuring JsonSizeLimitFilter with max_size: #{@max_size}"
       end
 
       def filter(tag, time, record)
-        # Ensure that the record is a Hash before processing
-        return record unless record.is_a?(Hash)
-
         original_size = record.to_json.bytesize
-        begin
-          reduce_size(record, @max_size)
-        rescue => e
-          log.error "Error during size reduction: #{e.message}"
-        end
+        reduce_size(record, @max_size)
         final_size = record.to_json.bytesize
 
         log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
@@ -48,31 +38,31 @@ module Fluent
 
       private
 
-      def reduce_size(obj, target_size, attempts = 0)
-        json_str = obj.to_json
-        return if json_str.bytesize <= target_size || attempts >= @max_attempts
-
-        excess_size = json_str.bytesize - target_size
-        perform_reduction(obj, excess_size, json_str.bytesize)
-        reduce_size(obj, target_size, attempts + 1)  # Recursive call with incremented attempts
+      def reduce_size(obj, target_size)
+        attempts = 0
+        while obj.to_json.bytesize > target_size && attempts < 100
+          excess_size = obj.to_json.bytesize - target_size
+          perform_reduction(obj, excess_size, obj.to_json.bytesize)
+          attempts += 1
+        end
       end
 
       def perform_reduction(obj, excess_size, total_size)
-        case obj
-        when Hash
-          obj.each { |key, value| apply_reduction(value, excess_size, total_size) }
-        when Array
+        if obj.is_a?(Hash)
+          obj.each do |key, value|
+            apply_reduction(value, excess_size, total_size)
+          end
+        elsif obj.is_a?(Array)
           obj.each { |element| apply_reduction(element, excess_size, total_size) }
-        when String
+        elsif obj.is_a?(String)
           reduce_string(obj, excess_size, total_size)
         end
       end
 
       def apply_reduction(element, excess_size, total_size)
-        case element
-        when String
+        if element.is_a?(String)
           reduce_string(element, excess_size, total_size)
-        when Hash, Array
+        elsif element.is_a?(Hash) || element.is_a?(Array)
           reduce_size(element, element.to_json.bytesize - (excess_size * (element.to_json.bytesize.to_f / total_size)))
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fluent-plugin-json-size-limit
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Mykola Panin