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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e10aae10321603fa97bf64f44a8c5aaece831e988ed7f14be0799b328f13cb
-  data.tar.gz: a29af8031f826c2b4873ba3b976569b2f66fb62d9b2471dc7619f7198ff3204d
+  metadata.gz: b0e9b320a7350dc13269f72a2ff8f2c4a99040cd3a0b181dab88adc633ca503c
+  data.tar.gz: '04654296b53a8bd31319b747b9a070f79a3245ac19d510f5a7fb858014d0f43a'
 SHA512:
-  metadata.gz: '0795d0a432657db02bc710c6a6df44c92ed03048a4fc7b84511b3bc78a9b3871f9fdfaa49faa0a99fd2dd2a846a84a0cd7e717a4abbf443ce0265dd69a38510b'
-  data.tar.gz: dcf06ae947ded1e2b08250b4d4c81187e68a8dc6bd218ac76904b798d0dcf54ffec692b3ea6a974a8131e283b3abbc02baf2b4fd6af7b88a1835367ab6a8c869
+  metadata.gz: 91c2e0697c2944367ef3fdae15283ae4341854e1e85c14a7e0454a6b39da502338e53b28b1761547150144a39a782ca2f9850f0cd3d79ed3d45a027dfd9604db
+  data.tar.gz: 7844533169a7e2b1fb0efcb8c0f02d99233ce2187b48eaf20bbe1402c4620150fc013837e468fd789c43d7dd6f46d98b6943c1a76c6beed9235185a21a3dfda0

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -41,29 +41,42 @@ module Fluent
       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
+          perform_reduction(obj, target_size)
           attempts += 1
         end
       end
 
+      def perform_reduction(obj, target_size)
+        excess_size = obj.to_json.bytesize - target_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|
-          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]
+            reduce_string(hash_obj, key, value, excess_size)
           elsif value.is_a?(Hash) || value.is_a?(Array)
-            reduce_size(value, target_size)
+            reduce_size(value, excess_size)
           end
         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)
+        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]
+      end
     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.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Mykola Panin