fluent-plugin-mutate_filter 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad13425ca3ba43ede3418c4101e3a03ff9caf8c2a92d8c2102e3a505d4d30dfd
-  data.tar.gz: 0d6062dc6cdb02916f3f901a5f834e64fbdce6a6b9c8e5b97403625c30707b2d
+  metadata.gz: 0664bad26658d5673c81a8bf2a16a009da087d73587b80e376c05a5197fe8b6e
+  data.tar.gz: 6f7cdc9185ed4978cc003ddea9f98ae7f4e715892b7d7903dcedfa58921931e7
 SHA512:
-  metadata.gz: 8ef466b6c236fc6ea8021038624fa989fc803f1319016a8128ed96aac7f56da84c13b97aab062706bf2ada95352e06327d5c1519141ef254e0d8f30058f6599f
-  data.tar.gz: 9c3f9489112d32c88b5e727fbb73bd9d66d0ae85d7033dde0b25a03e4ca14aa6a0a0bb3fc0eebde04622c0ae475f76f6529b0390a82e88b82b53939d6657390d
+  metadata.gz: 94e5be76a90711b400d3027234268e0eddf3f5649c5e5aa7048a3f5a6808a58f0d79b97efd55f69ce4493afe2965ec5bf03f3bafbba26371a90ed43844dae287
+  data.tar.gz: 5175dfb54f04ca6d03cc512e8dda1fd1835b2913b85ff4c49e238aaa10e0b965dec30380c058ab32d1dd9daadef9f0c31e433979281f345e991d75deb82f0263

data/fluent-plugin-mutate_filter.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-mutate_filter"
-  spec.version = "1.0.5"
+  spec.version = "1.0.6"
   spec.authors = ["Jonathan Serafini"]
   spec.email   = ["jonathan@serafini.ca"]
 

data/lib/fluent/plugin/filter_mutate.rb

@@ -62,7 +62,7 @@ module Fluent
               end
             when "parse"
               data.each do |key, value|
-                if key == "@merge_root"
+                if key == "merge_root"
                   data[key] = Fluent::Config.bool_value(value)
                   next
                 end
@@ -428,25 +428,36 @@ module Fluent
       # Lazily just support json for now
       # @since 1.0.0
       def parse(params, event)
-        merge_root = params.delete("@merge_root")
+        merge_root = params.fetch("merge_root", false)
 
         params.each do |field, parser|
+          next if field == "merge_root"
+
           value = event.get(field)
+          parsed = nil
 
           unless value.is_a?(String)
             @log.warn("field value cannot be parsed by #{parser}")
             next
           end
 
-          if (value.start_with?('{') and value.end_with?('}')) \
-          or (value.start_with?('[') and value.end_with?(']'))
-            value = JSON.load(value)
+          value = event.get(field).strip
 
-            if merge_root
-              event.update(value)
-            else
-              event.set(field, value)
+          if value.start_with?('{') and value.end_with?('}')
+            parsed = JSON.load(value)
+          end
+
+          if parsed.nil?
+            next
+          end
+
+          if merge_root
+            parsed.each do |k, v|
+              event.set(k, v)
+              event.delete(field)
             end
+          else
+            event.set(field, parsed)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mutate_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jonathan Serafini