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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f924059fcbebb4396efc9f677ffe7dd8b2d846a6b408c27023c604f5ac4eb7
-  data.tar.gz: 1f4ff05c3488fd48d1aacb5f1bf6f8087bb90d65e342f8569ca2590c2282594d
+  metadata.gz: be537cc111d37698e89d70b879e7188880ff47e9d271413c8bc71a96e11ced89
+  data.tar.gz: 0d063b8c88de22b7ab1f9aeeeba7367dffc8149165cb268f0889d023b26fbcb7
 SHA512:
-  metadata.gz: 118f7e2a31f67b792ad4b0470be2a783e4dcfa6a15330d6cf6af074e7f3fe3dac7ff0e6057edc0f425bd73bce5b7ca2d2b6f2162e58e3d400e6ebaa1ea2e255d
-  data.tar.gz: 01e25d11c7efea63c48d34e95b6ebba689d7793568c5910a2395212284a69a25c8706322579ed58f86fb8399f20afe997f8c52c66f7f9cbbb6de46183e09051c
+  metadata.gz: c52de0d0a0aef5001d4cfa8eb1cd80ef4b145db0f3ca2347506721400c4ead8eec5381c49549cf3c9105338a356e29639f89b5061e2aca0485f43fbaae511fa3
+  data.tar.gz: faf75d84fa049f2688cca7d633112519a4a9af57dc20b6971101425fdbf67e93c9a74a03e34e9731ed21780df487c5fdee0797679ddd532270f1893c99ea75d2

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -29,29 +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
-          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
 
-          sorted_fields.each do |key, value|
-            next unless value.is_a?(String) && value.length > 10
+      private
+
+      def reduce_size(obj, target_size)
+        json_str = obj.to_json
+        return if json_str.bytesize <= target_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 - @max_size
+            excess_size = current_size - target_size
 
-            new_length = [value.length - excess_size, 0].max
-            record[key] = value[0...new_length]
-            json_str = record.to_json
+            if value.is_a?(String) && value.length > 10
+              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 if json_str.bytesize <= @max_size
+            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"
+        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.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Mykola Panin