logstash-devutils 2.0.0-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9529292d4be6bf7ae845758206433d9fff38a8fdf068d4eee49581a595022563
-  data.tar.gz: '09bac2f78a40a15e156f893929a0113bb815234f5e24dacd0b806d94a7db7784'
+  metadata.gz: 337f5f3afb2fb0f3cdadd3638a51544ae9ef9341d1e0b85c2e04e73d57444b95
+  data.tar.gz: e22d45719fec1178d3b8ddf37f74143079f966284d20bd0e62bebb3705ee57ca
 SHA512:
-  metadata.gz: 2c1f07ee224a06900492e5421031b1f8e4a15705edf0feb91bfe4279853cb30a3bd248933209e20e16d91e19c65f7b8dd6e29b5a75ee293b80c5e3c5032aa4b9
-  data.tar.gz: 1b151df23dd77671425a0874a4b0903de5460d10f93a8b521c8019ff4f71965b8ff52089d2978eebe3dfd0b91e1342dac9ecaffbde6a3fa3735a7a938482b81e
+  metadata.gz: ca692d8bf918ed22d32a931807fd1c3b1d6803f6ef651c68d450fdcf60740fe171ab1c7e217b4fb53c79d4090f9de45232afd1459529b3f08d96452236b5ef04
+  data.tar.gz: 63db7429bda9155d9dc8ccb50aa8b94550ce11c642b4af926277ebaaf7a30fdbfdbb59bddfa4671edb680acfa8f289cd3c1febfa1d194598aa1c180cdadfc55d

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.1.0
+ - Remove ruby pipeline dependency
+
+## 2.0.4
+ - Fix: avoid double registering filters on `sample` spec helper
+
+## 2.0.3
+ - Fix: add missing `events` method to QueuedBatchDelegator, which was causing test failures
+ after https://github.com/elastic/logstash/pull/11737 was committed.
+
+## 2.0.2
+ - Fix: add plain codec as runtime dependency for TestPipeline helper
+
+## 2.0.1
+ - Fix: unwrap output and refactor test sink (#82)
+
 ## 2.0.0
  - Reinvented helpers using Java pipeline, only LS >= 6.x (JRuby >= 9.1) is supported.
  - [BREAKING] changes:

data/Gemfile

@@ -3,4 +3,5 @@ gemspec
 
 if Dir.exist?(logstash_path = ENV["LOGSTASH_PATH"])
   gem 'logstash-core', path: "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', path: "#{logstash_path}/logstash-core-plugin-api"
 end

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

@@ -67,8 +67,7 @@ module LogStashHelper
       end
 
       let(:results) do
-        pipeline.filters.each(&:register)
-
+        # Java pipeline (since 6.1) registers filters from start_workers
         pipeline.run_with(event)
 
         # flush makes sure to empty any buffered events in the filter
@@ -88,16 +87,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/devutils/rspec/spec_helper.rb

@@ -29,7 +29,7 @@ if RUBY_VERSION < "2.3"
   raise LoadError.new("Ruby >= 2.3.0 or later is required. (You are running: " + RUBY_VERSION + ")")
 end
 
-if level = (ENV["TEST_DEBUG"] || ENV['LOGGER_LEVEL'])
+if level = (ENV['LOG_LEVEL'] || ENV['LOGGER_LEVEL'] || ENV["TEST_DEBUG"])
   logger, level = level.split('=') # 'logstash.filters.grok=DEBUG'
   level, logger = logger, nil if level.nil? # only level given e.g. 'DEBUG'
   level = org.apache.logging.log4j.Level.toLevel(level, org.apache.logging.log4j.Level::WARN)

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/lib/logstash/test_pipeline.rb

@@ -1,4 +1,3 @@
-require "logstash/pipeline"
 require "logstash/java_pipeline"
 
 module LogStash
@@ -151,6 +150,13 @@ module LogStash
         @delegate.to_java.filtered_size
       end
 
+      def events
+        @delegate.events.tap do |events|
+          # filters out rogue (cancelled) events
+          @event_tracker.filtered_events events
+        end
+      end
+
       # @override void merge(IRubyObject event);
       def merge(event)
         @delegate.merge(event)

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.1.0"
   spec.license = "Apache-2.0"
   spec.authors = ["Elastic"]
   spec.email = "info@elastic.co"
@@ -45,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "kramdown", '1.14.0'
   spec.add_runtime_dependency "stud", " >= 0.0.20"
   spec.add_runtime_dependency "fivemat"
+  spec.add_runtime_dependency "logstash-codec-plain"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-devutils
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-codec-plain
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: logstash-devutils gem is meant to be used as a development dependency
   from other plugins/gems.
 email: info@elastic.co