fluent-plugin-fluent-plugin-json-size-limit 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4d094242ef2410fa297a2fadb82c44807935689eadf364a8940ba7e7a140e8
-  data.tar.gz: f4e3e2f1b7876e722eadfaafc5263c219cd187976cd28e07ced5ec40e72e31e1
+  metadata.gz: 20e10aae10321603fa97bf64f44a8c5aaece831e988ed7f14be0799b328f13cb
+  data.tar.gz: a29af8031f826c2b4873ba3b976569b2f66fb62d9b2471dc7619f7198ff3204d
 SHA512:
-  metadata.gz: 874c65a8b41398c2f0a1aac400a3db41010dcbd80faacdfe0e9c95ea126bb851973aa023243e071119931706c78fa45d1b4a04738326933961665d1b87d6fff2
-  data.tar.gz: 3fa3adb2888eee31e26d8c3c03c70a7287aa11af61347eaa8f9f763f48505a4d19423697b0e8dfbc342127dc311220cb1e57d4447065450c3edc6de622557371
+  metadata.gz: '0795d0a432657db02bc710c6a6df44c92ed03048a4fc7b84511b3bc78a9b3871f9fdfaa49faa0a99fd2dd2a846a84a0cd7e717a4abbf443ce0265dd69a38510b'
+  data.tar.gz: dcf06ae947ded1e2b08250b4d4c81187e68a8dc6bd218ac76904b798d0dcf54ffec692b3ea6a974a8131e283b3abbc02baf2b4fd6af7b88a1835367ab6a8c869

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -38,22 +38,30 @@ module Fluent
 
       private
 
-      def reduce_size(obj, target_size, depth = 0)
-        return if obj.to_json.bytesize <= target_size || depth > 20
-
-        if obj.is_a?(Hash)
-          obj.each do |key, value|
-            if value.is_a?(String)
-                new_length = [value.length * (0.5 - depth * 0.05), 0].max
-                obj[key] = value[0...new_length]
-            elsif value.is_a?(Hash) || value.is_a?(Array)
-                reduce_size(value, target_size, depth + 1)
-            end
-
-            break if obj.to_json.bytesize <= target_size
+      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
+          if obj.is_a?(Hash)
+            reduce_hash(obj, excess_size)
+          elsif obj.is_a?(Array)
+            obj.each { |element| reduce_size(element, target_size) }
+          end
+          attempts += 1
+        end
+      end
+
+      def reduce_hash(hash_obj, excess_size)
+        hash_obj.each do |key, value|
+          break if hash_obj.to_json.bytesize <= target_size
+
+          if value.is_a?(String)
+            reduction_amount = (value.length.to_f / hash_obj.to_json.bytesize) * excess_size
+            new_length = [value.length - reduction_amount, 0].max
+            hash_obj[key] = value[0...new_length]
+          elsif value.is_a?(Hash) || value.is_a?(Array)
+            reduce_size(value, target_size)
           end
-        elsif obj.is_a?(Array)
-          obj.each { |element| reduce_size(element, target_size, depth + 1) }
         end
       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.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Mykola Panin