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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101a8797e2c88b1200807388e3f970a636444d1ac8822b0eec251f3d6483b362
-  data.tar.gz: 988af4fe02e3fd6e83ecf19351885638e528a6e074817dd3a5cd4c6b532d1f17
+  metadata.gz: b20e7aa472449c2322e56536598b8243e1cc6260f9e222738ca188fc4769ad5b
+  data.tar.gz: c98e3364c07dc89f08e07079ff2b8b9929f3038c04bdb1955a40a5151579875c
 SHA512:
-  metadata.gz: d2e1f5bb268ec0c9f98f68c0d415eb9ffc96d0e60177505959542b293d45879d71775dfdc8a7f88f9f40980bb6881b3983ad69a4ca38662a0fe07011a301e7a6
-  data.tar.gz: e2cf6fd32e0cfdec8a391803f468b8534f76142fc230b1daa534b9b6ae17ddc322fac3c48a77e124767d6c6df16c66360b91c39b3f7ec363dd8653624b936033
+  metadata.gz: 4e0959207364b9fb3b96473c0aa1f194953526e95ba8374659714dae394f9622368aa6a63270a87a7c61d9b4f12952def4136111ddf9b3cceeef88e4da843753
+  data.tar.gz: 4f49bd24b9d9e3d7e45f969073dfd1ca2be683903a7c5fa606d9fad81060da0d8f51271351748688e3959cc63ed0f3c7eca7e16d81301f8d7d53c0519fb4e0d4

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -29,37 +29,37 @@ module Fluent
 
       def filter(tag, time, record)
         original_size = record.to_json.bytesize
-        json_str = record.to_json
+        reduce_size(record, @max_size)
+        final_size = record.to_json.bytesize
 
-        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
+        log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
+        record
+      end
+
+      private
 
-            sorted_fields.each do |key, value|
-              next unless value.is_a?(String) && value.length > 10
+      def reduce_size(obj, target_size)
+        json_str = obj.to_json
+        return if json_str.bytesize <= target_size
 
-              current_size = json_str.bytesize
-              excess_size = current_size - @max_size
+        if obj.is_a?(Hash)
+          sorted_fields = obj.sort_by { |_, v| v.to_s.length }.reverse
+          sorted_fields.each do |key, value|
+            current_size = json_str.bytesize
+            excess_size = current_size - target_size
 
-              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
+            if value.is_a?(String) && value.length > 20
+              new_length = [value.length - excess_size, 0].max
+              obj[key] = value[0...new_length]
+            elsif value.is_a?(Hash) || value.is_a?(Array)
+              reduce_size(value, target_size)
             end
 
-            break unless reduced
-            attempts += 1
+            break if obj.to_json.bytesize <= target_size
           end
-
-          final_size = json_str.bytesize
-          log.debug "Reduced record size from #{original_size} to #{final_size} bytes" if original_size != final_size
+        elsif obj.is_a?(Array)
+          obj.each { |element| reduce_size(element, target_size) }
         end
-
-        record
       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.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Mykola Panin