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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2d0b868e3e3879068c4c4adb44caf832379ad4d927f09e72f02223cc9efe9b
-  data.tar.gz: cfa85d22a6b21b41ff7541f6040ca22c4ed5fbf20b13f818392928e1f5d5624a
+  metadata.gz: 1e24f82280ef078291ee109be79150cfc9789676643ed84b87e2c32e472b6afe
+  data.tar.gz: d862ce1033e2a3e443ed32c9571502edc5373c1b3851936e108aeba01f47f49a
 SHA512:
-  metadata.gz: 18f99e8b8e7841be35f024b481676e7cb0da6b9f045d4ff67479c6cb6325a8ca74452f469f8d3631878c3bf2dbaa179af6dd4ab76392e912656cd44a70c9fc23
-  data.tar.gz: b3eae5c689ed71874327ba01d30803321b19f5848f8977f8e2b57862650adf1504deb263181ad13232ee97dcc6fa1a5c396c5014cb30a0257ddd8865d9b759bc
+  metadata.gz: 1f747939411789f6c8102fa5d7f7a47f6728b6e6337e61740efdb5ae69fc5bc2d210e0711f693f2afe06f66fe068446b205e9b0288765bb2b03b66ee5a9eb4d8
+  data.tar.gz: 692f8c2b477084a14963f8cf25920f6265aafc90bcc942a693eb435bd929b37516f42555e2832d008a813338c6ae38864424e0d4b6f138706bac691059e119e3

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -42,33 +42,33 @@ module Fluent
         attempts = 0
         while obj.to_json.bytesize > target_size && attempts < 100
           excess_size = obj.to_json.bytesize - target_size
-          perform_reduction(obj, excess_size)
+          perform_reduction(obj, excess_size, obj.to_json.bytesize)
           attempts += 1
         end
       end
 
-      def perform_reduction(obj, excess_size)
+      def perform_reduction(obj, excess_size, total_size)
         if obj.is_a?(Hash)
           obj.each do |key, value|
-            apply_reduction(value, excess_size)
+            apply_reduction(value, excess_size, total_size)
           end
         elsif obj.is_a?(Array)
-          obj.each { |element| apply_reduction(element, excess_size) }
+          obj.each { |element| apply_reduction(element, excess_size, total_size) }
         elsif obj.is_a?(String)
-          reduce_string(obj, excess_size)
+          reduce_string(obj, excess_size, total_size)
         end
       end
 
-      def apply_reduction(element, excess_size)
+      def apply_reduction(element, excess_size, total_size)
         if element.is_a?(String)
-          reduce_string(element, excess_size)
+          reduce_string(element, excess_size, total_size)
         elsif element.is_a?(Hash) || element.is_a?(Array)
-          reduce_size(element, element.to_json.bytesize - excess_size)
+          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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fluent-plugin-json-size-limit
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Mykola Panin