logstash-output-newrelic 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fb3ab8cf5881043a05b318e3a5158a15f9e39f71d35bf1b98a2b0526ec59df8
-  data.tar.gz: b78ec9ccaddeb88589815019ef3a6b8336b9b12aef7d51b03ccb07df21e7c679
+  metadata.gz: 486f17e1a3bc87e00990f487a0023139643b9309e1dab8c7845ec366169af7c5
+  data.tar.gz: 1f19c28eac5cf94fb2a536869f81476b276d7c62bb99dbb9604596490ba0a643
 SHA512:
-  metadata.gz: d5d13fbb5791e8f7ecf98c6aaebae14596f94581246691cbc9b92a8129b97207405e7af396de356cf1a3bd8fbc882e77700be6353356f54c806a631b1052cd06
-  data.tar.gz: f57941893058a0fdd95c2ab7d3b307051275f428591314d5c2ae93afa71ad18cc29e7ec64bc17db17073670c031f1b0293525c675d00e8db52a1fddda6f85cce
+  metadata.gz: 86cda8ca9547298ed0ee085b3f81a61df641447d728dc27bb8e461c2fd18709baeea3fd3074589ce8415bfdfc5ca149452682468c4840468a42717e8e1b31d4f
+  data.tar.gz: d6041b6024a4ceced2836fad93f1fae3339387fadec9c702742572bf69f0df12e8d77f4503e8865ef857f79aa373b1061f9edf9305f67d674de38ce12d86fe9b

data/lib/logstash/outputs/newrelic.rb

@@ -38,16 +38,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
     @executor&.shutdown
   end
 
-  def time_to_milliseconds(time)
-    timestamp = time_to_logstash_timestamp(time)
-    if timestamp.nil?
-      return nil
-    end
-
-    (timestamp.to_f * 1000).to_i # to_f gives seconds with a fractional portion
-  end
-
-
   def time_to_logstash_timestamp(time)
     begin
       LogStash::Timestamp.coerce(time)
@@ -70,11 +60,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
       if key == 'message' || key == 'timestamp'
         # intrinsic attributes go at the top level
         log_message_hash[key] = value
-      elsif key == '@timestamp'
-        milliseconds = time_to_milliseconds(value)
-        if !milliseconds.nil?
-          log_message_hash[:timestamp] = milliseconds
-        end
       else
         # non-intrinsic attributes get put into 'attributes'
         log_message_hash[:attributes][key] = value

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

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

data/spec/outputs/newrelic_spec.rb

@@ -95,7 +95,7 @@ describe LogStash::Outputs::NewRelic do
     it "message contains plugin information" do
       stub_request(:any, base_uri).to_return(status: 200)
 
-      event = LogStash::Event.new({ :message => "Test message", :@timestamp => '123' })
+      event = LogStash::Event.new({ :message => "Test message" })
       @newrelic_output.multi_receive([event])
 
       wait_for(a_request(:post, base_uri)
@@ -106,49 +106,6 @@ describe LogStash::Outputs::NewRelic do
       .to have_been_made
     end
 
-
-    context "@timestamp field" do
-
-      def test_timestamp(timestamp, message_matcher)
-        stub_request(:any, base_uri).to_return(status: 200)
-
-        event = LogStash::Event.new({ :message => "Test message", :@timestamp => timestamp })
-        @newrelic_output.multi_receive([event])
-
-        wait_for(a_request(:post, base_uri)
-                     .with { |request|
-                       message = single_gzipped_message(request.body)
-                       message_matcher.call(message)
-                     }).to have_been_made
-      end
-
-      it "LogStash::Timestamp '@timestamp' field is added as 'timestamp' as milliseconds since epoch" do
-        def message_matcher(message)
-          message['timestamp'] == FixedTime::MILLISECONDS
-        end
-
-        test_timestamp(FixedTime::LOGSTASH_TIMESTAMP, method(:message_matcher))
-      end
-
-      it "String ISO 8601 '@timestamp' field is added as 'timestamp' as milliseconds since epoch" do
-        def message_matcher(message)
-          message['timestamp'] == FixedTime::MILLISECONDS
-        end
-
-        test_timestamp(FixedTime::ISO_8601_STRING_TIME, method(:message_matcher))
-      end
-
-      # Ideally we might not even set a timestamp if parsing fails. However, the time parsing library doesn't tell us if
-      # parsing fails -- it just returns the current time.
-      it "Unparseable '@timestamp' field is parsed as current time and put into 'timestamp'" do
-        def message_matcher(message)
-          within_five_seconds_of(message['timestamp'], now_in_milliseconds)
-        end
-
-        test_timestamp("Not an ISO 8601 string", method(:message_matcher))
-      end
-    end
-
     it "all other fields passed through as is" do
       stub_request(:any, base_uri).to_return(status: 200)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement