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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e159407a5799becbef3c1eed0aa42ac18038ce20
-  data.tar.gz: 0308d3dc734c7615f12e194b49b4b86d6d69c2d5
+  metadata.gz: 9a41edc5a19188510be8f6b9e275f26d82538f4f
+  data.tar.gz: e389c454d1999160f6b2a1a750999ef26c620285
 SHA512:
-  metadata.gz: 172062b5b43a2738e5350605b036dddcbe90e07741a53b385f48f85225bc59250ec5f6e324fb63600f7a21c3a99ba955e85160027aa5702ac566c4aff28006e3
-  data.tar.gz: 573884287eeda4cb355655cfad1398a8f02238e7c6860a6f66e53f5ac5f5150cb33601a6ffb716845b7c1e4b3e69cb078330fa83aa76e7897c46014599919b66
+  metadata.gz: b5871edf304c92f16a0bc33381894d497a06189fefc0858190d9b0a888db939074c14c515432727c4cfcdfba65159b898e2a1a42438ef40683bf507b122ffa46
+  data.tar.gz: 6e30b256b36652be4499ab4398bab002c34d68fe92b67e65b2fd04d9f89e42a21a13591f79ba4396a891b27890405d1073950b7e87d171fe7ac98902e794606d

data/lib/logstash-core/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_VERSION = "5.0.0-alpha3.snapshot4"
+LOGSTASH_CORE_VERSION = "5.0.0-alpha3.snapshot5"

data/lib/logstash/agent.rb

@@ -45,7 +45,7 @@ class LogStash::Agent
 
     @collect_metric = setting("metric.collect")
     @metric = create_metric_collector
-    @periodic_pollers = LogStash::Instrument::PeriodicPollers.new(metric)
+    @periodic_pollers = LogStash::Instrument::PeriodicPollers.new(create_metric_collector)
   end
 
   def execute
@@ -83,7 +83,6 @@ class LogStash::Agent
 
     pipeline = create_pipeline(pipeline_settings)
     return unless pipeline.is_a?(LogStash::Pipeline)
-    pipeline.metric = @metric
     if @auto_reload && pipeline.non_reloadable_plugins.any?
       @logger.error(I18n.t("logstash.agent.non_reloadable_config_register"),
                     :pipeline_id => pipeline_id,

data/lib/logstash/environment.rb

@@ -13,7 +13,6 @@ module LogStash
            Setting::Boolean.new("config.reload.automatic", false),
            Setting::Numeric.new("config.reload.interval", 3),
            Setting::Boolean.new("metric.collect", true) {|v| v == true }, # metric collection cannot be disabled
-            Setting::String.new("path.settings", ::File.join(Environment::LOGSTASH_HOME, "config")),
             Setting::String.new("pipeline.id", "main"),
            Setting::Numeric.new("pipeline.workers", LogStash::Config::CpuCoreStrategy.maximum),
            Setting::Numeric.new("pipeline.output.workers", 1),

data/lib/logstash/pipeline.rb

@@ -54,17 +54,9 @@ module LogStash; class Pipeline
 
     @worker_threads = []
 
-    # Metric object should be passed upstream, multiple pipeline share the same metric
-    # and collector only the namespace will changes.
-    # If no metric is given, we use a `NullMetric` for all internal calls.
-    # We also do this to make the changes backward compatible with previous testing of the
-    # pipeline.
-    #
     # This needs to be configured before we evaluate the code to make
-    # sure the metric instance is correctly send to the plugin.
-    # NOTE: It is the responsibility of the Agent to set this externally with a setter
-    # if there's an intent of this not being a NullMetric
-    @metric = Instrument::NullMetric.new
+    # sure the metric instance is correctly send to the plugins to make the namespace scoping work
+    @metric = settings.get_value("metric.collect") ? Instrument::Metric.new : Instrument::NullMetric.new 
 
     grammar = LogStashConfigParser.new
     @config = grammar.parse(config_str)
@@ -80,7 +72,7 @@ module LogStash; class Pipeline
     # The config code is hard to represent as a log message...
     # So just print it.
 
-    if @settings.get("config.debug") && logger.debug?
+    if @settings.get_value("config.debug") && logger.debug?
       logger.debug("Compiled pipeline code", :code => code)
     end
 

data/lib/logstash/runner.rb

@@ -15,8 +15,14 @@ require "logstash/agent"
 require "logstash/config/defaults"
 require "logstash/shutdown_watcher"
 require "logstash/patches/clamp"
+require "logstash/settings"
 
 class LogStash::Runner < Clamp::StrictCommand
+  # The `path.settings` need to be defined in the runner instead of the `logstash-core/lib/logstash/environment.r`
+  # because the `Environment::LOGSTASH_HOME` doesn't exist in the context of the `logstash-core` gem.
+  # 
+  # See issues https://github.com/elastic/logstash/issues/5361
+  LogStash::SETTINGS.register(LogStash::Setting::String.new("path.settings", ::File.join(LogStash::Environment::LOGSTASH_HOME, "config")))
 
   # Node Settings
   option ["-n", "--node.name"], "NAME",
@@ -129,7 +135,9 @@ class LogStash::Runner < Clamp::StrictCommand
 
   def run(args)
     settings_path = fetch_settings_path(args)
+
     @settings.set("path.settings", settings_path) if settings_path
+
     LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings"))
     super(*[args])
   end

data/lib/logstash/version.rb

@@ -11,4 +11,4 @@
 #       eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be
 #       fixed.
 
-LOGSTASH_VERSION = "5.0.0-alpha3.snapshot4"
+LOGSTASH_VERSION = "5.0.0-alpha3.snapshot5"

data/logstash-core.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LOGSTASH_CORE_VERSION.gsub(/-/, '.')
 
-  gem.add_runtime_dependency "logstash-core-event-java", "5.0.0.alpha3.snapshot4"
+  gem.add_runtime_dependency "logstash-core-event-java", "5.0.0.alpha3.snapshot5"
 
   gem.add_runtime_dependency "cabin", "~> 0.8.0" #(Apache 2.0 license)
   gem.add_runtime_dependency "pry", "~> 0.10.1"  #(Ruby license)

data/spec/logstash/agent_spec.rb

@@ -98,6 +98,7 @@ describe LogStash::Agent do
           sleep 0.1
           Stud.stop!(t)
           t.join
+          subject.shutdown
         end
       end
 
@@ -114,6 +115,7 @@ describe LogStash::Agent do
             sleep 0.1
             Stud.stop!(t)
             t.join
+            subject.shutdown
           end
         end
 
@@ -129,6 +131,8 @@ describe LogStash::Agent do
             sleep 0.1
             Stud.stop!(t)
             t.join
+
+            subject.shutdown
           end
         end
       end
@@ -157,6 +161,7 @@ describe LogStash::Agent do
           sleep 0.1
           Stud.stop!(t)
           t.join
+          subject.shutdown
         end
       end
 
@@ -172,6 +177,7 @@ describe LogStash::Agent do
             sleep 0.1
             Stud.stop!(t)
             t.join
+            subject.shutdown
           end
         end
 
@@ -186,6 +192,7 @@ describe LogStash::Agent do
             sleep 0.1
             Stud.stop!(t)
             t.join
+            subject.shutdown
           end
         end
       end
@@ -361,6 +368,7 @@ describe LogStash::Agent do
     end
 
     after :each do
+      subject.shutdown
       Stud.stop!(@t)
       @t.join
     end

data/spec/logstash/pipeline_reporter_spec.rb

@@ -47,6 +47,10 @@ describe LogStash::PipelineReporter do
     @post_snapshot = reporter.snapshot
   end
 
+  after do
+    pipeline.shutdown
+  end
+
   describe "events filtered" do
     it "should start at zero" do
       expect(@pre_snapshot.events_filtered).to eql(0)
@@ -82,4 +86,4 @@ describe LogStash::PipelineReporter do
       expect(@post_snapshot.output_info.first[:events_received]).to eql(generator_count)
     end
   end
-end
+end

data/spec/logstash/pipeline_spec.rb

@@ -155,6 +155,7 @@ describe LogStash::Pipeline do
             {:count_was=>worker_thread_count, :filters=>["dummyfilter"]})
           pipeline.run
           expect(pipeline.worker_threads.size).to eq(safe_thread_count)
