logstash-core 6.3.2-java → 6.4.0-java

data/spec/logstash/java_integration_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "spec_helper"
-require "logstash/java_integration"
 
 describe "Java integration" do
 

data/spec/logstash/java_pipeline_spec.rb

@@ -125,10 +125,6 @@ class NilFlushingFilterPeriodic < DummyFlushingFilter
   end
 end
 
-class JavaTestPipeline < LogStash::JavaPipeline
-  attr_reader :outputs, :settings
-end
-
 describe LogStash::JavaPipeline do
   let(:worker_thread_count)     { 5 }
   let(:safe_thread_count)       { 1 }
@@ -264,6 +260,7 @@ describe LogStash::JavaPipeline do
         end
 
         it "should print the compiled code if config.debug is set to true" do
+          skip("This test does not work when using a Java Logger and should be ported to JUnit")
           pipeline_settings_obj.set("config.debug", true)
           expect(logger).to receive(:debug).with(/Compiled pipeline/, anything)
           pipeline = mock_java_pipeline_from_string(test_config_with_filters, pipeline_settings_obj)

data/spec/logstash/modules/cli_parser_spec.rb

@@ -1,6 +1,4 @@
 require "spec_helper"
-require "logstash/logging"
-require "logstash/errors"
 require "logstash/modules/cli_parser"
 
 describe LogStash::Modules::CLIParser do
@@ -126,4 +124,4 @@ describe LogStash::Modules::CLIParser do
     end
   end
 
-end
+end

data/spec/logstash/modules/scaffold_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 #
-require "logstash/namespace"
 require "logstash/elasticsearch_client"
 require "logstash/modules/kibana_client"
 require "logstash/modules/kibana_config"

data/spec/logstash/outputs/base_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require "spec_helper"
 require "logstash/outputs/base"
-require "logstash/execution_context"
 require "support/shared_contexts"
 
 # use a dummy NOOP output to test Outputs::Base
@@ -20,7 +19,7 @@ end
 
 class LogStash::Outputs::NOOPShared < ::LogStash::Outputs::Base
   concurrency :shared
-  
+
   def register; end
 end
 
@@ -30,7 +29,7 @@ end
 
 class LogStash::Outputs::NOOPMultiReceiveEncoded < ::LogStash::Outputs::Base
   concurrency :single
-  
+
   def register; end
 
   def multi_receive_encoded(events_and_encoded)
@@ -38,12 +37,12 @@ class LogStash::Outputs::NOOPMultiReceiveEncoded < ::LogStash::Outputs::Base
 end
 
 describe "LogStash::Outputs::Base#new" do
-  let(:params) { {} }  
+  let(:params) { {} }
   subject(:instance) { klass.new(params.dup) }
 
   context "single" do
     let(:klass) { LogStash::Outputs::NOOPSingle }
-    
+
     it "should instantiate cleanly" do
       params = { "dummy_option" => "potatoes", "codec" => "json", "workers" => 2 }
       worker_params = params.dup; worker_params["workers"] = 1
@@ -58,7 +57,7 @@ describe "LogStash::Outputs::Base#new" do
 
   context "shared" do
     let(:klass) { LogStash::Outputs::NOOPShared }
-    
+
     it "should set concurrency correctly" do
       expect(subject.concurrency).to eq(:shared)
     end
@@ -66,7 +65,7 @@ describe "LogStash::Outputs::Base#new" do
 
   context "legacy" do
     let(:klass) { LogStash::Outputs::NOOPLegacy }
-    
+
     it "should set concurrency correctly" do
       expect(subject.concurrency).to eq(:legacy)
     end
@@ -105,16 +104,16 @@ describe "LogStash::Outputs::Base#new" do
   describe "dispatching multi_receive" do
     let(:event) { double("event") }
     let(:events) { [event] }
-    
+
     context "with multi_receive_encoded" do
       let(:klass) { LogStash::Outputs::NOOPMultiReceiveEncoded }
       let(:codec) { double("codec") }
       let(:encoded) { double("encoded") }
-      
+
       before do
         allow(codec).to receive(:multi_encode).with(events).and_return(encoded)
         allow(instance).to receive(:codec).and_return(codec)
-        allow(instance).to receive(:multi_receive_encoded)        
+        allow(instance).to receive(:multi_receive_encoded)
         instance.multi_receive(events)
       end
 

data/spec/logstash/pipeline_action/create_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
 require "logstash/pipeline_action/create"
-require "logstash/instrument/null_metric"
 require "logstash/inputs/generator"
 
 describe LogStash::PipelineAction::Create do
@@ -19,8 +18,8 @@ describe LogStash::PipelineAction::Create do
   subject { described_class.new(pipeline_config, metric) }
 
   after do
-    pipelines.each do |_, pipeline| 
-      pipeline.shutdown 
+    pipelines.each do |_, pipeline|
+      pipeline.shutdown
       pipeline.thread.join
     end
   end

data/spec/logstash/pipeline_action/reload_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
 require "logstash/pipeline_action/reload"
-require "logstash/instrument/null_metric"
 
 describe LogStash::PipelineAction::Reload do
   let(:metric) { LogStash::Instrument::NullMetric.new(LogStash::Instrument::Collector.new) }
@@ -22,7 +21,7 @@ describe LogStash::PipelineAction::Reload do
   end
 
   after do
-    pipelines.each do |_, pipeline| 
+    pipelines.each do |_, pipeline|
       pipeline.shutdown
       pipeline.thread.join
     end

data/spec/logstash/pipeline_action/stop_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 require_relative "../../support/helpers"
 require "logstash/pipeline_action/stop"
 require "logstash/pipeline"
-require "logstash/instrument/null_metric"
 
 describe LogStash::PipelineAction::Stop do
   let(:pipeline_config) { "input { generator {} } output { null {} }" }

data/spec/logstash/pipeline_dlq_commit_spec.rb

@@ -75,9 +75,6 @@ describe LogStash::Pipeline do
     let(:pipeline_id) { "test-dlq" }
 
     it "retrieves proper pipeline-level DLQ writer" do
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "input_id", "singlegenerator").and_call_original
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "filter_id", "dlq_commit").and_call_original
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "output_id", "dummyoutput").and_call_original
       expect_any_instance_of(org.logstash.common.io.DeadLetterQueueWriter).to receive(:close).and_call_original
       subject.run
       dlq_path = java.nio.file.Paths.get(pipeline_settings_obj.get("path.dead_letter_queue"), pipeline_id)
@@ -94,9 +91,6 @@ describe LogStash::Pipeline do
     let(:pipeline_id) { "test-without-dlq" }
 
     it "does not write to the DLQ" do
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "input_id", "singlegenerator").and_call_original
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "filter_id", "dlq_commit").and_call_original
-      expect(LogStash::Util::PluginDeadLetterQueueWriter).to receive(:new).with(anything, "output_id", "dummyoutput").and_call_original
       expect(LogStash::Util::DummyDeadLetterQueueWriter).to receive(:new).and_call_original
       expect_any_instance_of(LogStash::Util::DummyDeadLetterQueueWriter).to receive(:close).and_call_original
       subject.run

data/spec/logstash/pipeline_reporter_spec.rb

@@ -1,18 +1,17 @@
 # encoding: utf-8
 require "spec_helper"
 require "logstash/pipeline"
-require "logstash/pipeline_reporter"
 require_relative "../support/helpers"
 require_relative "../support/mocks_classes"
 
 #TODO: Figure out how to add more tests that actually cover inflight events
 #This will require some janky multithreading stuff
-describe LogStash::PipelineReporter do
+shared_examples "a pipeline reporter" do |pipeline_setup|
   let(:generator_count) { 5 }
   let(:config) do
     "input { generator { count => #{generator_count} } } output { dummyoutput {} } "
   end
-  let(:pipeline) { mock_pipeline_from_string(config)}
+  let(:pipeline) { Kernel.send(pipeline_setup, config)}
   let(:reporter) { pipeline.reporter }
 
   before do
@@ -21,7 +20,7 @@ describe LogStash::PipelineReporter do
     allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_call_original
 
     @pre_snapshot = reporter.snapshot
-    
+
     pipeline.run
     @post_snapshot = reporter.snapshot
   end
@@ -30,6 +29,16 @@ describe LogStash::PipelineReporter do
     pipeline.shutdown
   end
 
+  describe "stalling threads info" do
+    it "should start with no stalled threads" do
+      expect(@pre_snapshot.stalling_threads_info).to eql([])
+    end
+
+    it "should end with no stalled threads" do
+      expect(@pre_snapshot.stalling_threads_info).to eql([])
+    end
+  end
+
   describe "events filtered" do
     it "should start at zero" do
       expect(@pre_snapshot.events_filtered).to eql(0)
@@ -60,3 +69,8 @@ describe LogStash::PipelineReporter do
     end
   end
 end
+
+describe LogStash::PipelineReporter do
+  it_behaves_like "a pipeline reporter", :mock_pipeline_from_string
+  it_behaves_like "a pipeline reporter", :mock_java_pipeline_from_string
+end

data/spec/logstash/pipeline_spec.rb

@@ -118,10 +118,6 @@ class DummyFlushingFilterPeriodic < DummyFlushingFilter
   end
 end
 
-class TestPipeline < LogStash::Pipeline
-  attr_reader :outputs, :settings
-end
-
 describe LogStash::Pipeline do
   let(:worker_thread_count)     { 5 }
   let(:safe_thread_count)       { 1 }
@@ -370,7 +366,7 @@ describe LogStash::Pipeline do
       after do
         pipeline.shutdown
       end
-      
+
       it "should call close of output without output-workers" do
         pipeline.run
 
@@ -395,7 +391,7 @@ describe LogStash::Pipeline do
       # cause the suite to fail :(
       pipeline.close
     end
-    
+
     it "should use LIR provided IDs" do
       expect(pipeline.inputs.first.id).to eq(pipeline.lir.input_plugin_vertices.first.id)
       expect(pipeline.filters.first.id).to eq(pipeline.lir.filter_plugin_vertices.first.id)

data/spec/logstash/plugin_spec.rb

@@ -5,7 +5,6 @@ require "logstash/outputs/base"
 require "logstash/codecs/base"
 require "logstash/inputs/base"
 require "logstash/filters/base"
-require "logstash/execution_context"
 require "support/shared_contexts"
 
 describe LogStash::Plugin do
@@ -319,7 +318,7 @@ describe LogStash::Plugin do
         end
       end
 
-      subject { plugin.new(config) } 
+      subject { plugin.new(config) }
 
       context "when no metric is set to the plugin" do
         context "when `enable_metric` is TRUE" do

data/spec/logstash/plugins/hooks_registry_spec.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require "logstash/event_dispatcher"
-require "logstash/plugins/hooks_registry"
 
 describe LogStash::Plugins::HooksRegistry do
   class DummyEmitter

data/spec/logstash/queue_factory_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/queue_factory"
 require "logstash/settings"
 require "stud/temporary"
 

data/spec/logstash/runner_spec.rb

@@ -5,7 +5,6 @@ require "stud/task"
 require "stud/trap"
 require "stud/temporary"
 require "logstash/util/java_version"
-require "logstash/logging/json"
 require "logstash/config/source_loader"
 require "logstash/config/modules_common"
 require "logstash/modules/util"
@@ -43,6 +42,10 @@ describe LogStash::Runner do
     allow(agent).to receive(:shutdown)
   end
 
+  after(:each) do
+    LogStash::SETTINGS.get_value("modules_list").clear
+  end
+
   describe "argument precedence" do
     let(:config) { "input {} output {}" }
     let(:cli_args) { ["-e", config, "-w", "20"] }
@@ -83,23 +86,27 @@ describe LogStash::Runner do
 
   context "--pluginpath" do
     subject { LogStash::Runner.new("") }
