fluent-plugin-fluent-plugin-json-size-limit 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1f2e6ac036ba52dfd968b14d7596f477a47453d7944244787a374772b3eb09
-  data.tar.gz: ce671aa6d8e8e3d0efa565f82a57689308347bd61e5ef34acccda2cdd403e6f3
+  metadata.gz: 101a8797e2c88b1200807388e3f970a636444d1ac8822b0eec251f3d6483b362
+  data.tar.gz: 988af4fe02e3fd6e83ecf19351885638e528a6e074817dd3a5cd4c6b532d1f17
 SHA512:
-  metadata.gz: '0782af89ef48f11fcc72109ce021c6380000eeb37342710726182ca6cfcb22111e6abf4ea3e3f30e3ebb0b0d6e36e8e437800edd698ebfe514262202f4f9f7a4'
-  data.tar.gz: 98abef7edd4d61cc40b5d6840ecc3986316a05204aec1b8924abb94b040819127b330eafc451c05b65767c596bcb954392531b62be8f6f6002262045897364bd
+  metadata.gz: d2e1f5bb268ec0c9f98f68c0d415eb9ffc96d0e60177505959542b293d45879d71775dfdc8a7f88f9f40980bb6881b3983ad69a4ca38662a0fe07011a301e7a6
+  data.tar.gz: e2cf6fd32e0cfdec8a391803f468b8534f76142fc230b1daa534b9b6ae17ddc322fac3c48a77e124767d6c6df16c66360b91c39b3f7ec363dd8653624b936033

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -28,35 +28,37 @@ module Fluent
       end
 
       def filter(tag, time, record)
+        original_size = record.to_json.bytesize
         json_str = record.to_json
-        log.debug "Original record size: #{json_str.bytesize} bytes"
 
-        while json_str.bytesize > @max_size
-          sorted_fields = record.sort_by { |k, v| v.to_s.length }.reverse
-          reduced = false
+        if json_str.bytesize > @max_size
+          attempts = 0
+          while json_str.bytesize > @max_size && attempts < 10
+            reduced = false
+            sorted_fields = record.sort_by { |k, v| v.to_s.length }.reverse
 
-          sorted_fields.each do |key, value|
-            next unless value.is_a?(String) && value.length > 10
+            sorted_fields.each do |key, value|
+              next unless value.is_a?(String) && value.length > 10
 
-            current_size = json_str.bytesize
-            excess_size = current_size - @max_size
+              current_size = json_str.bytesize
+              excess_size = current_size - @max_size
 
-            new_length = [value.length - excess_size, 0].max
-            record[key] = value[0...new_length]
-            json_str = record.to_json
-
-            if json_str.bytesize <= @max_size
-              log.debug "Reduced size of field '#{key}'"
-              reduced = true
-              break
+              if excess_size > 0
+                new_length = [value.length - excess_size, 0].max
+                record[key] = value[0...new_length]
+                json_str = record.to_json
+                reduced = true
+              end
             end
+
+            break unless reduced
+            attempts += 1
           end
 
-          break unless reduced
-          log.debug "Intermediate record size: #{json_str.bytesize} bytes"
+          final_size = json_str.bytesize
+          log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
         end
 
-        log.debug "Final record size: #{json_str.bytesize} bytes"
         record
       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.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Mykola Panin