+          pipeline.shutdown
         end
       end
 
@@ -168,6 +169,7 @@ describe LogStash::Pipeline do
             {:worker_threads=> override_thread_count, :filters=>["dummyfilter"]})
           pipeline.run
           expect(pipeline.worker_threads.size).to eq(override_thread_count)
+          pipeline.shutdown
         end
       end
     end
@@ -193,6 +195,7 @@ describe LogStash::Pipeline do
         pipeline = TestPipeline.new(test_config_with_filters)
         pipeline.run
         expect(pipeline.worker_threads.size).to eq(worker_thread_count)
+        pipeline.shutdown
       end
     end
   end
@@ -239,6 +242,7 @@ describe LogStash::Pipeline do
         expect(pipeline.outputs.size ).to eq(1)
         expect(pipeline.outputs.first.workers.size ).to eq(::LogStash::SETTINGS.get("pipeline.output.workers"))
         expect(pipeline.outputs.first.workers.first.num_closes ).to eq(1)
+        pipeline.shutdown
       end
 
       it "should call output close correctly with output workers" do
@@ -255,6 +259,7 @@ describe LogStash::Pipeline do
         output_delegator.workers.each do |plugin|
           expect(plugin.num_closes ).to eq(1)
         end
+        pipeline.shutdown
       end
     end
   end
@@ -276,6 +281,7 @@ describe LogStash::Pipeline do
         expect(pipeline).to receive(:start_flusher).ordered.and_call_original
 
         pipeline.run
+        pipeline.shutdown
       end
     end
 
@@ -392,8 +398,14 @@ describe LogStash::Pipeline do
     output { }
     CONFIG
 
-    it "uses a `NullMetric` object if no metric is given" do
-      pipeline = LogStash::Pipeline.new(config)
+    it "uses a `NullMetric` object if `metric.collect` is set to false" do
+      settings = double("LogStash::SETTINGS")
+
+      allow(settings).to receive(:get_value).with("pipeline.id").and_return("main")
+      allow(settings).to receive(:get_value).with("metric.collect").and_return(false)
+      allow(settings).to receive(:get_value).with("config.debug").and_return(false)
+
+      pipeline = LogStash::Pipeline.new(config, settings)
       expect(pipeline.metric).to be_kind_of(LogStash::Instrument::NullMetric)
     end
   end
@@ -511,7 +523,7 @@ describe LogStash::Pipeline do
       t = Thread.new { subject.run }
       sleep(0.1)
       expect(subject.started_at).to be < Time.now
-      t.kill rescue nil
+      subject.shutdown
     end
   end
 
@@ -536,7 +548,7 @@ describe LogStash::Pipeline do
         t = Thread.new { subject.run }
         sleep(0.1)
         expect(subject.uptime).to be > 0
-        t.kill rescue nil
+        subject.shutdown
       end
     end
   end
@@ -590,7 +602,6 @@ describe LogStash::Pipeline do
       # Reset the metric store
       LogStash::Instrument::Collector.instance.clear
 
-      subject.metric = metric
       Thread.new { subject.run }
       # make sure we have received all the generated events
       sleep 1 while dummyoutput.events.size < number_of_events

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha3.snapshot4
+  version: 5.0.0.alpha3.snapshot5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha3.snapshot4
+        version: 5.0.0.alpha3.snapshot5
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha3.snapshot4
+        version: 5.0.0.alpha3.snapshot5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: