logstash-output-newrelic 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e6c4d247631f976e7a7fc6153a02cc764f583491c749654a827c1fd6846c6c2
-  data.tar.gz: 42389a3c04b5f1ef4804f9bf7efa820d7037c25e2df73c127354d180c624ff02
+  metadata.gz: 25593f8efc45dce5d2366a19ce89a4d722f6e5a55fdb3d6d8cad607d551dcbd7
+  data.tar.gz: d729dc031d6276a9dafdd1ae5a7615bd378993437a36b6828c540fc901839c88
 SHA512:
-  metadata.gz: deebd2f6b0c7f5c07ee4fc347f577a9011a481be03f8e170a9e9c368594009cbc33b853e05c025a1938b038febc8cc6d6db8c906aa3eacbeacfabab3483d7755
-  data.tar.gz: becf3aef35efc785f84ea956cabf2004d8d1ddbde4dac11f11bec3a25b65ab9a3277a97dcb35add2839581fb0b19ddf59114a83c9e5afd7a54da14ddd9b181d1
+  metadata.gz: 82c061a523aab278574d91373f8691c1499d0560b04e96dd8a8f178b14438eaceb7236dc62cea8ca6ac15d56e9ffa7acdfc2534338d4ae00306b0ef3e47b9f58
+  data.tar.gz: a6b92e08674d6d67e04d9ca2cb5bc0007c717e43c07c888399f715e4c5de546a58cf8237ae9128b742d5cd96ba7b9d52142e11875d1e02b9649af7e515e5e3a0

data/lib/logstash/outputs/newrelic.rb

@@ -13,7 +13,7 @@ require_relative './exception/error'
 class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   java_import java.util.concurrent.Executors;
 
-  NON_RETRYABLE_CODES = Set[401, 403]
+  RETRIABLE_CODES = Set[408, 429, 500, 502, 503, 504, 599]
 
   MAX_PAYLOAD_SIZE_BYTES = 1_000_000
 
@@ -145,6 +145,8 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
 
   def nr_send(payload)
     retries = 0
+    retry_duration = 1
+
     begin
       http = Net::HTTP.new(@end_point.host, 443)
       request = Net::HTTP::Post.new(@end_point.request_uri)
@@ -163,7 +165,8 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
       @logger.error(e.message)
       if (should_retry(retries) && is_retryable_code(e))
         retries += 1
-        sleep(1)
+        sleep(retry_duration)
+        retry_duration *= 2
         retry
       end
     rescue => e
@@ -178,7 +181,8 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
           :error_class => e.class.name,
           :backtrace => e.backtrace
         )
-        sleep(1)
+        sleep(retry_duration)
+        retry_duration *= 2
         retry
       else
         @logger.error(
@@ -197,6 +201,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
 
   def is_retryable_code(response_error)
     error_code = response_error.response_code
-    !NON_RETRYABLE_CODES.include?(error_code)
+    RETRIABLE_CODES.include?(error_code)
   end
 end # class LogStash::Outputs::NewRelic

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

@@ -1,7 +1,7 @@
 module LogStash
   module Outputs
     module NewRelicVersion
-      VERSION = "1.4.0"
+      VERSION = "1.5.0"
     end
   end
 end

data/spec/outputs/newrelic_spec.rb

@@ -265,7 +265,7 @@ describe LogStash::Outputs::NewRelic do
     end
   end
 
-  context "error handling" do
+  context "error handling and retry logic" do
     it "continues through errors, future calls should still succeed" do
       stub_request(:any, base_uri)
         .to_raise(StandardError.new("from test"))
@@ -281,33 +281,41 @@ describe LogStash::Outputs::NewRelic do
         .to have_been_made
     end
 
-    it "retry when receive retryable http error code" do
-      stub_request(:any, base_uri)
-        .to_return(status: 500)
-        .to_return(status: 200)
-
-      event1 = LogStash::Event.new({ "message" => "Test message 1" })
-      @newrelic_output.multi_receive([event1])
-
-      wait_for(a_request(:post, base_uri)
-                 .with { |request| single_gzipped_message(request.body)['message'] == 'Test message 1' })
-        .to have_been_made.times(2)
-    end
-
-    it "not retry when receive a non retryable http error code" do
-      stub_request(:any, base_uri)
-        .to_return(status: 401)
-
-      event1 = LogStash::Event.new({ "message" => "Test message 1" })
-      @newrelic_output.multi_receive([event1])
-      # Due the async behavior we need to wait to be sure that the method was not called more than 1 time
-      sleep(2)
-      wait_for(a_request(:post, base_uri)
-                 .with { |request| single_gzipped_message(request.body)['message'] == 'Test message 1' })
-        .to have_been_made.times(1)
+    [
+      { "returned_status_code" => 200, "expected_to_retry" => false },
+      { "returned_status_code" => 202, "expected_to_retry" => false },
+      { "returned_status_code" => 400, "expected_to_retry" => false },
+      { "returned_status_code" => 404, "expected_to_retry" => false },
+      { "returned_status_code" => 408, "expected_to_retry" => true },
+      { "returned_status_code" => 429, "expected_to_retry" => true },
+      { "returned_status_code" => 500, "expected_to_retry" => true },
+      { "returned_status_code" => 502, "expected_to_retry" => true },
+      { "returned_status_code" => 503, "expected_to_retry" => true },
+      { "returned_status_code" => 504, "expected_to_retry" => true },
+      { "returned_status_code" => 599, "expected_to_retry" => true }
+    ].each do |test_case|
+      returned_status_code = test_case["returned_status_code"]
+      expected_to_retry = test_case["expected_to_retry"]
+
+      it "should #{expected_to_retry ? "" : "not"} retry on status code #{returned_status_code}" do
+        stub_request(:any, base_uri)
+          .to_return(status: returned_status_code)
+          .to_return(status: 200)
+
+        logstash_event = LogStash::Event.new({ "message" => "Test message" })
+        @newrelic_output.multi_receive([logstash_event])
+
+        expected_retries = expected_to_retry ? 2 : 1
+        wait_for(a_request(:post, base_uri)
+                   .with { |request| single_gzipped_message(request.body)['message'] == 'Test message' })
+          .to have_been_made.at_least_times(expected_retries)
+        wait_for(a_request(:post, base_uri)
+                   .with { |request| single_gzipped_message(request.body)['message'] == 'Test message' })
+          .to have_been_made.at_most_times(expected_retries)
+      end
     end
 
-    it "not retries when retry is disabled" do
+    it "does not retry when max_retries is set to 0" do
       @newrelic_output = LogStash::Plugin.lookup("output", "newrelic").new(
         { "base_uri" => base_uri, "license_key" => api_key, "max_retries" => '0' }
       )
@@ -324,7 +332,7 @@ describe LogStash::Outputs::NewRelic do
         .to have_been_made.times(1)
     end
 
-    it "retry when receive a not expected exception" do
+    it "retries when receive a not expected exception" do
       stub_request(:any, base_uri)
         .to_raise(StandardError.new("from test"))
         .to_return(status: 200)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - New Relic Logging Team