logstash-devutils 2.0.0-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9529292d4be6bf7ae845758206433d9fff38a8fdf068d4eee49581a595022563
-  data.tar.gz: '09bac2f78a40a15e156f893929a0113bb815234f5e24dacd0b806d94a7db7784'
+  metadata.gz: bbe4f7fcac7be8836722ca86c35bfb15ee88755b3e86090a48dc06c4956d8924
+  data.tar.gz: 9d0878398c1ea6025c093c4a5d52fa0dd44610337e236565b2801b301bfcdbf4
 SHA512:
-  metadata.gz: 2c1f07ee224a06900492e5421031b1f8e4a15705edf0feb91bfe4279853cb30a3bd248933209e20e16d91e19c65f7b8dd6e29b5a75ee293b80c5e3c5032aa4b9
-  data.tar.gz: 1b151df23dd77671425a0874a4b0903de5460d10f93a8b521c8019ff4f71965b8ff52089d2978eebe3dfd0b91e1342dac9ecaffbde6a3fa3735a7a938482b81e
+  metadata.gz: d01f4d24ac50a2b5cb26037e85035d6201626de2f3caf059e12166589f9a1f45b7e4043b887d3894befd9084858a00d1e0e1f2884a2dfa2c9acc36d3d2656638
+  data.tar.gz: fc51d639ee289af95294609389be443dd264603b03c31432def9552b9d30a6274f29c0390f2b1a97fa7470a02bb8271b4283c3796355a017e95010cfd0b41960

data/lib/logstash/devutils/rspec/logstash_helpers.rb

@@ -88,16 +88,21 @@ module LogStashHelper
     end
   end # def sample
 
+  org.logstash.config.ir.compiler.OutputStrategyExt::SimpleAbstractOutputStrategyExt.class_eval do
+    field_reader :output # available since LS 6.3
+  end
+
   def input(config_string, test_sink: {}, &block); require 'logstash/outputs/test_sink'
     config_parts = [ config_source(config_string), test_sink_output_source(**test_sink) ]
 
-    # TODO unwrapping output from LogStash::OutputDelegator is cumbersome
-    instances = LogStash::Outputs::TestSink::TRACKER.keys.to_a
     pipeline = new_pipeline(config_parts)
 
-    start_thread = pipeline.start_and_wait
+    output_delegator = pipeline.outputs.last # LogStash::OutputDelegator
+    fail('test_sink output expected') unless output_delegator.config_name.eql?('test_sink')
+    test_sink_output = output_delegator.strategy.to_java.output
+    queue = test_sink_output.init_event_store
 
-    queue = (LogStash::Outputs::TestSink::TRACKER.keys.to_a - instances).first.event_store
+    start_thread = pipeline.start_and_wait
 
     # NOTE: we used to pass a Queue here, now its a Java List/Queue collection
     result = block.call(pipeline, queue)

data/lib/logstash/outputs/test_sink.rb

@@ -22,7 +22,7 @@ class LogStash::Outputs::TestSink < LogStash::Outputs::Base
 
   # @override plugin hook
   def register
-    TRACKER[self] = Queue.new(@event_poll_timeout.to_f * 1000)
+    TRACKER[self] = @_event_store || init_event_store
   end
 
   # @override plugin impl
@@ -32,7 +32,8 @@ class LogStash::Outputs::TestSink < LogStash::Outputs::Base
 
   # @override plugin hook
   def close
-    TRACKER.delete(self) if release_on_close?
+    TRACKER.delete(self)
+    @_event_store = false if release_on_close?
   end
 
   def store_events?
@@ -50,7 +51,24 @@ class LogStash::Outputs::TestSink < LogStash::Outputs::Base
 
   # @return [Queue] (enumerable) event store
   def event_store
-    TRACKER[self] || raise("#{self} not registered; please call plugin.register before use")
+    if @_event_store.nil?
+      warn("#{self} event store not initialized (call plugin.register to initialize)", caller_locations(2))
+      return init_event_store
+    elsif @_event_store.eql?(false)
+      warn("#{self} closed - event store no longer available (release_on_close => false if you need to retain events)", caller_locations(2))
+      return nil
+    end
+    @_event_store
+  end
+
+  def init_event_store
+    @_event_store = Queue.new(@event_poll_timeout.to_f * 1000)
+  end
+
+  private
+
+  def warn(msg, callstack = nil)
+    Kernel.warn("#{msg}#{callstack ? " called from #{callstack.first}" : nil}")
   end
 
   # TODO refactor to java.util.concurrent.ConcurrentLinkedQueue

data/logstash-devutils.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "logstash-devutils"
-  spec.version = "2.0.0"
+  spec.version = "2.0.1"
   spec.license = "Apache-2.0"
   spec.authors = ["Elastic"]
   spec.email = "info@elastic.co"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-devutils
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement