logstash-core 2.3.4.snapshot1-java → 2.4.0-java

data/spec/logstash/output_delegator_spec.rb

@@ -16,6 +16,7 @@ describe LogStash::OutputDelegator do
       allow(out_klass).to receive(:new).with(any_args).and_return(out_inst)
       allow(out_klass).to receive(:threadsafe?).and_return(false)
       allow(out_klass).to receive(:workers_not_supported?).and_return(false)
+      allow(out_klass).to receive(:name).and_return("example")
       allow(out_inst).to receive(:register)
       allow(out_inst).to receive(:multi_receive)
       allow(logger).to receive(:debug).with(any_args)

data/spec/logstash/outputs/base_spec.rb

@@ -15,6 +15,31 @@ class LogStash::Outputs::NOOP < LogStash::Outputs::Base
   end
 end
 
+
+# use a dummy NOOP output to test Outputs::Base
+class LogStash::Outputs::NOOPSingle < LogStash::Outputs::Base
+  config_name "noop single"
+  concurrency :single
+
+  config :dummy_option, :validate => :string
+
+  def register; end
+
+  def receive(event)
+    return output?(event)
+  end
+end
+
+class LogStash::Outputs::NOOPShared < ::LogStash::Outputs::Base
+  concurrency :shared
+  
+  def register; end
+end
+
+class LogStash::Outputs::NOOPLegacy < ::LogStash::Outputs::Base
+  def register; end
+end
+
 class LogStash::Outputs::NOOPLegacyNoWorkers < ::LogStash::Outputs::Base
   LEGACY_WORKERS_NOT_SUPPORTED_REASON = "legacy reason"
 
@@ -23,7 +48,52 @@ class LogStash::Outputs::NOOPLegacyNoWorkers < ::LogStash::Outputs::Base
   end
 end
 
+class LogStash::Outputs::NOOPMultiReceiveEncoded < ::LogStash::Outputs::Base
+  concurrency :single
+  
+  def register; end
+
+  def multi_receive_encoded(events_and_encoded)
+  end
+end
+
 describe "LogStash::Outputs::Base#new" do
+  describe "concurrency" do
+    subject { klass.new({}) }
+    
+    context "single" do   
+      let(:klass) { LogStash::Outputs::NOOPSingle }
+
+      it "should set concurrency correctly" do
+        expect(subject.concurrency).to eq(:single)
+      end
+    end
+
+    context "shared" do
+      let(:klass) { LogStash::Outputs::NOOPShared }
+      
+      it "should set concurrency correctly" do
+        expect(subject.concurrency).to eq(:shared)
+      end
+    end
+
+    context "legacy" do
+      let(:klass) { LogStash::Outputs::NOOPLegacy }
+      
+      it "should set concurrency correctly" do
+        expect(subject.concurrency).to eq(:legacy)
+      end
+
+      it "should default the # of workers to 1" do
+        expect(subject.workers).to eq(1)
+      end
+
+      it "should default concurrency to :legacy" do
+        expect(subject.concurrency).to eq(:legacy)
+      end
+    end
+  end
+  
   it "should instantiate cleanly" do
     params = { "dummy_option" => "potatoes", "codec" => "json", "workers" => 2 }
     worker_params = params.dup; worker_params["workers"] = 1
@@ -37,4 +107,41 @@ describe "LogStash::Outputs::Base#new" do
     LogStash::Outputs::NOOPLegacyNoWorkers.new.register
     expect(LogStash::Outputs::NOOPLegacyNoWorkers.workers_not_supported?).to eql(true)
   end
+
+  describe "dispatching multi_receive" do
+    let(:event) { double("event") }
+    let(:events) { [event] }
+    subject { klass.new({}) }
+    
+    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(subject).to receive(:codec).and_return(codec)
+        allow(subject).to receive(:multi_receive_encoded)
+        subject.multi_receive(events)
+      end
+
+      it "should invoke multi_receive_encoded if it exists" do
+        expect(subject).to have_received(:multi_receive_encoded).with(encoded)
+      end
+    end
+
+    context "with plain #receive" do
+      let(:klass) { LogStash::Outputs::NOOPSingle }
+
+      before do
+        allow(subject).to receive(:multi_receive).and_call_original
+        allow(subject).to receive(:receive).with(event)
+        subject.multi_receive(events)
+      end
+
+      it "should receive the event by itself" do
+        expect(subject).to have_received(:receive).with(event)
+      end
+    end
+  end
 end

data/spec/logstash/plugin_spec.rb

@@ -1,15 +1,18 @@
 # encoding: utf-8
-require "spec_helper"
 require "logstash/plugin"
+require "logstash/inputs/base"
+require "logstash/filters/base"
+require "logstash/outputs/base"
+require "spec_helper"
 
 describe LogStash::Plugin do
   it "should fail lookup on inexisting type" do
-    expect_any_instance_of(Cabin::Channel).to receive(:debug).once
+    #expect_any_instance_of(Cabin::Channel).to receive(:debug).once
     expect { LogStash::Plugin.lookup("badbadtype", "badname") }.to raise_error(LogStash::PluginLoadingError)
   end
 
   it "should fail lookup on inexisting name" do
-    expect_any_instance_of(Cabin::Channel).to receive(:debug).once
+    #expect_any_instance_of(Cabin::Channel).to receive(:debug).once
     expect { LogStash::Plugin.lookup("filter", "badname") }.to raise_error(LogStash::PluginLoadingError)
   end
 
@@ -166,4 +169,27 @@ describe LogStash::Plugin do
 
     end
   end
+  context "Collecting Metric in the plugin" do
+    [LogStash::Inputs::Base, LogStash::Filters::Base, LogStash::Outputs::Base].each do |type|
+      let(:plugin) do
+        Class.new(type) do
+          config_name "goku"
+
+          def register
+            metric.gauge("power-level", 9000)
+          end
+        end
+      end
+
+      subject { plugin.new }
+
+      it "should not raise an exception when recoding a metric" do
+        expect { subject.register }.not_to raise_error
+      end
+
+      it "should use a `NullMetric`" do
+        expect(subject.metric).to be_kind_of(LogStash::Instrument::NullMetric)
+      end
+    end
+  end
 end

data/spec/logstash/runner_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 require "logstash/runner"
 require "stud/task"
 require "stud/trap"
+require "stud/temporary"
 
 class NullRunner
   def run(args); end
@@ -14,6 +15,7 @@ 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).and_call_original
   end
 
   context "argument parsing" do
@@ -54,4 +56,29 @@ describe LogStash::Runner do
       end
     end
   end
+
+  context "--log-in-json" do
+    let(:logfile) { Stud::Temporary.file }
+    let(:args) { [ "agent", "--log-in-json", "-l", logfile.path, "-e", "some-invalid-config" ] }
+
+    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).wait
+
+      # 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 { LogStash::Json.load(line) }.not_to raise_error
+      end
+    end
+  end
 end

data/spec/logstash/shutdown_watcher_spec.rb

@@ -20,6 +20,7 @@ describe LogStash::ShutdownWatcher do
     allow(pipeline).to receive(:thread).and_return(Thread.current)
     allow(reporter).to receive(:snapshot).and_return(reporter_snapshot)
     allow(reporter_snapshot).to receive(:o_simple_hash).and_return({})
+    allow(reporter_snapshot).to receive(:to_json_data).and_return("reporter-double")
 
     allow(subject).to receive(:pipeline_report_snapshot).and_wrap_original do |m, *args|
       report_count += 1

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.3.4.snapshot1
+  version: 2.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4.snapshot1
+        version: 2.4.0
   name: logstash-core-event
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4.snapshot1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -127,7 +127,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.9.16
   name: jruby-openssl
   prerelease: false
   type: :runtime
@@ -135,7 +135,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -245,9 +245,11 @@ files:
 - lib/logstash/filters/base.rb
 - lib/logstash/inputs/base.rb
 - lib/logstash/inputs/threadable.rb
+- lib/logstash/instrument/null_metric.rb
 - 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
@@ -275,6 +277,7 @@ files:
 - lib/logstash/util/plugin_version.rb
 - lib/logstash/util/prctl.rb
 - lib/logstash/util/retryable.rb
+- lib/logstash/util/safe_uri.rb
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/util/unicode_trimmer.rb
 - lib/logstash/util/worker_threads_default_printer.rb
@@ -284,6 +287,7 @@ files:
 - logstash-core.gemspec
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/codecs/base_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
@@ -292,6 +296,7 @@ files:
 - spec/logstash/environment_spec.rb
 - spec/logstash/filters/base_spec.rb
 - spec/logstash/inputs/base_spec.rb
+- spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb
@@ -327,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8
@@ -339,6 +344,7 @@ summary: logstash-core - The core components of logstash
 test_files:
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/codecs/base_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
@@ -347,6 +353,7 @@ test_files:
 - spec/logstash/environment_spec.rb
 - spec/logstash/filters/base_spec.rb
 - spec/logstash/inputs/base_spec.rb
+- spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb