fluent-plugin-newrelic 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0773cd3e502a6dd497014062c8be8403f514c77bea25616ffd6fbf90fad30287
-  data.tar.gz: 86dbe19317eaf443f5dda768c863dac741ddf78667b36a5f391c9454041334f5
+  metadata.gz: 87b63e728e6200ed540cd79312f282f37e61cae7a6882431f27cc88e193dbaf8
+  data.tar.gz: 2a14f80ae306fc788cedfd9e7ca5e0bea336689e2f7b1be03ce6795776322db9
 SHA512:
-  metadata.gz: 4b0349c68cf61dcf9bd0199d90ab537b7d12a272f506df873795f23c19485302bf1f7fbcdbbc444b091742f70d6cc261281550bd971c803c905dd6d5b41d4707
-  data.tar.gz: 109fd9f8727729ae92ef5702267e195838b358e99d107fdb547d21f5edc42a0c2eacff36a6a9f9ec1e9e34defc4e864a91d9f9ad49b9b1ad01d889e292267699
+  metadata.gz: 5278a2cc7cebd0fe819192efcb401a4c2c420ab652bf4f7bccfc2db872c85bb0758027185b073fb21e96cbe98bcfcac163964f6b00a2a879a6bdee1864908f6c
+  data.tar.gz: d6bc99a34a7f632862a68a13fdcefbca68cf279dfc7f13dd04adce27c51274a8311b694ec506832b3c35f02095fdbacdb4a499f086707248552c65ec9f61f2e3

data/lib/fluent/plugin/out_newrelic.rb

@@ -17,7 +17,6 @@ require 'fluent/plugin/output'
 require 'net/http'
 require 'uri'
 require 'zlib'
-require 'json'
 require 'newrelic-fluentd-output/version'
 
 module Fluent
@@ -65,21 +64,16 @@ module Fluent
       def package_record(record, timestamp)
         packaged = {
           'timestamp' => timestamp,
-          'attributes' => {}
+          # non-intrinsic attributes get put into 'attributes'
+          'attributes' => record
         }
 
+        # intrinsic attributes go at the top level
         if record.has_key?('message')
-          message = record['message']
-          packaged['attributes'] = packaged['attributes'].merge(maybe_parse_json(message))
-        end
-
-        record.each do |key, value|
-          if key == 'message'
-            packaged['message'] = record['message']
-          else
-            packaged['attributes'][key] = record[key]
-          end
+          packaged['message'] = record['message']
+          packaged['attributes'].delete('message')
         end
+        
         packaged
       end
 
@@ -144,24 +138,6 @@ module Fluent
         http.request(request)
       end
 
-      def maybe_parse_message_json(record)
-        if record.has_key?('message')
-          message = record['message']
-          record = record.merge(maybe_parse_json(message))
-        end
-        record
-      end
-
-      def maybe_parse_json(message)
-        begin
-          parsed = JSON.parse(message)
-          if Hash === parsed
-            return parsed
-          end
-        rescue JSON::ParserError
-        end
-        return {}
-      end
     end
   end
 end

data/lib/newrelic-fluentd-output/version.rb

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - New Relic Logging Team