-    let(:single_path) { "/some/path" }
-    let(:multiple_paths) { ["/some/path1", "/some/path2"] }
+    let(:valid_directory) { Stud::Temporary.directory }
+    let(:invalid_directory) { "/a/path/that/doesnt/exist" }
+    let(:multiple_paths) { [Stud::Temporary.directory, Stud::Temporary.directory] }
+
+    it "should pass -p contents to the configure_plugin_paths method" do
+      args = ["-p", valid_directory]
+      expect(subject).to receive(:configure_plugin_paths).with([valid_directory])
+      expect { subject.run(args) }.to_not raise_error
+    end
 
     it "should add single valid dir path to the environment" do
-      expect(File).to receive(:directory?).and_return(true)
-      expect(LogStash::Environment).to receive(:add_plugin_path).with(single_path)
-      subject.configure_plugin_paths(single_path)
+      expect(LogStash::Environment).to receive(:add_plugin_path).with(valid_directory)
+      subject.configure_plugin_paths(valid_directory)
     end
 
     it "should fail with single invalid dir path" do
-      expect(File).to receive(:directory?).and_return(false)
       expect(LogStash::Environment).not_to receive(:add_plugin_path)
-      expect{subject.configure_plugin_paths(single_path)}.to raise_error(Clamp::UsageError)
+      expect{subject.configure_plugin_paths(invalid_directory)}.to raise_error(Clamp::UsageError)
     end
 
     it "should add multiple valid dir path to the environment" do
-      expect(File).to receive(:directory?).exactly(multiple_paths.size).times.and_return(true)
       multiple_paths.each{|path| expect(LogStash::Environment).to receive(:add_plugin_path).with(path)}
       subject.configure_plugin_paths(multiple_paths)
     end

data/spec/logstash/settings/modules_spec.rb

@@ -34,19 +34,19 @@ describe LogStash::Setting::Modules do
     subject { described_class.new("mycloudid", LogStash::Util::CloudSettingId) }
     context "when given a string which is not a cloud id" do
       it "should raise an exception" do
-        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
       end
     end
 
     context "when given a string which is empty" do
       it "should raise an exception" do
-        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
       end
     end
 
     context "when given a string which is has environment prefix only" do
       it "should raise an exception" do
-        expect { subject.set("testing:") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+        expect { subject.set("testing:") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
       end
     end
 

data/spec/logstash/shutdown_watcher_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "spec_helper"
-require "logstash/shutdown_watcher"
 
 describe LogStash::ShutdownWatcher do
   let(:check_every) { 0.01 }
@@ -24,32 +23,6 @@ describe LogStash::ShutdownWatcher do
       allow(reporter_snapshot).to receive(:stalling_threads) { { } }
     end
 
-    describe ".unsafe_shutdown = true" do
-      let(:abort_threshold) { subject.abort_threshold }
-      let(:report_every) { subject.report_every }
-
-      before :each do
-        subject.class.unsafe_shutdown = true
-      end
-
-      it "should force the shutdown" do
-        expect(subject).to receive(:force_exit).once
-        subject.start
-      end
-
-      it "should do exactly \"abort_threshold\" stall checks" do
-        allow(subject).to receive(:force_exit)
-        expect(subject).to receive(:shutdown_stalled?).exactly(abort_threshold).times.and_call_original
-        subject.start
-      end
-
-      it "should do exactly \"abort_threshold\"*\"report_every\" stall checks" do
-        allow(subject).to receive(:force_exit)
-        expect(subject).to receive(:pipeline_report_snapshot).exactly(abort_threshold*report_every).times.and_call_original
-        subject.start
-      end
-    end
-
     describe ".unsafe_shutdown = false" do
 
       before :each do

data/spec/logstash/state_resolver_spec.rb

@@ -4,7 +4,6 @@ require_relative "../support/helpers"
 require_relative "../support/matchers"
 require "logstash/state_resolver"
 require "logstash/config/pipeline_config"
-require "logstash/instrument/null_metric"
 require "logstash/pipeline"
 require "ostruct"
 require "digest"

data/spec/logstash/util/buftok_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "spec_helper"
-require "logstash/util/buftok"
 
 describe  FileWatch::BufferedTokenizer  do