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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f924059fcbebb4396efc9f677ffe7dd8b2d846a6b408c27023c604f5ac4eb7
-  data.tar.gz: 1f4ff05c3488fd48d1aacb5f1bf6f8087bb90d65e342f8569ca2590c2282594d
+  metadata.gz: 101a8797e2c88b1200807388e3f970a636444d1ac8822b0eec251f3d6483b362
+  data.tar.gz: 988af4fe02e3fd6e83ecf19351885638e528a6e074817dd3a5cd4c6b532d1f17
 SHA512:
-  metadata.gz: 118f7e2a31f67b792ad4b0470be2a783e4dcfa6a15330d6cf6af074e7f3fe3dac7ff0e6057edc0f425bd73bce5b7ca2d2b6f2162e58e3d400e6ebaa1ea2e255d
-  data.tar.gz: 01e25d11c7efea63c48d34e95b6ebba689d7793568c5910a2395212284a69a25c8706322579ed58f86fb8399f20afe997f8c52c66f7f9cbbb6de46183e09051c
+  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.15"
+  spec.version = "0.1.16"
   spec.authors = ["Mykola Panin"]
   spec.email   = ["mykola.panin@creatoriq.com"]
 

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -32,23 +32,31 @@ module Fluent
         json_str = record.to_json
 
         if json_str.bytesize > @max_size
-          sorted_fields = record.sort_by { |k, v| v.to_s.length }.reverse
+          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 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 if json_str.bytesize <= @max_size
+            break unless reduced
+            attempts += 1
           end
 
           final_size = json_str.bytesize
-          log.debug "Reduced record size from #{original_size} to #{final_size} bytes"
+          log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
         end
 
         record

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.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Mykola Panin