fluent-plugin-fluent-plugin-json-size-limit 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 591d68308d420614aa3ea9c6c4379a77f489afa72b42adaa22356686f403ee9e
-  data.tar.gz: 600efc817220c04458478cd2d1b44025f17a01eb77f2fadf43a650f382437938
+  metadata.gz: 05e23baa812f5f389f8632c11f7793ce3bbeb9fb147d2f59f581d12a7d360d15
+  data.tar.gz: 8aea346b7c77227efff34fc70917f714ab7201268916bbdfe9ea5c92b64caf74
 SHA512:
-  metadata.gz: 2c865638c22f747a6f42c9f0a2a6469463d85567837c6381858fcc569f8cffd5a46e55b65142bba9d00f4f7fa629e3a1870821bcc3c27c0556c947e0b6f6c29e
-  data.tar.gz: b285917dba21b70b9b2937b89d91da7273b33bbd4f3f2855ee4a6eef541ff2f8657266ba81be3bc26e932702b7376b68f432170bd3936e605db4a6ad0d9c0a19
+  metadata.gz: 025716c4860daf3a0184f62b4909984a31b184e45c362308873a8175d23cb882a9c59aaa38184d221ab791c62b2daa98f20bbc435c57e9f96c138accdd60c6eb
+  data.tar.gz: 01aa3a00a0a4eac6f888652e7d6be9bc7ad66b1e74b3d4d641c02e3a7eaa0ceb32d1e2b4c17c484f91ff4cd054476f5e25b542e9bb0be79d73d180942e68939a

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

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -31,14 +31,12 @@ module Fluent
       end
 
       def filter(tag, time, record)
-        # Ensure that the record is a Hash before processing
-        return record unless record.is_a?(Hash)
-
         original_size = record.to_json.bytesize
         begin
           reduce_size(record, @max_size)
         rescue => e
           log.error "Error during size reduction: #{e.message}"
+          return record # Return the original record in case of an error
         end
         final_size = record.to_json.bytesize
 
@@ -48,31 +46,29 @@ module Fluent
 
       private
 
-      def reduce_size(obj, target_size, attempts = 0)
-        json_str = obj.to_json
-        return if json_str.bytesize <= target_size || attempts >= @max_attempts
-
-        excess_size = json_str.bytesize - target_size
-        perform_reduction(obj, excess_size, json_str.bytesize)
-        reduce_size(obj, target_size, attempts + 1)  # Recursive call with incremented attempts
+      def reduce_size(obj, target_size)
+        attempts = 0
+        while obj.to_json.bytesize > target_size && attempts < @max_attempts
+          excess_size = obj.to_json.bytesize - target_size
+          perform_reduction(obj, excess_size, obj.to_json.bytesize)
+          attempts += 1
+        end
       end
 
       def perform_reduction(obj, excess_size, total_size)
-        case obj
-        when Hash
+        if obj.is_a?(Hash)
           obj.each { |key, value| apply_reduction(value, excess_size, total_size) }
-        when Array
+        elsif obj.is_a?(Array)
           obj.each { |element| apply_reduction(element, excess_size, total_size) }
-        when String
+        elsif obj.is_a?(String)
           reduce_string(obj, excess_size, total_size)
         end
       end
 
       def apply_reduction(element, excess_size, total_size)
-        case element
-        when String
+        if element.is_a?(String)
           reduce_string(element, excess_size, total_size)
-        when Hash, Array
+        elsif element.is_a?(Hash) || element.is_a?(Array)
           reduce_size(element, element.to_json.bytesize - (excess_size * (element.to_json.bytesize.to_f / total_size)))
         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.29
+  version: 0.1.31
 platform: ruby
 authors:
 - Mykola Panin