logstash-core 5.0.0.alpha3.snapshot2-java → 5.0.0.alpha3.snapshot4-java

data/spec/logstash/runner_spec.rb

@@ -3,7 +3,10 @@ require "spec_helper"
 require "logstash/runner"
 require "stud/task"
 require "stud/trap"
+require "stud/temporary"
 require "logstash/util/java_version"
+require "logstash/logging/json"
+require "json"
 
 class NullRunner
   def run(args); end
@@ -17,15 +20,49 @@ describe LogStash::Runner do
   before :each do
     allow(Cabin::Channel).to receive(:get).with(LogStash).and_return(channel)
     allow(channel).to receive(:subscribe).with(any_args)
+    allow(channel).to receive(:log) {}
+    allow(LogStash::ShutdownWatcher).to receive(:logger).and_return(channel)
+  end
+
+  after :each do
+    LogStash::SETTINGS.reset
+  end
+
+  after :all do
+    LogStash::ShutdownWatcher.logger = nil
+  end
+
+  describe "argument precedence" do
+    let(:config) { "input {} output {}" }
+    let(:cli_args) { ["-e", config, "-w", "20"] }
+    let(:settings_yml_hash) { { "pipeline.workers" => 2 } }
+
+    before :each 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
+      subject.run("bin/logstash", cli_args)
+    end
   end
 
   describe "argument parsing" do
     subject { LogStash::Runner.new("") }
+    before :each do
+      allow(Cabin::Channel.get(LogStash)).to receive(:terminal)
+    end
     context "when -e is given" do
 
       let(:args) { ["-e", "input {} output {}"] }
       let(:agent) { double("agent") }
-      let(:agent_logger) { double("agent logger") }
 
       before do
         allow(agent).to receive(:logger=).with(anything)
@@ -42,10 +79,8 @@ describe LogStash::Runner do
 
     context "with no arguments" do
       let(:args) { [] }
-      let(:agent) { double("agent") }
 
       before(:each) do
-        allow(LogStash::Agent).to receive(:new).and_return(agent)
         allow(LogStash::Util::JavaVersion).to receive(:warn_on_bad_java_version)
       end
 
@@ -96,7 +131,33 @@ describe LogStash::Runner do
     end
   end
 
-  describe "--config-test" do
+  describe "--log.format=json" do
+    subject { LogStash::Runner.new("") }
+    let(:logfile) { Stud::Temporary.file }
+    let(:args) { [ "--log.format", "json", "-l", logfile.path, "-e", "input {} output{}" ] }
+
+    after do
+      logfile.close
+      File.unlink(logfile.path)
+    end
+
+    before do
+      expect(channel).to receive(:subscribe).with(kind_of(LogStash::Logging::JSON)).and_call_original
+      subject.run(args)
+
+      # Log file should have stuff in it.
+      expect(logfile.stat.size).to be > 0
+    end
+
+    it "should log in valid json. One object per line." do
+      logfile.each_line do |line|
+        expect(line).not_to be_empty
+        expect { JSON.parse(line) }.not_to raise_error
+      end
+    end
+  end
+
+  describe "--config.test_and_exit" do
     subject { LogStash::Runner.new("") }
     let(:args) { ["-t", "-e", pipeline_string] }
 
@@ -130,8 +191,9 @@ describe LogStash::Runner do
 
     context "when :pipeline_workers is not defined by the user" do
       it "should not pass the value to the pipeline" do
-        expect(LogStash::Pipeline).to receive(:new).once.with(pipeline_string, hash_excluding(:pipeline_workers)).and_return(pipeline)
-
+        expect(LogStash::Agent).to receive(:new) do |settings|
+	  expect(settings.set?("pipeline.workers")).to be(false)
+        end
         args = ["-e", pipeline_string]
         subject.run("bin/logstash", args)
       end
@@ -139,42 +201,67 @@ describe LogStash::Runner do
 
     context "when :pipeline_workers is defined by the user" do
       it "should pass the value to the pipeline" do
-        main_pipeline_settings[:pipeline_workers] = 2
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, hash_including(main_pipeline_settings)).and_return(pipeline)
+        expect(LogStash::Agent).to receive(:new) do |settings|
+	  expect(settings.set?("pipeline.workers")).to be(true)
+	  expect(settings.get("pipeline.workers")).to be(2)
+        end
 
         args = ["-w", "2", "-e", pipeline_string]
         subject.run("bin/logstash", args)
       end
     end
 
-    describe "debug_config" do
-      it "should set 'debug_config' to false by default" do
-        expect(LogStash::Config::Loader).to receive(:new).with(anything, false).and_call_original
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, hash_including(:debug_config => false)).and_return(pipeline)
-        args = ["--debug", "-e", pipeline_string]
+    describe "config.debug" do
+      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)
+        end
+        args = ["--log.level", "debug", "-e", pipeline_string]
         subject.run("bin/logstash", args)
       end
 
-      it "should allow overriding debug_config" do
-        expect(LogStash::Config::Loader).to receive(:new).with(anything, true).and_call_original
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, hash_including(:debug_config => true)).and_return(pipeline)
-        args = ["--debug", "--debug-config",  "-e", pipeline_string]
+      it "should allow overriding config.debug" do
+        expect(LogStash::Agent).to receive(:new) do |settings|
+          expect(settings.get("config.debug")).to eq(true)
+        end
+        args = ["--log.level", "debug", "--config.debug",  "-e", pipeline_string]
         subject.run("bin/logstash", args)
       end
     end
+  end
 
-    context "when configuring environment variable support" do
-      it "should set 'allow_env' to false by default" do
-        args = ["-e", pipeline_string]
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, hash_including(:allow_env => false)).and_return(pipeline)
+  describe "--log.level" do
+    before :each do
+      allow_any_instance_of(subject).to receive(:show_version)
+    end
+    context "when not set" do
+      it "should set log level to warn" do
+        args = ["--version"]
         subject.run("bin/logstash", args)
+        expect(channel.level).to eq(:warn)
       end
-
-      it "should support templating environment variables" do
-        args = ["-e", pipeline_string, "--allow-env"]
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, hash_including(:allow_env => true)).and_return(pipeline)
+    end
+    context "when setting to debug" do
+      it "should set log level to debug" do
+        args = ["--log.level", "debug",  "--version"]
+        subject.run("bin/logstash", args)
+        expect(channel.level).to eq(:debug)
+      end
+    end
+    context "when setting to verbose" do
+      it "should set log level to info" do
+        args = ["--log.level", "verbose",  "--version"]
         subject.run("bin/logstash", args)
+        expect(channel.level).to eq(:info)
+      end
+    end
+    context "when setting to quiet" do
+      it "should set log level to error" do
+        args = ["--log.level", "quiet",  "--version"]
+        subject.run("bin/logstash", args)
+        expect(channel.level).to eq(:error)
       end
     end
   end
+
 end

data/spec/logstash/setting_spec.rb

@@ -0,0 +1,130 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting do
+  let(:logger) { double("logger") }
+  describe "#value" do
+    context "when using a default value" do
+      context "when no value is set" do
+        subject { described_class.new("number", Numeric, 1) }
+        it "should return the default value" do
+          expect(subject.value).to eq(1)
+        end
+      end
+
+      context "when a value is set" do
+        subject { described_class.new("number", Numeric, 1) }
+        let(:new_value) { 2 }
+        before :each do
+          subject.set(new_value)
+        end
+        it "should return the set value" do
+          expect(subject.value).to eq(new_value)
+        end
+      end
+    end
+
+    context "when not using a default value" do
+      context "when no value is set" do
+        subject { described_class.new("number", Numeric, nil, false) }
+        it "should return the default value" do
+          expect(subject.value).to eq(nil)
+        end
+      end
+
+      context "when a value is set" do
+        subject { described_class.new("number", Numeric, nil, false) }
+        let(:new_value) { 2 }
+        before :each do
+          subject.set(new_value)
+        end
+        it "should return the set value" do
+          expect(subject.value).to eq(new_value)
+        end
+      end
+    end
+  end
+
+  describe "#set?" do
+    context "when there is not value set" do
+      subject { described_class.new("number", Numeric, 1) }
+      it "should return false" do
+        expect(subject.set?).to be(false)
+      end
+    end
+    context "when there is a value set" do
+      subject { described_class.new("number", Numeric, 1) }
+      before :each do
+        subject.set(2)
+      end
+      it "should return false" do
+        expect(subject.set?).to be(true)
+      end
+    end
+  end
+  describe "#set" do
+    subject { described_class.new("number", Numeric, 1) }
+    it "should change the value of a setting" do
+      expect(subject.value).to eq(1)
+      subject.set(4)
+      expect(subject.value).to eq(4)
+    end
+    context "when executed for the first time" do
+      it "should change the result of set?" do
+        expect(subject.set?).to eq(false)
+        subject.set(4)
+        expect(subject.set?).to eq(true)
+      end
+    end
+
+    context "when the argument's class does not match @klass" do
+      it "should throw an exception" do
+        expect { subject.set("not a number") }.to raise_error
+      end
+    end
+  end
+
+  describe "#reset" do
+    subject { described_class.new("number", Numeric, 1) }
+    context "if value is already set" do
+      before :each do
+        subject.set(2)
+      end
+      it "should reset value to default" do
+        subject.reset
+        expect(subject.value).to eq(1)
+      end
+      it "should reset set? to false" do
+        expect(subject.set?).to eq(true)
+        subject.reset
+        expect(subject.set?).to eq(false)
+      end
+    end
+  end
+
+  describe "validator_proc" do
+    let(:default_value) { "small text" }
+    subject { described_class.new("mytext", String, default_value) {|v| v.size < 20 } }
+    context "when validation fails" do
+      let(:new_value) { "very very very very very big text" }
+      it "should raise an exception" do
+        expect { subject.set(new_value) }.to raise_error
+      end
+      it "should not change the value" do
+        subject.set(new_value) rescue nil
+        expect(subject.value).to eq(default_value)
+      end
+    end
+    context "when validation is successful" do
+      let(:new_value) { "smaller text" }
+      it "should not raise an exception" do
+        expect { subject.set(new_value) }.to_not raise_error
+      end
+      it "should change the value" do
+        subject.set(new_value)
+        expect(subject.value).to eq(new_value)
+      end
+    end
+  end
+end

data/spec/logstash/settings_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Settings do
+  let(:numeric_setting_name) { "number" }
+  let(:numeric_setting) { LogStash::Setting.new(numeric_setting_name, Numeric, 1) }
+  describe "#register" do
+    context "if setting has already been registered" do
+      before :each do
+        subject.register(numeric_setting)
+      end
+      it "should raise an exception" do
+        expect { subject.register(numeric_setting) }.to raise_error
+      end
+    end
+    context "if setting hasn't been registered" do
+      it "should not raise an exception" do
+        expect { subject.register(numeric_setting) }.to_not raise_error
+      end
+    end
+  end
+  describe "#get_setting" do
+    context "if setting has been registered" do
+      before :each do
+        subject.register(numeric_setting)
+      end
+      it "should return the setting" do
+        expect(subject.get_setting(numeric_setting_name)).to eq(numeric_setting)
+      end
+    end
+    context "if setting hasn't been registered" do
+      it "should raise an exception" do
+        expect { subject.get_setting(numeric_setting_name) }.to raise_error
+      end
+    end
+  end
+  describe "#get_subset" do
+    let(:numeric_setting_1) { LogStash::Setting.new("num.1", Numeric, 1) }
+    let(:numeric_setting_2) { LogStash::Setting.new("num.2", Numeric, 2) }
+    let(:numeric_setting_3) { LogStash::Setting.new("num.3", Numeric, 3) }
+    let(:string_setting_1) { LogStash::Setting.new("string.1", String, "hello") }
+    before :each do
+      subject.register(numeric_setting_1)
+      subject.register(numeric_setting_2)
+      subject.register(numeric_setting_3)
+      subject.register(string_setting_1)
+    end
+
+    it "supports regex" do
+      expect(subject.get_subset(/num/).get_setting("num.3")).to eq(numeric_setting_3)
+      expect { subject.get_subset(/num/).get_setting("string.1") }.to raise_error
+    end
+
+    it "returns a copy of settings" do
+      subset = subject.get_subset(/num/)
+      subset.set("num.2", 1000)
+      expect(subject.get("num.2")).to eq(2)
+      expect(subset.get("num.2")).to eq(1000)
+    end
+  end
+end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha3.snapshot2
+  version: 5.0.0.alpha3.snapshot4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre.alpha3.snapshot2
+        version: 5.0.0.alpha3.snapshot4
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre.alpha3.snapshot2
+        version: 5.0.0.alpha3.snapshot4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -351,12 +351,14 @@ files:
 - lib/logstash/java_integration.rb
 - lib/logstash/json.rb
 - lib/logstash/logging.rb
+- lib/logstash/logging/json.rb
 - lib/logstash/namespace.rb
 - lib/logstash/output_delegator.rb
 - lib/logstash/outputs/base.rb
 - lib/logstash/patches.rb
 - lib/logstash/patches/bugfix_jruby_2558.rb
 - lib/logstash/patches/cabin.rb
+- lib/logstash/patches/clamp.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/rubygems.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
@@ -366,12 +368,12 @@ files:
 - lib/logstash/plugins/registry.rb
 - lib/logstash/program.rb
 - lib/logstash/runner.rb
+- lib/logstash/settings.rb
 - lib/logstash/shutdown_watcher.rb
 - lib/logstash/util.rb
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/charset.rb
 - lib/logstash/util/decorators.rb
-- lib/logstash/util/defaults_printer.rb
 - lib/logstash/util/duration_formatter.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
@@ -425,15 +427,15 @@ files:
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
+- spec/logstash/setting_spec.rb
+- spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/charset_spec.rb
-- spec/logstash/util/defaults_printer_spec.rb
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
-- spec/logstash/util/worker_threads_default_printer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/static/i18n_spec.rb
@@ -501,15 +503,15 @@ test_files:
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
+- spec/logstash/setting_spec.rb
+- spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/charset_spec.rb
-- spec/logstash/util/defaults_printer_spec.rb
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
-- spec/logstash/util/worker_threads_default_printer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/static/i18n_spec.rb