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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab807cb889166e953912511aea7ed369826f33eb682a38132b92ce80dcc8ce53
-  data.tar.gz: 9f6a065d41735423e91a70de67098251d1f46d4f23595b683e4a191ff0b5d7df
+  metadata.gz: e227255c0f05ab2bbd664c45fd3ed25e7edfc9e15481255052688c5dfd1ddd2e
+  data.tar.gz: f3add56ccb74bac8b9f6106f9862254250c6adab4d79723c9fb89940dd5f2c5d
 SHA512:
-  metadata.gz: bc33bfc42f9ef925200fa214b9e37964dc62c4e5a7ed1e492f3bba5a25a7a5b09657683009f90b3e7a9a033d9769511bebdb0e1cda87357e57c0356e0a5e702b
-  data.tar.gz: 84f94a970f6371fd18c3f8344f6bb587bd56cdc7347beb83bacd006bb8b5fd8578fdbce4922d7e1249bdca657d997ca71ec5e2d9db1bb596da15e791e36a4600
+  metadata.gz: 5b1e8ffc8dacea562486112bdca20cff806da7b21336d3e03612cda334fbb0882c26b6f3ce6e230f1f53c5b8e56627bd675009b0c4bc2741d2628999a434375c
+  data.tar.gz: 6bd40c68709a7c1fc63bcb9002e538b49a340526c00e617cdfb3e7b988393b705b12179732cf4a93fcab05dad067789e8c1219b3466483d248d3d23878b1f39f

data/lib/logstash/outputs/newrelic.rb

@@ -49,17 +49,18 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
 
   def encode(event_hash)
     log_message_hash = {
-        :attributes => {}
+        # non-intrinsic attributes get put into 'attributes'
+        :attributes => event_hash
     }
 
-    event_hash.each do |key, value|
-      if key == 'message' || key == 'timestamp'
-        # intrinsic attributes go at the top level
-        log_message_hash[key] = value
-      else
-        # non-intrinsic attributes get put into 'attributes'
-        log_message_hash[:attributes][key] = value
-      end
+    # intrinsic attributes go at the top level
+    if event_hash['message']
+      log_message_hash['message'] = event_hash['message']
+      log_message_hash[:attributes].delete('message')
+    end
+    if event_hash['timestamp']
+      log_message_hash['timestamp'] = event_hash['timestamp']
+      log_message_hash[:attributes].delete('timestamp')
     end
 
     log_message_hash
@@ -101,11 +102,22 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   end
 
   def sleep_duration(attempt)
-    [max_delay, (2 ** attempt) * retry_seconds].min
+    if attempt == 0
+      return 0
+    end
+
+    [max_delay, (2 ** (attempt - 1)) * retry_seconds].min
+  end
+
+  def sleep_on_retry(attempt)
+    duration = sleep_duration(attempt)
+    if duration > 0
+      sleep duration
+    end
   end
 
   def attempt_send(payload, attempt)
-    sleep sleep_duration(attempt)
+    sleep_on_retry(attempt)
     attempt_send(payload, attempt + 1) unless was_successful?(nr_send(payload)) if should_retry?(attempt)
   end
 

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

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

data/spec/outputs/newrelic_spec.rb

@@ -224,12 +224,13 @@ describe LogStash::Outputs::NewRelic do
       @newrelic_output = LogStash::Plugin.lookup("output", "newrelic").new(specific_config)
       @newrelic_output.register
 
-      expect(@newrelic_output.sleep_duration(0)).to equal(5)
-      expect(@newrelic_output.sleep_duration(1)).to equal(10)
-      expect(@newrelic_output.sleep_duration(2)).to equal(20)
-      expect(@newrelic_output.sleep_duration(3)).to equal(40)
-      expect(@newrelic_output.sleep_duration(4)).to equal(60)
-      expect(@newrelic_output.sleep_duration(5)).to equal(60) # Never gets bigger than this
+      expect(@newrelic_output.sleep_duration(0)).to equal(0)
+      expect(@newrelic_output.sleep_duration(1)).to equal(5)
+      expect(@newrelic_output.sleep_duration(2)).to equal(10)
+      expect(@newrelic_output.sleep_duration(3)).to equal(20)
+      expect(@newrelic_output.sleep_duration(4)).to equal(40)
+      expect(@newrelic_output.sleep_duration(5)).to equal(60)
+      expect(@newrelic_output.sleep_duration(6)).to equal(60) # Never gets bigger than this
     end
 
     it "first call fails, should retry" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.5.pre.beta
+  version: 1.0.7
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-06 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.6