logstash-devutils 2.0.1-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe4f7fcac7be8836722ca86c35bfb15ee88755b3e86090a48dc06c4956d8924
-  data.tar.gz: 9d0878398c1ea6025c093c4a5d52fa0dd44610337e236565b2801b301bfcdbf4
+  metadata.gz: bbd9bcbe08648ad69e9cbf9781acbebfa5168e0c9c8be8a253620b1ec20bb6f4
+  data.tar.gz: a91b1a94368455897c54bc705f4a647c89919e7964ed568cf909d9c477b2e35b
 SHA512:
-  metadata.gz: d01f4d24ac50a2b5cb26037e85035d6201626de2f3caf059e12166589f9a1f45b7e4043b887d3894befd9084858a00d1e0e1f2884a2dfa2c9acc36d3d2656638
-  data.tar.gz: fc51d639ee289af95294609389be443dd264603b03c31432def9552b9d30a6274f29c0390f2b1a97fa7470a02bb8271b4283c3796355a017e95010cfd0b41960
+  metadata.gz: e5d3faadbce4f82285d54231a742cc3ebae7f8da46cc575ddd55a3f9ac51488ff5b79af8b52956c7de9672c61080c80a6a5206dfe618f7f76f2b9844cb476ac4
+  data.tar.gz: 4c7b243ebed7a5747b35315f2c88059aa32f498af5d34f6096ad5df9a6b6f1122b0c5e87649b3e7b97351bd757dffd811302335deaa200a60471d06829368696

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2.2.0
+ - Add `allowed_lag` config for shared input interruptiblity spec
+
+## 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/Rakefile

@@ -1,2 +1,3 @@
 raise "only JRuby is supported" unless defined? JRUBY_VERSION
 require 'bundler/gem_tasks'
+require 'logstash/devutils/rake'

data/lib/logstash/devutils/rake/publish.rake

@@ -10,7 +10,7 @@ if RUBY_PLATFORM == "java"
         cmd = Shellwords.join(arguments)
         Open3.popen3(cmd) do |_i, stdout, stderr, thr|
           output = [stderr.read, stdout.read].join.strip
-          raise Error, output if thr.value.exitstatus > 0
+          raise Error, "`#{cmd}` -> #{output}" if thr.value.exitstatus > 0
           return output
         end
       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

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

@@ -1,6 +1,10 @@
 require 'rspec/wait'
 
 RSpec.shared_examples "an interruptible input plugin" do
+  # why 3? 2 is not enough, 4 is too much..
+  # a plugin that is known to be slower can override
+  let(:allowed_lag) { 3 }
+
   describe "#stop" do
     let(:queue) { SizedQueue.new(20) }
     subject { described_class.new(config) }
@@ -14,8 +18,7 @@ RSpec.shared_examples "an interruptible input plugin" do
       expect(plugin_thread).to be_alive
       # now let's actually stop the plugin
       subject.do_stop
-      # why 3? 2 is not enough, 4 is too much..
-      wait(3).for { plugin_thread }.to_not be_alive
+      wait(allowed_lag).for { plugin_thread }.to_not be_alive
     end
   end
 end

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/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.1"
+  spec.version = "2.2.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.1
+  version: 2.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2021-04-14 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
@@ -178,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: An assortment of tooling/libraries to make Logstash plugin development and