logstash-output-newrelic 1.0.4 → 1.0.5.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 486f17e1a3bc87e00990f487a0023139643b9309e1dab8c7845ec366169af7c5
-  data.tar.gz: 1f19c28eac5cf94fb2a536869f81476b276d7c62bb99dbb9604596490ba0a643
+  metadata.gz: ab807cb889166e953912511aea7ed369826f33eb682a38132b92ce80dcc8ce53
+  data.tar.gz: 9f6a065d41735423e91a70de67098251d1f46d4f23595b683e4a191ff0b5d7df
 SHA512:
-  metadata.gz: 86cda8ca9547298ed0ee085b3f81a61df641447d728dc27bb8e461c2fd18709baeea3fd3074589ce8415bfdfc5ca149452682468c4840468a42717e8e1b31d4f
-  data.tar.gz: d6041b6024a4ceced2836fad93f1fae3339387fadec9c702742572bf69f0df12e8d77f4503e8865ef857f79aa373b1061f9edf9305f67d674de38ce12d86fe9b
+  metadata.gz: bc33bfc42f9ef925200fa214b9e37964dc62c4e5a7ed1e492f3bba5a25a7a5b09657683009f90b3e7a9a033d9769511bebdb0e1cda87357e57c0356e0a5e702b
+  data.tar.gz: 84f94a970f6371fd18c3f8344f6bb587bd56cdc7347beb83bacd006bb8b5fd8578fdbce4922d7e1249bdca657d997ca71ec5e2d9db1bb596da15e791e36a4600

data/lib/logstash/outputs/newrelic.rb

@@ -52,10 +52,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
         :attributes => {}
     }
 
-    if event_hash.has_key?('message')
-      log_message_hash[:attributes] = maybe_parse_json(event_hash['message'])
-    end
-
     event_hash.each do |key, value|
       if key == 'message' || key == 'timestamp'
         # intrinsic attributes go at the top level
@@ -69,18 +65,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
     log_message_hash
   end
 
-  def maybe_parse_json(message)
-    begin
-      parsed = JSON.parse(message)
-      if Hash === parsed
-        return parsed
-      end
-    rescue JSON::ParserError
-      # Not JSON
-    end
-    {}
-  end
-
   def multi_receive(events)
     payload = []
     events.each do |event|

data/lib/logstash/outputs/newrelic_version/version.rb

@@ -1,7 +1,7 @@
 module LogStash
   module Outputs
     module NewRelicVersion
-      VERSION = "1.0.4"
+      VERSION = "1.0.5-beta"
     end
   end
 end

data/spec/outputs/newrelic_spec.rb

@@ -120,7 +120,7 @@ describe LogStash::Outputs::NewRelic do
         .to have_been_made
     end
 
-    it "JSON object 'message' field is parsed, removed, and its data merged as attributes" do
+    it "JSON object 'message' field is not parsed" do
       stub_request(:any, base_uri).to_return(status: 200)
 
       message_json = '{ "in-json-1": "1", "in-json-2": "2", "sub-object": {"in-json-3": "3"} }'
@@ -130,9 +130,7 @@ describe LogStash::Outputs::NewRelic do
       wait_for(a_request(:post, base_uri)
         .with { |request|
           message = single_gzipped_message(request.body)
-          message['attributes']['in-json-1'] == '1' &&
-          message['attributes']['in-json-2'] == '2' &&
-          message['attributes']['sub-object'] == {"in-json-3" => "3"} &&
+          message['message'] == message_json &&
           message['attributes']['other'] == 'Other value' })
         .to have_been_made
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5.pre.beta
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -113,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.6