logstash-core 5.6.16-java → 6.0.0.alpha1-java

data/spec/logstash/pipeline_pq_file_spec.rb

@@ -79,7 +79,7 @@ describe LogStash::Pipeline do
   let(:number_of_events) { 100_000 }
   let(:page_capacity) { 1 * 1024 * 512 } # 1 128
   let(:max_bytes) { 1024 * 1024 * 1024 } # 1 gb
-  let(:queue_type) { "persisted" } #  "memory"
+  let(:queue_type) { "persisted" } #  "memory" "memory_acked"
   let(:times) { [] }
 
   let(:pipeline_thread) do

data/spec/logstash/pipeline_spec.rb

@@ -3,9 +3,8 @@ require "spec_helper"
 require "logstash/inputs/generator"
 require "logstash/filters/multiline"
 require_relative "../support/mocks_classes"
+require_relative "../support/helpers"
 require_relative "../logstash/pipeline_reporter_spec" # for DummyOutput class
-require "stud/try"
-require 'timeout'
 
 class DummyInput < LogStash::Inputs::Base
   config_name "dummyinput"
@@ -82,21 +81,6 @@ class DummySafeFilter < LogStash::Filters::Base
   def close() end
 end
 
-class DummyFlushingFilter < LogStash::Filters::Base
-  config_name "dummyflushingfilter"
-  milestone 2
-
-  def register() end
-  def filter(event) end
-  def periodic_flush
-    true
-  end
-  def flush(options)
-    return [::LogStash::Event.new("message" => "dummy_flush")]
-  end
-  def close() end
-end
-
 class TestPipeline < LogStash::Pipeline
   attr_reader :outputs, :settings
 end
@@ -105,24 +89,20 @@ describe LogStash::Pipeline do
   let(:worker_thread_count)     { 5 }
   let(:safe_thread_count)       { 1 }
   let(:override_thread_count)   { 42 }
-  let(:dead_letter_queue_enabled) { false }
-  let(:dead_letter_queue_path) { }
-  let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
+  let(:pipeline_settings_obj) { LogStash::SETTINGS }
   let(:pipeline_settings) { {} }
-  let(:max_retry) {10} #times
-  let(:timeout) {120} #seconds
 
   before :each do
     pipeline_workers_setting = LogStash::SETTINGS.get_setting("pipeline.workers")
     allow(pipeline_workers_setting).to receive(:default).and_return(worker_thread_count)
-    dlq_enabled_setting = LogStash::SETTINGS.get_setting("dead_letter_queue.enable")
-    allow(dlq_enabled_setting).to receive(:value).and_return(dead_letter_queue_enabled)
-    dlq_path_setting = LogStash::SETTINGS.get_setting("path.dead_letter_queue")
-    allow(dlq_path_setting).to receive(:value).and_return(dead_letter_queue_path)
-
     pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
   end
 
+  after :each do
+    pipeline_settings_obj.reset
+  end
+
+
   describe "event cancellation" do
     # test harness for https://github.com/elastic/logstash/issues/6055
 
@@ -161,16 +141,12 @@ describe LogStash::Pipeline do
 
       pipeline = LogStash::Pipeline.new(config, pipeline_settings_obj)
       t = Thread.new { pipeline.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(3).for do
-          # give us a bit of time to flush the events
-          # puts("*****" + output.events.map{|e| e.message}.to_s)
-          output.events.map{|e| e.get("message")}.include?("END")
-        end.to be_truthy
-      end
+      sleep(0.1) until pipeline.ready?
+      wait(3).for do
+        # give us a bit of time to flush the events
+        # puts("*****" + output.events.map{|e| e.message}.to_s)
+        output.events.map{|e| e.get("message")}.include?("END")
+      end.to be_truthy
       expect(output.events.size).to eq(2)
       expect(output.events[0].get("tags")).to eq(["notdropped"])
       expect(output.events[1].get("tags")).to eq(["notdropped"])
@@ -228,14 +204,6 @@ describe LogStash::Pipeline do
           pipeline = TestPipeline.new(test_config_with_filters, pipeline_settings_obj)
           pipeline.close
         end
-
-        it "should log each filtered event if config.debug is set to true" do
-          pipeline_settings_obj.set("config.debug", true)
-          pipeline = TestPipeline.new(test_config_with_filters, pipeline_settings_obj)
-          expect(logger).to receive(:debug).with(/filter received/, anything)
-          pipeline.filter_func([LogStash::Event.new])
-          pipeline.close
-        end
       end
 
       context "when there is no command line -w N set" do
@@ -243,7 +211,7 @@ describe LogStash::Pipeline do
           msg = "Defaulting pipeline worker threads to 1 because there are some filters that might not work with multiple worker threads"
           pipeline = TestPipeline.new(test_config_with_filters)
           expect(pipeline.logger).to receive(:warn).with(msg,
-            {:count_was=>worker_thread_count, :filters=>["dummyfilter"]})
+            hash_including({:count_was=>worker_thread_count, :filters=>["dummyfilter"]}))
           pipeline.run
           expect(pipeline.worker_threads.size).to eq(safe_thread_count)
           pipeline.shutdown
@@ -256,8 +224,7 @@ describe LogStash::Pipeline do
           msg = "Warning: Manual override - there are filters that might" +
                 " not work with multiple worker threads"
           pipeline = TestPipeline.new(test_config_with_filters, pipeline_settings_obj)
-          expect(pipeline.logger).to receive(:warn).with(msg,
-            {:worker_threads=> override_thread_count, :filters=>["dummyfilter"]})
+          expect(pipeline.logger).to receive(:warn).with(msg, hash_including({:worker_threads=> override_thread_count, :filters=>["dummyfilter"]}))
           pipeline.run
           expect(pipeline.worker_threads.size).to eq(override_thread_count)
           pipeline.shutdown
@@ -283,7 +250,6 @@ describe LogStash::Pipeline do
       }
 
       it "starts multiple filter threads" do
-        skip("This test has been failing periodically since November 2016. Tracked as https://github.com/elastic/logstash/issues/6245")
         pipeline = TestPipeline.new(test_config_with_filters)
         pipeline.run
         expect(pipeline.worker_threads.size).to eq(worker_thread_count)
@@ -427,9 +393,7 @@ describe LogStash::Pipeline do
       # race condition if called in the thread
       p = pipeline
       t = Thread.new { p.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
+      sleep(0.1) until pipeline.ready?
       pipeline.shutdown
       t.join
     end
@@ -442,7 +406,7 @@ describe LogStash::Pipeline do
       let(:batch_size) { LogStash::Pipeline::MAX_INFLIGHT_WARN_THRESHOLD + 1 }
 
       it "should raise a max inflight warning if the max_inflight count is exceeded" do
-        expect(logger).to have_received(:warn).with(warning_prefix)
+        expect(logger).to have_received(:warn).with(warning_prefix, hash_including(:pipeline_id => anything))
       end
     end
   end
@@ -593,23 +557,30 @@ describe LogStash::Pipeline do
 
     it "should handle evaluating different config" do
       expect(pipeline1.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
+      expect(pipeline1.filter_func(LogStash::Event.new)).not_to include(nil)
       expect(pipeline2.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
+      expect(pipeline1.filter_func(LogStash::Event.new)).not_to include(nil)
     end
   end
 
   context "Periodic Flush" do
+    let(:number_of_events) { 100 }
     let(:config) do
       <<-EOS
       input {
-        dummy_input {}
+        generator {
+          count => #{number_of_events}
+        }
       }
       filter {
-        dummy_flushing_filter {}
+        multiline {
+          pattern => "^NeverMatch"
+          negate => true
+          what => "previous"
+        }
       }
       output {
-        dummy_output {}
+        dummyoutput {}
       }
       EOS
     end
@@ -617,31 +588,24 @@ describe LogStash::Pipeline do
 
     before do
       allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
       allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "multiline").and_return(LogStash::Filters::Multiline)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
     end
 
-    it "flush periodically" do
+    it "flushes the buffered contents of the filter" do
       Thread.abort_on_exception = true
-
       pipeline = LogStash::Pipeline.new(config, pipeline_settings_obj)
       t = Thread.new { pipeline.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(10).for do
-          # give us a bit of time to flush the events
-          output.events.empty?
-        end.to be_falsey
-      end
-
-      expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
-
+      sleep(0.1) until pipeline.ready?
+      wait(3).for do
+        # give us a bit of time to flush the events
+        output.events.empty?
+      end.to be_falsey
+      event = output.events.pop
+      expect(event.get("message").count("\n")).to eq(99)
       pipeline.shutdown
-
       t.join
     end
   end
@@ -676,9 +640,9 @@ describe LogStash::Pipeline do
       # in the current instance and was returning an array containing nil values for
       # the match.
       expect(pipeline1.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
+      expect(pipeline1.filter_func(LogStash::Event.new)).not_to include(nil)
       expect(pipeline2.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
+      expect(pipeline1.filter_func(LogStash::Event.new)).not_to include(nil)
     end
   end
 
@@ -736,12 +700,9 @@ describe LogStash::Pipeline do
         # subject must be first call outside the thread context because of lazy initialization
         s = subject
         t = Thread.new { s.run }
-        Timeout.timeout(timeout) do
-          sleep(0.1) until subject.ready?
-        end
-        Timeout.timeout(timeout) do
-          sleep(0.1)
-        end
+        sleep(0.1) until subject.ready?
+
+        sleep(0.1)
         expect(subject.uptime).to be > 0
         subject.shutdown
         t.join
@@ -805,17 +766,13 @@ describe LogStash::Pipeline do
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
 
       pipeline_thread
-      Timeout.timeout(timeout) do
-        sleep(0.1) until subject.ready?
-      end
+      sleep(0.1) until subject.ready?
 
       # make sure we have received all the generated events
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(3).for do
-          # give us a bit of time to flush the events
-          dummyoutput.events.size >= number_of_events
-        end.to be_truthy
-      end
+      wait(3).for do
+        # give us a bit of time to flush the events
+        dummyoutput.events.size >= number_of_events
+      end.to be_truthy
     end
 
     after :each do
@@ -872,33 +829,6 @@ describe LogStash::Pipeline do
           expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:name].value).to eq(LogStash::Filters::Multiline.config_name)
         end
       end
-
-      context 'when dlq is disabled' do
-        let (:collect_stats) { subject.collect_dlq_stats}
-        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
-        let (:available_stats) {[:path, :queue_size_in_bytes]}
-
-        it 'should show not show any dlq stats' do
-          collect_stats
-          expect(collected_stats).to be_nil
-        end
-
-      end
-
-      context 'when dlq is enabled' do
-        let (:dead_letter_queue_enabled) { true }
-        let (:dead_letter_queue_path) { Stud::Temporary.directory }
-        let (:pipeline_dlq_path) { "#{dead_letter_queue_path}/#{pipeline_id}"}
-
-        let (:collect_stats) { subject.collect_dlq_stats }
-        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
-
-        it 'should show dlq stats' do
-          collect_stats
-          # A newly created dead letter queue with no entries will have a size of 1 (the version 'header')
-          expect(collected_stats[:queue_size_in_bytes].value).to eq(1)
-        end
-      end
     end
   end
 
@@ -925,38 +855,52 @@ describe LogStash::Pipeline do
     end
   end
 
-  describe "#system?" do
+  context "#system" do
     after do
       pipeline.close # close the queue
     end
 
-    let(:pipeline) { LogStash::Pipeline.new(config_string, settings) }
-    let(:config_string) { "input { generator {} } output { null {} }" }
-
     context "when the pipeline is a system pipeline" do
-      let(:settings) do
-        s = LogStash::SETTINGS.clone
-        s.set("pipeline.system", true)
-        s.set("config.string", config_string)
-        s
+      let(:pipeline) { LogStash::Pipeline.new("input { generator {} } output { null {} }", mock_settings("pipeline.system" => true)) }
+      it "returns true" do
+        expect(pipeline.system?).to be_truthy
       end
+    end
 
+    context "when the pipeline is not a system pipeline" do
+      let(:pipeline) { LogStash::Pipeline.new("input { generator {} } output { null {} }", mock_settings("pipeline.system" => false)) }
+      it "returns true" do
+        expect(pipeline.system?).to be_falsey
+      end
+    end
+  end
+
+  context "#reloadable?" do
+    after do
+      pipeline.close # close the queue
+    end
+
+    context "when all plugins are reloadable and pipeline is configured as reloadable" do
+      let(:pipeline) { LogStash::Pipeline.new("input { generator {} } output { null {} }", mock_settings("pipeline.reloadable" => true)) }
 
       it "returns true" do
-        expect(pipeline.system?).to be_truthy
+        expect(pipeline.reloadable?).to be_truthy
       end
     end
 
-    context "when the pipeline is not a system pipeline" do
-      let(:settings) do
-        s = LogStash::SETTINGS.clone
-        s.set("pipeline.system", false)
-        s.set("config.string", config_string)
-        s
+    context "when the plugins are not reloadable and pipeline is configured as reloadable" do
+      let(:pipeline) { LogStash::Pipeline.new("input { stdin {} } output { null {} }", mock_settings("pipeline.reloadable" => true)) }
+
+      it "returns true" do
+        expect(pipeline.reloadable?).to be_falsey
       end
+    end
+
+    context "when all plugins are reloadable and pipeline is configured as non-reloadable" do
+      let(:pipeline) { LogStash::Pipeline.new("input { generator {} } output { null {} }", mock_settings("pipeline.reloadable" => false)) }
 
       it "returns true" do
-        expect(pipeline.system?).to be_falsey
+        expect(pipeline.reloadable?).to be_falsey
       end
     end
   end

data/spec/logstash/plugin_spec.rb

@@ -6,6 +6,7 @@ require "logstash/codecs/base"
 require "logstash/inputs/base"
 require "logstash/filters/base"
 require "logstash/execution_context"
+require "support/shared_contexts"
 
 describe LogStash::Plugin do
   context "reloadable" do
@@ -45,10 +46,10 @@ describe LogStash::Plugin do
 
   context "#execution_context" do
     subject { Class.new(LogStash::Plugin).new({}) }
+    include_context "execution_context"
 
     it "can be set and get" do
       expect(subject.execution_context).to be_nil
-      execution_context = LogStash::ExecutionContext.new(:main, "id", "type", nil)
       subject.execution_context = execution_context
       expect(subject.execution_context).to eq(execution_context)
     end

data/spec/logstash/plugins/hooks_registry_spec.rb

@@ -48,6 +48,12 @@ describe LogStash::Plugins::HooksRegistry do
     expect { subject.register_hooks(emitter.class, listener) }.to change { subject.hooks_count(emitter.class) }.by(1)
   end
 
+  it "verifies if a hook is registered to a specific emitter scope" do
+    subject.register_hooks(emitter.class, listener)
+    expect(subject.registered_hook?(emitter.class, listener.class)).to be_truthy
+    expect(subject.registered_hook?(Class.new, listener.class)).to be_falsey
+  end
+
   it "link the emitter class to the listener" do
     subject.register_emitter(emitter.class, emitter.dispatcher)
     subject.register_hooks(emitter.class, listener)

data/spec/logstash/queue_factory_spec.rb

@@ -8,7 +8,7 @@ describe LogStash::QueueFactory do
   let(:settings_array) do
     [
       LogStash::Setting::WritableDirectory.new("path.queue", Stud::Temporary.pathname),
-      LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
+      LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
       LogStash::Setting::Bytes.new("queue.page_capacity", "250mb"),
       LogStash::Setting::Bytes.new("queue.max_bytes", "1024mb"),
       LogStash::Setting::Numeric.new("queue.max_events", 0),
@@ -57,6 +57,18 @@ describe LogStash::QueueFactory do
     end
   end
 
+  context "when `queue.type` is `memory_acked`" do
+    before do
+      settings.set("queue.type", "memory_acked")
+    end
+
+    it "returns a `WrappedAckedQueue`" do
+      queue =  subject.create(settings)
+      expect(queue).to be_kind_of(LogStash::Util::WrappedAckedQueue)
+      queue.close
+    end
+  end
+
   context "when `queue.type` is `memory`" do
     before do
       settings.set("queue.type", "memory")

data/spec/logstash/runner_spec.rb

@@ -6,12 +6,9 @@ require "stud/trap"
 require "stud/temporary"
 require "logstash/util/java_version"
 require "logstash/logging/json"
-require "logstash/config/modules_common"
-require "logstash/modules/util"
-require "logstash/elasticsearch_client"
+require "logstash/config/source_loader"
 require "json"
 require_relative "../support/helpers"
-require_relative "../support/matchers"
 
 class NullRunner
   def run(args); end
@@ -24,6 +21,8 @@ describe LogStash::Runner do
   let(:agent) { double("agent") }
 
   before :each do
+    clear_data_dir
+
     allow(LogStash::Runner).to receive(:logger).and_return(logger)
     allow(logger).to receive(:debug?).and_return(true)
     allow(logger).to receive(:subscribe).with(any_args)
@@ -36,13 +35,16 @@ describe LogStash::Runner do
     allow(LogStash::Logging::Logger).to receive(:configure_logging) do |level, path|
       allow(logger).to receive(:level).and_return(level.to_sym)
     end
-    allow(LogStash::Logging::Logger).to receive(:reconfigure).with(any_args)
+
     # Make sure we don't start a real pipeline here.
     # because we cannot easily close the pipeline
     allow(LogStash::Agent).to receive(:new).with(any_args).and_return(agent)
     allow(agent).to receive(:execute)
     allow(agent).to receive(:shutdown)
-    allow(agent).to receive(:register_pipeline)
+  end
+
+  after :each do
+    LogStash::SETTINGS.reset
   end
 
   describe "argument precedence" do
@@ -54,11 +56,15 @@ describe LogStash::Runner do
       allow(LogStash::SETTINGS).to receive(:read_yaml).and_return(settings_yml_hash)
     end
 
+    after :each do
+      LogStash::SETTINGS.reset
+    end
+
     it "favors the last occurence of an option" do
       expect(LogStash::Agent).to receive(:new) do |settings|
         expect(settings.get("config.string")).to eq(config)
         expect(settings.get("pipeline.workers")).to eq(20)
-      end
+      end.and_return(agent)
       subject.run("bin/logstash", cli_args)
     end
   end
@@ -73,7 +79,6 @@ describe LogStash::Runner do
 
       before do
         allow(agent).to receive(:shutdown)
-        allow(agent).to receive(:register_pipeline)
       end
 
       it "should execute the agent" do
@@ -138,13 +143,16 @@ describe LogStash::Runner do
   end
 
   describe "--config.test_and_exit" do
+    before do
+      # Reset the source in a clean state before any asserts
+      LogStash::Config::SOURCE_LOADER.configure_sources([])
+    end
     subject { LogStash::Runner.new("") }
     let(:args) { ["-t", "-e", pipeline_string] }
 
     context "with a good configuration" do
       let(:pipeline_string) { "input { } filter { } output { }" }
       it "should exit successfully" do
-        expect(logger).not_to receive(:fatal)
         expect(subject.run(args)).to eq(0)
       end
     end
@@ -168,56 +176,38 @@ describe LogStash::Runner do
       allow(pipeline).to receive(:run).and_return(task)
       allow(pipeline).to receive(:shutdown)
     end
-
+    
     context "when :path.data is defined by the user" do
       let(:test_data_path) { "/tmp/ls-test-data" }
       let(:test_queue_path) { test_data_path + "/" + "queue" }
-      let(:test_dlq_path) { test_data_path + "/" + "dead_letter_queue" }
-
+      
       it "should set data paths" do
         expect(LogStash::Agent).to receive(:new) do |settings|
           expect(settings.get("path.data")).to eq(test_data_path)
           expect(settings.get("path.queue")).to eq(test_queue_path)
-          expect(settings.get("path.dead_letter_queue")).to eq(test_dlq_path)
         end
-
+        
         args = ["--path.data", test_data_path, "-e", pipeline_string]
         subject.run("bin/logstash", args)
       end
-
+      
       context "and path.queue is manually set" do
         let(:queue_override_path) { "/tmp/queue-override_path" }
-
+        
         it "should set data paths" do
           expect(LogStash::Agent).to receive(:new) do |settings|
             expect(settings.get("path.data")).to eq(test_data_path)
             expect(settings.get("path.queue")).to eq(queue_override_path)
           end
-
+          
           LogStash::SETTINGS.set("path.queue", queue_override_path)
-
-          args = ["--path.data", test_data_path, "-e", pipeline_string]
-          subject.run("bin/logstash", args)
-        end
-      end
-
-      context "and path.dead_letter_queue is manually set" do
-        let(:queue_override_path) { "/tmp/queue-override_path" }
-
-        it "should set data paths" do
-          expect(LogStash::Agent).to receive(:new) do |settings|
-            expect(settings.get("path.data")).to eq(test_data_path)
-            expect(settings.get("path.dead_letter_queue")).to eq(queue_override_path)
-          end
-
-          LogStash::SETTINGS.set("path.dead_letter_queue", queue_override_path)
-
+          
           args = ["--path.data", test_data_path, "-e", pipeline_string]
           subject.run("bin/logstash", args)
         end
       end
     end
-
+    
     context "when :http.host is defined by the user" do
       it "should pass the value to the webserver" do
         expect(LogStash::Agent).to receive(:new) do |settings|
@@ -306,9 +296,6 @@ describe LogStash::Runner do
     end
 
     describe "config.debug" do
-      after(:each) do
-        LogStash::SETTINGS.set("config.debug", false)
-      end
       it "should set 'config.debug' to false by default" do
         expect(LogStash::Agent).to receive(:new) do |settings|
           expect(settings.get("config.debug")).to eq(false)
@@ -327,106 +314,6 @@ describe LogStash::Runner do
     end
   end
 
-  describe "logstash modules" do
-    before(:each) do
-      test_modules_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "modules_test_files"))
-      LogStash::Modules::Util.register_local_modules(test_modules_dir)
-    end
-
-    describe "--config.test_and_exit" do
-      subject { LogStash::Runner.new("") }
-      let(:args) { ["-t", "--modules", module_string] }
-
-      context "with a good configuration" do
-        let(:module_string) { "tester" }
-        it "should exit successfully" do
-          expect(logger).not_to receive(:fatal)
-          expect(subject.run(args)).to eq(0)
-        end
-      end
-
-      context "with a bad configuration" do
-        let(:module_string) { "rlwekjhrewlqrkjh" }
-        it "should fail by returning a bad exit code" do
-          expect(logger).to receive(:fatal)
-          expect(subject.run(args)).to eq(1)
-        end
-      end
-    end
-
-    describe "--modules" do
-      let(:args) { ["--modules", module_string, "--setup"] }
-
-      context "with an available module specified but no connection to elasticsearch" do
-        let(:module_string) { "tester" }
-        before do
-          expect(logger).to receive(:fatal) do |msg, hash|
-            expect(msg).to eq("An unexpected error occurred!")
-            expect(hash).to be_a_config_loading_error_hash(
-              /Failed to import module configurations to Elasticsearch and\/or Kibana. Module: tester has/)
-          end
-        end
-        it "should log fatally and return a bad exit code" do
-          expect(subject.run("bin/logstash", args)).to eq(1)
-        end
-      end
-
-      context "with an available module specified and a mocked connection to elasticsearch" do
-        let(:module_string) { "tester" }
-        let(:kbn_version) { "5.6.0" }
-        let(:esclient) { double(:esclient) }
-        let(:kbnclient) { double(:kbnclient) }
-        let(:response) { double(:response) }
-        before do
-          allow(response).to receive(:status).and_return(404)
-          allow(esclient).to receive(:head).and_return(response)
-          allow(esclient).to receive(:can_connect?).and_return(true)
-          allow(kbnclient).to receive(:version).and_return(kbn_version)
-          allow(kbnclient).to receive(:version_parts).and_return(kbn_version.split('.'))
-          allow(kbnclient).to receive(:can_connect?).and_return(true)
-          allow(LogStash::ElasticsearchClient).to receive(:build).and_return(esclient)
-          allow(LogStash::Modules::KibanaClient).to receive(:new).and_return(kbnclient)
-
-          expect(esclient).to receive(:put).once do |path, content|
-            LogStash::ElasticsearchClient::Response.new(201, "", {})
-          end
-          expect(kbnclient).to receive(:post).twice do |path, content|
-            LogStash::Modules::KibanaClient::Response.new(201, "", {})
-          end
-
-          expect(LogStash::Agent).to receive(:new) do |settings, source_loader|
-            pipelines = LogStash::Config::ModulesCommon.pipeline_configs(settings)
-            expect(pipelines).not_to be_empty
-            module_pipeline = pipelines.first
-            expect(module_pipeline).to include("pipeline_id", "config_string")
-            expect(module_pipeline["pipeline_id"]).to include('tester')
-            expect(module_pipeline["config_string"]).to include('index => "tester-')
-            agent
-          end
-          expect(logger).not_to receive(:fatal)
-          expect(logger).not_to receive(:error)
-        end
-        xit "should not terminate logstash" do
-          expect(subject.run("bin/logstash", args)).to be_nil
-        end
-      end
-
-      context "with an unavailable module specified" do
-        let(:module_string) { "fancypants" }
-        before do
-          expect(logger).to receive(:fatal) do |msg, hash|
-            expect(msg).to eq("An unexpected error occurred!")
-            expect(hash).to be_a_config_loading_error_hash(
-              /The modules specified are not available yet. Specified modules: \["fancypants"\] Available modules:/)
-          end
-        end
-        it "should log fatally and return a bad exit code" do
-          expect(subject.run("bin/logstash", args)).to eq(1)
-        end
-      end
-    end
-  end
-
   describe "--log.level" do
     before :each do
       allow_any_instance_of(subject).to receive(:show_version)
@@ -506,10 +393,12 @@ describe LogStash::Runner do
   describe "path.settings" do
     subject { LogStash::Runner.new("") }
     context "if does not exist" do
-      let(:args) { ["--path.settings", "/tmp/a/a/a/a", "-e", "input {} output {}"] }
+      let(:args) { ["--path.settings", "/tmp/a/a/a/a", "-e", "input { generator { count => 1000 }} output {}"] }
 
       it "should not terminate logstash" do
-        expect(subject.run(args)).to eq(nil)
+        # The runner should just pass the code from the agent execute
+        allow(agent).to receive(:execute).and_return(0)
+        expect(subject.run(args)).to eq(0)
       end
 
       context "but if --help is passed" do