logstash-output-newrelic 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e227255c0f05ab2bbd664c45fd3ed25e7edfc9e15481255052688c5dfd1ddd2e
-  data.tar.gz: f3add56ccb74bac8b9f6106f9862254250c6adab4d79723c9fb89940dd5f2c5d
+  metadata.gz: 15a58f1472c4f00bc1decbd672cf520a247d192eb6b31b348bc6daa77f2ea27c
+  data.tar.gz: f71834a29f1507c3948d9044826b7c2cc23e249121b57dacd65103bc8d22f742
 SHA512:
-  metadata.gz: 5b1e8ffc8dacea562486112bdca20cff806da7b21336d3e03612cda334fbb0882c26b6f3ce6e230f1f53c5b8e56627bd675009b0c4bc2741d2628999a434375c
-  data.tar.gz: 6bd40c68709a7c1fc63bcb9002e538b49a340526c00e617cdfb3e7b988393b705b12179732cf4a93fcab05dad067789e8c1219b3466483d248d3d23878b1f39f
+  metadata.gz: 9db4eb7268c9c401932ff4bfd2055ca8475c69c962d3a99f41dec89e51833f6b9c527eb887b65d520d20e322401798a231cb5ae53c7d8c78c3bc6581cef77d29
+  data.tar.gz: b95f9564bd9f6c51d38a3995c86733b78cdaa9cb474ffda178a05006d6f10f47e4fbdb31e1934e0e4e9f31821487dd26be65a49f617c503add87fa394d689982

data/lib/logstash/outputs/newrelic.rb

@@ -36,6 +36,12 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   # Used by tests so that the test run can complete (background threads prevent JVM exit)
   def shutdown
     @executor&.shutdown
+    # We want this long enough to not have threading issues
+    terminationWaitInSeconds = 10
+    terminatedInTime = @executor&.awaitTermination(terminationWaitInSeconds, java.util.concurrent.TimeUnit::SECONDS)
+    if !terminatedInTime
+      raise "Did not shut down within #{terminationWaitInSeconds} seconds"
+    end
   end
 
   def time_to_logstash_timestamp(time)
@@ -67,6 +73,10 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   end
 
   def multi_receive(events)
+    if events.size == 0
+      return
+    end
+
     payload = []
     events.each do |event|
       payload.push(encode(event.to_hash))

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

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

data/spec/outputs/newrelic_spec.rb

@@ -193,6 +193,19 @@ describe LogStash::Outputs::NewRelic do
       .to have_been_made
     end
 
+    it "zero events should not cause an HTTP call" do
+      stub_request(:any, base_uri).to_return(status: 200)
+
+      @newrelic_output.multi_receive([])
+
+      # Shut down the plugin so that it has the chance to send a request
+      # (since we're verifying that nothing is sent)
+      @newrelic_output&.shutdown
+
+      expect(a_request(:post, base_uri))
+          .not_to have_been_made
+    end
+
     it "multiple events" 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.7
+  version: 1.0.8
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement