logstash-core 5.0.2-java → 5.1.1.1-java

data/spec/logstash/settings_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "spec_helper"
 require "logstash/settings"
+require "fileutils"
 
 describe LogStash::Settings do
   let(:numeric_setting_name) { "number" }
@@ -86,4 +87,42 @@ describe LogStash::Settings do
       end
     end
   end
+
+  context "transient settings" do
+    subject do
+      settings = described_class.new
+      settings.register(LogStash::Setting::String.new("exist", "bonsoir"))
+      settings
+    end
+
+    let(:values) { { "do.not.exist.on.boot" => true, "exist" => "bonjour" } }
+    let(:yaml_path) do
+      p = Stud::Temporary.pathname
+      FileUtils.mkdir_p(p)
+
+      ::File.open(::File.join(p, "logstash.yml"), "w+") do |f|
+        f.write(YAML.dump(values))
+      end
+      p
+    end
+
+    it "allow to read yml file that contains unknown settings" do
+      expect { subject.from_yaml(yaml_path) }.not_to raise_error
+    end
+
+    context "when running #validate_all" do
+      it "merge and validate all the registered setting" do
+        subject.from_yaml(yaml_path)
+        subject.register(LogStash::Setting::Boolean.new("do.not.exist.on.boot", false))
+
+        expect { subject.validate_all }.not_to raise_error
+        expect(subject.get("do.not.exist.on.boot")).to be_truthy
+      end
+
+      it "raise an error when the settings doesn't exist" do
+        subject.from_yaml(yaml_path)
+        expect { subject.validate_all }.to raise_error(ArgumentError)
+      end
+    end
+  end
 end

data/spec/logstash/util/byte_value_spec.rb

@@ -0,0 +1,33 @@
+require "logstash/util/byte_value"
+require "flores/random"
+
+describe LogStash::Util::ByteValue do
+  let(:multipliers) do
+    {
+      "b" => 1,
+      "kb" => 1 << 10,
+      "mb" => 1 << 20,
+      "gb" => 1 << 30,
+      "tb" => 1 << 40,
+      "pb" => 1 << 50,
+    }
+  end
+
+  let(:number) { Flores::Random.number(0..100000000000) }
+  let(:unit) { Flores::Random.item(multipliers.keys) }
+  let(:text) { "#{number}#{unit}" }
+
+  describe "#parse" do
+    # Expect a whole-unit byte value. Fractions of a byte don't make sense here. :)
+    let(:expected) { (number * multipliers[unit]).to_i }
+    subject { described_class.parse(text) }
+
+    it "should return a Numeric" do
+      expect(subject).to be_a(Numeric)
+    end
+
+    it "should have an expected byte value" do
+      expect(subject).to be == expected
+    end
+  end
+end

data/spec/logstash/util/time_value_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require "logstash/util/time_value"
+require "spec_helper"
+
+RSpec.shared_examples "coercion example" do |value, expected|
+  let(:value) { value }
+  let(:expected) { expected }
+  it 'coerces correctly' do
+    expect(LogStash::Util::TimeValue.from_value(value)).to eq(expected)
+  end
+end
+
+
+module LogStash module Util
+describe TimeValue do
+    it_behaves_like "coercion example", TimeValue.new(100, :hour), TimeValue.new(100, :hour)
+    it_behaves_like "coercion example", "18nanos", TimeValue.new(18, :nanosecond)
+    it_behaves_like "coercion example", "18micros", TimeValue.new(18, :microsecond)
+    it_behaves_like "coercion example", "18ms", TimeValue.new(18, :millisecond)
+    it_behaves_like "coercion example", "18s", TimeValue.new(18, :second)
+    it_behaves_like "coercion example", "18m", TimeValue.new(18, :minute)
+    it_behaves_like "coercion example", "18h", TimeValue.new(18, :hour)
+    it_behaves_like "coercion example", "18d", TimeValue.new(18, :day)
+
+    it "coerces with a space between the duration and the unit" do
+      expected = TimeValue.new(18, :hour)
+      actual = TimeValue.from_value("18      h")
+      expect(actual).to eq(expected)
+    end
+
+    it "fails to coerce non-ints" do
+      begin
+        a = TimeValue.from_value("f18 nanos")
+        fail "should not parse"
+      rescue ArgumentError => e
+        expect(e.message).to eq("invalid value for Integer(): \"f18\"")
+      end
+    end
+
+    it "fails to coerce invalid units" do
+      begin
+        a = TimeValue.from_value("18xyz")
+        fail "should not parse"
+      rescue ArgumentError => e
+        expect(e.message).to eq("invalid time unit: \"18xyz\"")
+      end
+    end
+
+    it "fails to coerce invalid value types" do
+      begin
+        a = TimeValue.from_value(32)
+        fail "should not parse"
+      rescue ArgumentError => e
+        expect(e.message).to eq("value is not a string: 32 [Fixnum]")
+      end
+    end
+end
+end
+end

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -88,8 +88,8 @@ describe LogStash::Util::WrappedSynchronousQueue do
 
       context "when writing to the queue" do
         before :each do
-          read_client.set_events_metric(LogStash::Instrument::NullMetric.new)
-          read_client.set_pipeline_metric(LogStash::Instrument::NullMetric.new)
+          read_client.set_events_metric(LogStash::Instrument::NamespacedNullMetric.new([], :null))
+          read_client.set_pipeline_metric(LogStash::Instrument::NamespacedNullMetric.new([], :null))
         end
 
         it "appends batches to the queue" do

data/spec/logstash/webserver_spec.rb

@@ -5,6 +5,7 @@ require_relative "../support/helpers"
 require "socket"
 require "spec_helper"
 require "open-uri"
+require "webmock/rspec"
 
 def block_ports(range)
   servers = []
@@ -35,6 +36,7 @@ describe LogStash::WebServer do
   before :all do
     @abort = Thread.abort_on_exception
     Thread.abort_on_exception = true
+    WebMock.allow_net_connect!
   end
 
   after :all do
@@ -42,13 +44,8 @@ describe LogStash::WebServer do
   end
 
   let(:logger) { LogStash::Logging::Logger.new("testing") }
-  let(:agent) { double("agent") }
-  let(:webserver) { double("webserver") }
-
-  before :each do
-    allow(webserver).to receive(:address).and_return("127.0.0.1")
-    allow(agent).to receive(:webserver).and_return(webserver)
-  end
+  let(:agent) { OpenStruct.new({:webserver => webserver, :http_address => "127.0.0.1", :id => "myid", :name => "myname"}) }
+  let(:webserver) { OpenStruct.new({}) }
 
   subject { LogStash::WebServer.new(logger,
                                     agent,

data/spec/support/helpers.rb

@@ -6,3 +6,11 @@ def silence_warnings
 ensure
   $VERBOSE = warn_level
 end
+
+def clear_data_dir
+    data_path = agent_settings.get("path.data")
+    Dir.foreach(data_path) do |f|
+    next if f == "." || f == ".." || f == ".gitkeep"
+    FileUtils.rm_rf(File.join(data_path, f))
+  end
+end

data/spec/support/mocks_classes.rb

@@ -2,48 +2,78 @@
 require "logstash/outputs/base"
 require "thread"
 
-class DummyOutput < LogStash::Outputs::Base
-  config_name "dummyoutput"
-  milestone 2
+module LogStash module Outputs
+  class DummyOutput < LogStash::Outputs::Base
+    config_name "dummyoutput"
+    milestone 2
 
-  attr_reader :num_closes, :events
+    attr_reader :num_closes, :events
 
-  def initialize(params={})
-    super
-    @num_closes = 0
-    @events = Queue.new
-  end
+    def initialize(params={})
+      super
+      @num_closes = 0
+      @events = Queue.new
+    end
 
-  def register
-  end
+    def register
+    end
 
-  def receive(event)
-    @events << event
-  end
+    def receive(event)
+      @events << event
+    end
 
-  def close
-    @num_closes = 1
+    def close
+      @num_closes = 1
+    end
   end
-end
 
-class DummyOutputWithEventsArray < LogStash::Outputs::Base
-  config_name "dummyoutput2"
-  milestone 2
+  class DummyOutputWithEventsArray < LogStash::Outputs::Base
+    config_name "dummyoutput2"
+    milestone 2
 
-  attr_reader :events
+    attr_reader :events
 
-  def initialize(params={})
-    super
-    @events = []
-  end
+    def initialize(params={})
+      super
+      @events = []
+    end
 
-  def register
-  end
+    def register
+    end
+
+    def receive(event)
+      @events << event
+    end
 
-  def receive(event)
-    @events << event
+    def close
+    end
   end
 
-  def close
+  class DroppingDummyOutput < LogStash::Outputs::Base
+    config_name "droppingdummyoutput"
+    milestone 2
+
+    attr_reader :num_closes
+
+    def initialize(params={})
+      super
+      @num_closes = 0
+      @events_received = Concurrent::AtomicFixnum.new(0)
+    end
+
+    def register
+    end
+
+    def receive(event)
+      @events_received.increment
+    end
+
+    def events_received
+      @events_received.value
+    end
+
+    def close
+      @num_closes = 1
+    end
   end
-end
+end end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1.1
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,7 +23,21 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1.1
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.1.1
+  name: logstash-core-queue-jruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -271,17 +285,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: '0'
   name: jar-dependencies
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.9
+  name: ruby-maven
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 3.3.9
 description: The core components of logstash, the scalable log and event management tool
 email:
 - info@elastic.co
@@ -289,10 +317,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/jars.rb
+- gemspec_jars.rb
 - lib/logstash-core.rb
+- lib/logstash-core/logstash-core.jar
 - lib/logstash-core/logstash-core.rb
 - lib/logstash-core/version.rb
+- lib/logstash-core_jars.rb
 - lib/logstash/agent.rb
 - lib/logstash/api/app_helpers.rb
 - lib/logstash/api/command_factory.rb
@@ -322,13 +352,12 @@ files:
 - lib/logstash/config/grammar.rb
 - lib/logstash/config/loader.rb
 - lib/logstash/config/mixin.rb
-- lib/logstash/config/registry.rb
 - lib/logstash/environment.rb
 - lib/logstash/errors.rb
+- lib/logstash/event_dispatcher.rb
 - lib/logstash/filter_delegator.rb
 - lib/logstash/filters/base.rb
 - lib/logstash/inputs/base.rb
-- lib/logstash/inputs/metrics.rb
 - lib/logstash/inputs/threadable.rb
 - lib/logstash/instrument/collector.rb
 - lib/logstash/instrument/metric.rb
@@ -339,9 +368,11 @@ files:
 - lib/logstash/instrument/metric_type/gauge.rb
 - lib/logstash/instrument/metric_type/mean.rb
 - lib/logstash/instrument/namespaced_metric.rb
+- lib/logstash/instrument/namespaced_null_metric.rb
 - lib/logstash/instrument/null_metric.rb
 - lib/logstash/instrument/periodic_poller/base.rb
 - lib/logstash/instrument/periodic_poller/jvm.rb
+- lib/logstash/instrument/periodic_poller/load_average.rb
 - lib/logstash/instrument/periodic_poller/os.rb
 - lib/logstash/instrument/periodic_pollers.rb
 - lib/logstash/instrument/snapshot.rb
@@ -361,6 +392,7 @@ files:
 - lib/logstash/patches/bugfix_jruby_2558.rb
 - lib/logstash/patches/cabin.rb
 - lib/logstash/patches/clamp.rb
+- lib/logstash/patches/exception_to_json.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/puma.rb
 - lib/logstash/patches/rubygems.rb
@@ -368,13 +400,16 @@ files:
 - lib/logstash/pipeline.rb
 - lib/logstash/pipeline_reporter.rb
 - lib/logstash/plugin.rb
+- lib/logstash/plugins/hooks_registry.rb
 - lib/logstash/plugins/registry.rb
 - lib/logstash/program.rb
 - lib/logstash/runner.rb
 - lib/logstash/settings.rb
 - lib/logstash/shutdown_watcher.rb
+- lib/logstash/universal_plugin.rb
 - lib/logstash/util.rb
 - lib/logstash/util/buftok.rb
+- lib/logstash/util/byte_value.rb
 - lib/logstash/util/charset.rb
 - lib/logstash/util/decorators.rb
 - lib/logstash/util/duration_formatter.rb
@@ -388,8 +423,10 @@ files:
 - lib/logstash/util/safe_uri.rb
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/util/thread_dump.rb
+- lib/logstash/util/time_value.rb
 - lib/logstash/util/unicode_trimmer.rb
 - lib/logstash/util/worker_threads_default_printer.rb
+- lib/logstash/util/wrapped_acked_queue.rb
 - lib/logstash/util/wrapped_synchronous_queue.rb
 - lib/logstash/version.rb
 - lib/logstash/webserver.rb
@@ -415,41 +452,50 @@ files:
 - spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/environment_spec.rb
+- spec/logstash/event_dispatcher_spec.rb
 - spec/logstash/filter_delegator_spec.rb
 - spec/logstash/filters/base_spec.rb
 - spec/logstash/inputs/base_spec.rb
-- spec/logstash/inputs/metrics_spec.rb
 - spec/logstash/instrument/collector_spec.rb
 - spec/logstash/instrument/metric_spec.rb
 - spec/logstash/instrument/metric_store_spec.rb
 - spec/logstash/instrument/metric_type/counter_spec.rb
 - spec/logstash/instrument/metric_type/gauge_spec.rb
 - spec/logstash/instrument/namespaced_metric_spec.rb
+- spec/logstash/instrument/namespaced_null_metric_spec.rb
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
+- spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
+- spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
 - spec/logstash/plugin_spec.rb
+- spec/logstash/plugins/hooks_registry_spec.rb
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/string_spec.rb
+- spec/logstash/settings/time_value_spec.rb
+- spec/logstash/settings/writable_directory_spec.rb
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/util/buftok_spec.rb
+- spec/logstash/util/byte_value_spec.rb
 - spec/logstash/util/charset_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/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
@@ -459,12 +505,6 @@ files:
 - spec/support/matchers.rb
 - spec/support/mocks_classes.rb
 - spec/support/shared_examples.rb
-- vendor/jars/com/fasterxml/jackson/core/jackson-core/2.7.4/jackson-core-2.7.4.jar
-- vendor/jars/com/fasterxml/jackson/core/jackson-databind/2.7.4/jackson-databind-2.7.4.jar
-- vendor/jars/org/apache/logging/log4j/log4j-1.2-api/2.6.2/log4j-1.2-api-2.6.2.jar
-- vendor/jars/org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar
-- vendor/jars/org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar
-- vendor/jars/org/logstash/logstash-core/5.0.2/logstash-core-5.0.2.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -473,7 +513,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- vendor/jars
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -484,7 +523,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- jar org.apache.logging.log4j:log4j-1.2-api, 2.6.2
+- jar org.apache.logging.log4j:log4j-api, 2.6.2
+- jar org.apache.logging.log4j:log4j-core, 2.6.2
+- jar com.fasterxml.jackson.core:jackson-core, 2.7.4
+- jar com.fasterxml.jackson.core:jackson-databind, 2.7.4
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key:
@@ -511,41 +555,50 @@ test_files:
 - spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/environment_spec.rb
+- spec/logstash/event_dispatcher_spec.rb
 - spec/logstash/filter_delegator_spec.rb
 - spec/logstash/filters/base_spec.rb
 - spec/logstash/inputs/base_spec.rb
-- spec/logstash/inputs/metrics_spec.rb
 - spec/logstash/instrument/collector_spec.rb
 - spec/logstash/instrument/metric_spec.rb
 - spec/logstash/instrument/metric_store_spec.rb
 - spec/logstash/instrument/metric_type/counter_spec.rb
 - spec/logstash/instrument/metric_type/gauge_spec.rb
 - spec/logstash/instrument/namespaced_metric_spec.rb
+- spec/logstash/instrument/namespaced_null_metric_spec.rb
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
+- spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
+- spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
 - spec/logstash/plugin_spec.rb
+- spec/logstash/plugins/hooks_registry_spec.rb
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/string_spec.rb
+- spec/logstash/settings/time_value_spec.rb
+- spec/logstash/settings/writable_directory_spec.rb
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/util/buftok_spec.rb
+- spec/logstash/util/byte_value_spec.rb
 - spec/logstash/util/charset_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/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb