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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e9b320a7350dc13269f72a2ff8f2c4a99040cd3a0b181dab88adc633ca503c
-  data.tar.gz: '04654296b53a8bd31319b747b9a070f79a3245ac19d510f5a7fb858014d0f43a'
+  metadata.gz: 1e24f82280ef078291ee109be79150cfc9789676643ed84b87e2c32e472b6afe
+  data.tar.gz: d862ce1033e2a3e443ed32c9571502edc5373c1b3851936e108aeba01f47f49a
 SHA512:
-  metadata.gz: 91c2e0697c2944367ef3fdae15283ae4341854e1e85c14a7e0454a6b39da502338e53b28b1761547150144a39a782ca2f9850f0cd3d79ed3d45a027dfd9604db
-  data.tar.gz: 7844533169a7e2b1fb0efcb8c0f02d99233ce2187b48eaf20bbe1402c4620150fc013837e468fd789c43d7dd6f46d98b6943c1a76c6beed9235185a21a3dfda0
+  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.26"
+  spec.version = "0.1.28"
   spec.authors = ["Mykola Panin"]
   spec.email   = ["mykola.panin@creatoriq.com"]
 

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -41,41 +41,36 @@ module Fluent
       def reduce_size(obj, target_size)
         attempts = 0
         while obj.to_json.bytesize > target_size && attempts < 100
-          perform_reduction(obj, target_size)
+          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, target_size)
-        excess_size = obj.to_json.bytesize - target_size
-
+      def perform_reduction(obj, excess_size, total_size)
         if obj.is_a?(Hash)
-          reduce_hash(obj, excess_size)
-        elsif obj.is_a?(Array)
-          reduce_array(obj, target_size)
-        end
-      end
-
-      def reduce_hash(hash_obj, excess_size)
-        hash_obj.each do |key, value|
-          if value.is_a?(String)
-            reduce_string(hash_obj, key, value, excess_size)
-          elsif value.is_a?(Hash) || value.is_a?(Array)
-            reduce_size(value, excess_size)
+          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) }
+        elsif obj.is_a?(String)
+          reduce_string(obj, excess_size, total_size)
         end
       end
 
-      def reduce_array(array_obj, target_size)
-        array_obj.each do |element|
-          reduce_size(element, target_size) if element.is_a?(Hash) || element.is_a?(Array)
+      def apply_reduction(element, excess_size, total_size)
+        if element.is_a?(String)
+          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 * (element.to_json.bytesize.to_f / total_size)))
         end
       end
 
-      def reduce_string(hash_obj, key, value, excess_size)
-        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]
+      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
     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.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Mykola Panin