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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha1
+  version: 6.0.0.alpha2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  name: rack
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -156,20 +170,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.6
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  name: jrmonitor
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -333,6 +333,7 @@ files:
 - lib/logstash/config/pipeline_config.rb
 - lib/logstash/config/source/base.rb
 - lib/logstash/config/source/local.rb
+- lib/logstash/config/source/multi_local.rb
 - lib/logstash/config/source_loader.rb
 - lib/logstash/converge_result.rb
 - lib/logstash/environment.rb
@@ -351,7 +352,6 @@ files:
 - lib/logstash/instrument/metric_type/base.rb
 - lib/logstash/instrument/metric_type/counter.rb
 - 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
@@ -392,6 +392,7 @@ files:
 - lib/logstash/pipeline_action/reload.rb
 - lib/logstash/pipeline_action/stop.rb
 - lib/logstash/pipeline_reporter.rb
+- lib/logstash/pipeline_settings.rb
 - lib/logstash/plugin.rb
 - lib/logstash/plugins/hooks_registry.rb
 - lib/logstash/plugins/registry.rb
@@ -408,8 +409,10 @@ files:
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/byte_value.rb
 - lib/logstash/util/charset.rb
+- lib/logstash/util/dead_letter_queue_manager.rb
 - lib/logstash/util/decorators.rb
 - lib/logstash/util/duration_formatter.rb
+- lib/logstash/util/environment_variables.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
 - lib/logstash/util/loggable.rb
@@ -429,22 +432,20 @@ files:
 - lib/logstash/webserver.rb
 - locales/en.yml
 - logstash-core.gemspec
-- spec/api/lib/api/logging_spec.rb
-- spec/api/lib/api/node_plugins_spec.rb
-- spec/api/lib/api/node_spec.rb
-- spec/api/lib/api/node_stats_spec.rb
-- spec/api/lib/api/plugins_spec.rb
-- spec/api/lib/api/root_spec.rb
-- spec/api/lib/api/support/resource_dsl_methods.rb
-- spec/api/lib/commands/stats.rb
-- spec/api/lib/errors_spec.rb
-- spec/api/lib/rack_app_spec.rb
-- spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/acked_queue_concurrent_stress_spec.rb
 - spec/logstash/agent/converge_spec.rb
 - spec/logstash/agent/metrics_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/api/commands/stats_spec.rb
+- spec/logstash/api/errors_spec.rb
+- spec/logstash/api/modules/logging_spec.rb
+- spec/logstash/api/modules/node_plugins_spec.rb
+- spec/logstash/api/modules/node_spec.rb
+- spec/logstash/api/modules/node_stats_spec.rb
+- spec/logstash/api/modules/plugins_spec.rb
+- spec/logstash/api/modules/root_spec.rb
+- spec/logstash/api/rack_app_spec.rb
 - spec/logstash/codecs/base_spec.rb
 - spec/logstash/compiler/compiler_spec.rb
 - spec/logstash/config/config_ast_spec.rb
@@ -453,6 +454,7 @@ files:
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/config/pipeline_config_spec.rb
 - spec/logstash/config/source/local_spec.rb
+- spec/logstash/config/source/multi_local_spec.rb
 - spec/logstash/config/source_loader_spec.rb
 - spec/logstash/converge_result_spec.rb
 - spec/logstash/environment_spec.rb
@@ -486,6 +488,7 @@ files:
 - spec/logstash/pipeline_action/create_spec.rb
 - spec/logstash/pipeline_action/reload_spec.rb
 - spec/logstash/pipeline_action/stop_spec.rb
+- spec/logstash/pipeline_dlq_commit_spec.rb
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
@@ -557,22 +560,20 @@ signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
 test_files:
-- spec/api/lib/api/logging_spec.rb
-- spec/api/lib/api/node_plugins_spec.rb
-- spec/api/lib/api/node_spec.rb
-- spec/api/lib/api/node_stats_spec.rb
-- spec/api/lib/api/plugins_spec.rb
-- spec/api/lib/api/root_spec.rb
-- spec/api/lib/api/support/resource_dsl_methods.rb
-- spec/api/lib/commands/stats.rb
-- spec/api/lib/errors_spec.rb
-- spec/api/lib/rack_app_spec.rb
-- spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/acked_queue_concurrent_stress_spec.rb
 - spec/logstash/agent/converge_spec.rb
 - spec/logstash/agent/metrics_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/api/commands/stats_spec.rb
+- spec/logstash/api/errors_spec.rb
+- spec/logstash/api/modules/logging_spec.rb
+- spec/logstash/api/modules/node_plugins_spec.rb
+- spec/logstash/api/modules/node_spec.rb
+- spec/logstash/api/modules/node_stats_spec.rb
+- spec/logstash/api/modules/plugins_spec.rb
+- spec/logstash/api/modules/root_spec.rb
+- spec/logstash/api/rack_app_spec.rb
 - spec/logstash/codecs/base_spec.rb
 - spec/logstash/compiler/compiler_spec.rb
 - spec/logstash/config/config_ast_spec.rb
@@ -581,6 +582,7 @@ test_files:
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/config/pipeline_config_spec.rb
 - spec/logstash/config/source/local_spec.rb
+- spec/logstash/config/source/multi_local_spec.rb
 - spec/logstash/config/source_loader_spec.rb
 - spec/logstash/converge_result_spec.rb
 - spec/logstash/environment_spec.rb
@@ -614,6 +616,7 @@ test_files:
 - spec/logstash/pipeline_action/create_spec.rb
 - spec/logstash/pipeline_action/reload_spec.rb
 - spec/logstash/pipeline_action/stop_spec.rb
+- spec/logstash/pipeline_dlq_commit_spec.rb
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb

data/lib/logstash/instrument/metric_type/mean.rb

@@ -1,33 +0,0 @@
-# encoding: utf-8
-require "logstash/instrument/metric_type/base"
-require "concurrent"
-
-module LogStash module Instrument module MetricType
-  class Mean < Base
-    def initialize(namespaces, key)
-      super(namespaces, key)
-
-      @counter = Concurrent::AtomicFixnum.new
-      @sum = Concurrent::AtomicFixnum.new
-    end
-
-    def increment(value = 1)
-      @counter.increment
-      @sum.increment(value)
-    end
-
-    def decrement(value = 1)
-      @counter.decrement
-      @sum.decrement(value)
-    end
-
-    def mean
-      if @counter > 0
-        @sum.value / @counter.value
-      else
-        0
-      end
-    end
-    alias_method :value, :mean
-  end
-end; end; end

data/spec/api/lib/api/support/resource_dsl_methods.rb

@@ -1,87 +0,0 @@
-# Ruby doesn't have common class for boolean,
-# And to simplify the ResourceDSLMethods check it make sense to have it.
-module Boolean; end
-class TrueClass
-  include Boolean
-end
-class FalseClass
-  include Boolean
-end
-
-module ResourceDSLMethods
-  # Convert a nested hash to a mapping of key paths to expected classes
-  def hash_to_mapping(h, path=[], mapping={})
-    h.each do |k,v|
-      if v.is_a?(Hash)
-        hash_to_mapping(v, path + [k], mapping)
-      else
-        full_path = path + [k]
-        mapping[full_path] = v
-      end
-    end
-    mapping
-  end
-
-  def test_api(expected, path)
-    context "GET #{path}" do
-      let(:payload) { LogStash::Json.load(last_response.body) }
-
-      before(:all) do
-        get path
-      end
-
-      it "should respond OK" do
-        expect(last_response).to be_ok
-      end
-
-
-      describe "the default metadata" do
-        it "should include the host" do
-          expect(payload["host"]).to eql(Socket.gethostname)
-        end
-
-        it "should include the version" do
-          expect(payload["version"]).to eql(LOGSTASH_CORE_VERSION)
-        end
-
-        it "should include the http address" do
-          expect(payload["http_address"]).to eql("#{Socket.gethostname}:#{::LogStash::WebServer::DEFAULT_PORTS.first}")
-        end
-
-        it "should include the node name" do
-          expect(payload["name"]).to eql(@runner.agent.name)
-        end
-
-        it "should include the node id" do
-          expect(payload["id"]).to eql(@runner.agent.id)
-        end
-      end
-
-      hash_to_mapping(expected).each do |resource_path,klass|
-        dotted = resource_path.join(".")
-
-        it "should set '#{dotted}' at '#{path}' to be a '#{klass}'" do
-          expect(last_response).to be_ok # fail early if need be
-          resource_path_value = resource_path.reduce(payload) do |acc,v|
-            expect(acc.has_key?(v)).to eql(true), "Expected to find value '#{v}' in structure '#{acc}', but could not. Payload was '#{payload}'"
-            acc[v]
-          end
-          expect(resource_path_value).to be_a(klass), "could not find '#{dotted}' in #{payload}"
-        end
-      end
-    end
-
-    yield if block_given? # Add custom expectations
-  end
-
-  def test_api_and_resources(expected, xopts={})
-    xopts[:exclude_from_root] ||= []
-    root_expectation = expected.clone
-    xopts[:exclude_from_root].each {|k| root_expectation.delete(k)}
-    test_api(root_expectation, "/")
-
-    expected.keys.each do |key|
-      test_api({key => expected[key]}, "/#{key}")
-    end
-  end
-end

data/spec/api/spec_helper.rb

@@ -1,106 +0,0 @@
-# encoding: utf-8
-API_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "logstash", "api"))
-
-require "stud/task"
-require "logstash/devutils/rspec/spec_helper"
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-require "lib/api/support/resource_dsl_methods"
-require_relative "../support/mocks_classes"
-require_relative "../support/helpers"
-require 'rspec/expectations'
-require "logstash/settings"
-require 'rack/test'
-require 'rspec'
-require "json"
-
-def read_fixture(name)
-  path = File.join(File.dirname(__FILE__), "fixtures", name)
-  File.read(path)
-end
-
-module LogStash
-  class DummyAgent < Agent
-    def start_webserver
-      http_address = "#{Socket.gethostname}:#{::LogStash::WebServer::DEFAULT_PORTS.first}"
-      @webserver = Struct.new(:address).new(http_address)
-      self.metric.gauge([], :http_address, http_address)
-    end
-
-    def stop_webserver; end
-  end
-end
-
-##
-# Class used to wrap and manage the execution of an agent for test,
-# this helps a lot in order to have a more integrated test for the
-# web api, could be also used for other use cases if generalized enough
-##
-class LogStashRunner
-
-  attr_reader :config_str, :agent, :pipeline_settings
-
-  def initialize
-
-    require "securerandom"
-    id = SecureRandom.uuid
-
-    @config_str   = "input { generator {id => 'api-generator-pipeline-#{id}' count => 100 } } output { dummyoutput {} }"
-
-    args = {
-      "config.reload.automatic" => false,
-      "metric.collect" => true,
-      "log.level" => "debug",
-      "node.name" => "test_agent",
-      "http.port" => rand(9600..9700),
-      "http.environment" => "test",
-      "config.string" => @config_str,
-      "pipeline.batch.size" => 1,
-      "pipeline.workers" => 1
-    }
-
-    @settings = ::LogStash::SETTINGS.clone.merge(args)
-    source_loader = LogStash::Config::SourceLoader.new
-    source_loader.configure_sources(LogStash::Config::Source::Local.new(@settings))
-    @agent = LogStash::DummyAgent.new(@settings, source_loader)
-  end
-
-  def start
-    # We start a pipeline that will generate a finite number of events
-    # before starting the expectations
-    @agent_task = Stud::Task.new { agent.execute }
-    @agent_task.wait
-  end
-
-  def stop
-    agent.shutdown
-  end
-end
-
-RSpec::Matchers.define :be_available? do
-  match do |plugin|
-    begin
-      Gem::Specification.find_by_name(plugin["name"])
-      true
-    rescue
-      false
-    end
-  end
-end
-
-shared_context "api setup" do
-  before :all do
-    clear_data_dir
-    @runner = LogStashRunner.new
-    @runner.start
-  end
-
-  after :all do
-    @runner.stop
-  end
-
-  include Rack::Test::Methods
-
-  def app()
-    described_class.new(nil, @runner.agent)
-  end
-end