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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2d0b868e3e3879068c4c4adb44caf832379ad4d927f09e72f02223cc9efe9b
-  data.tar.gz: cfa85d22a6b21b41ff7541f6040ca22c4ed5fbf20b13f818392928e1f5d5624a
+  metadata.gz: 591d68308d420614aa3ea9c6c4379a77f489afa72b42adaa22356686f403ee9e
+  data.tar.gz: 600efc817220c04458478cd2d1b44025f17a01eb77f2fadf43a650f382437938
 SHA512:
-  metadata.gz: 18f99e8b8e7841be35f024b481676e7cb0da6b9f045d4ff67479c6cb6325a8ca74452f469f8d3631878c3bf2dbaa179af6dd4ab76392e912656cd44a70c9fc23
-  data.tar.gz: b3eae5c689ed71874327ba01d30803321b19f5848f8977f8e2b57862650adf1504deb263181ad13232ee97dcc6fa1a5c396c5014cb30a0257ddd8865d9b759bc
+  metadata.gz: 2c865638c22f747a6f42c9f0a2a6469463d85567837c6381858fcc569f8cffd5a46e55b65142bba9d00f4f7fa629e3a1870821bcc3c27c0556c947e0b6f6c29e
+  data.tar.gz: b285917dba21b70b9b2937b89d91da7273b33bbd4f3f2855ee4a6eef541ff2f8657266ba81be3bc26e932702b7376b68f432170bd3936e605db4a6ad0d9c0a19

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.27"
+  spec.version = "0.1.29"
   spec.authors = ["Mykola Panin"]
   spec.email   = ["mykola.panin@creatoriq.com"]
 

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -20,16 +20,26 @@ 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}"
+        log.debug "Configuring JsonSizeLimitFilter with max_size: #{@max_size} and max_attempts: #{@max_attempts}"
       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
-        reduce_size(record, @max_size)
+        begin
+          reduce_size(record, @max_size)
+        rescue => e
+          log.error "Error during size reduction: #{e.message}"
+        end
         final_size = record.to_json.bytesize
 
         log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
@@ -38,37 +48,37 @@ module Fluent
 
       private
 
-      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)
-          attempts += 1
-        end
+      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
       end
 
-      def perform_reduction(obj, excess_size)
-        if obj.is_a?(Hash)
-          obj.each do |key, value|
-            apply_reduction(value, excess_size)
-          end
-        elsif obj.is_a?(Array)
-          obj.each { |element| apply_reduction(element, excess_size) }
-        elsif obj.is_a?(String)
-          reduce_string(obj, excess_size)
+      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
+          obj.each { |element| apply_reduction(element, excess_size, total_size) }
+        when String
+          reduce_string(obj, excess_size, total_size)
         end
       end
 
-      def apply_reduction(element, excess_size)
-        if element.is_a?(String)
-          reduce_string(element, excess_size)
-        elsif element.is_a?(Hash) || element.is_a?(Array)
-          reduce_size(element, element.to_json.bytesize - excess_size)
+      def apply_reduction(element, excess_size, total_size)
+        case element
+        when String
+          reduce_string(element, excess_size, total_size)
+        when Hash, Array
+          reduce_size(element, element.to_json.bytesize - (excess_size * (element.to_json.bytesize.to_f / total_size)))
         end
       end
 
-      def reduce_string(str, excess_size)
-        reduction_amount = (str.length.to_f / str.to_json.bytesize) * excess_size
+      def reduce_string(str, excess_size, total_size)
+        reduction_amount = (str.length.to_f / total_size) * excess_size
         new_length = [str.length - reduction_amount, 0].max
         str.replace(str[0...new_length])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fluent-plugin-json-size-limit
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.29
 platform: ruby
 authors:
 - Mykola Panin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler