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

data/spec/logstash/util/wrapped_acked_queue_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/wrapped_acked_queue"
+
+describe LogStash::Util::WrappedAckedQueue do
+  shared_examples "queue tests" do
+    it "is_empty? on creation" do
+      expect(queue.is_empty?).to be_truthy
+    end
+
+    it "not is_empty? after pushing an element" do
+      queue.push(LogStash::Event.new)
+      expect(queue.is_empty?).to be_falsey
+    end
+
+    it "not is_empty? when all elements are not acked" do
+      queue.push(LogStash::Event.new)
+      batch = queue.read_batch(1, 250)
+      expect(batch.get_elements.size).to eq(1)
+      expect(queue.is_empty?).to be_falsey
+    end
+
+    it "is_empty? when all elements are acked" do
+      queue.push(LogStash::Event.new)
+      batch = queue.read_batch(1, 250)
+      expect(batch.get_elements.size).to eq(1)
+      expect(queue.is_empty?).to be_falsey
+      batch.close
+      expect(queue.is_empty?).to be_truthy
+    end
+  end
+
+  context "memory" do
+    let(:page_capacity) { 1024 }
+    let(:max_events) { 0 }
+    let(:max_bytes) { 0 }
+    let(:path) { Stud::Temporary.directory }
+    let(:queue) { LogStash::Util::WrappedAckedQueue.create_memory_based(path, page_capacity, max_events, max_bytes) }
+
+    after do
+      queue.close
+    end
+
+    include_examples "queue tests"
+  end
+
+  context "persisted" do
+    let(:page_capacity) { 1024 }
+    let(:max_events) { 0 }
+    let(:max_bytes) { 0 }
+    let(:checkpoint_acks) { 1024 }
+    let(:checkpoint_writes) { 1024 }
+    let(:checkpoint_interval) { 0 }
+    let(:path) { Stud::Temporary.directory }
+    let(:queue) { LogStash::Util::WrappedAckedQueue.create_file_based(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval, max_bytes) }
+
+    after do
+      queue.close
+    end
+
+    include_examples "queue tests"
+  end
+end

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -4,28 +4,6 @@ require "logstash/util/wrapped_synchronous_queue"
 require "logstash/instrument/collector"
 
 describe LogStash::Util::WrappedSynchronousQueue do
-  context "#offer" do
-    context "queue is blocked" do
-      it "fails and give feedback" do
-        expect(subject.offer("Bonjour", 2)).to be_falsey
-      end
-    end
-
-    context "queue is not blocked" do
-      before do
-        @consumer = Thread.new { loop { subject.take } }
-        sleep(0.1)
-      end
-
-      after do
-        @consumer.kill
-      end
-
-      it "inserts successfully" do
-        expect(subject.offer("Bonjour", 20)).to be_truthy
-      end
-    end
-  end
 
   describe "queue clients" do
     context "when requesting a write client" do

data/spec/support/helpers.rb

@@ -63,7 +63,7 @@ def mock_pipeline_config(pipeline_id, config_string = nil, settings = {})
     settings = mock_settings(settings)
   end
 
-  config_part = org.logstash.common.SourceWithMetadata.new("config_string", "config_string", config_string)
+  config_part = org.logstash.common.SourceWithMetadata.new("config_string", "config_string", 0, 0, config_string)
 
   LogStash::Config::PipelineConfig.new(LogStash::Config::Source::Local, pipeline_id, config_part, settings)
 end

data/spec/support/matchers.rb

@@ -2,6 +2,7 @@
 require "rspec"
 require "rspec/expectations"
 require "logstash/config/pipeline_config"
+require "stud/try"
 
 RSpec::Matchers.define :be_a_metric_event do |namespace, type, *args|
   match do
@@ -63,10 +64,12 @@ end
 
 RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
   match do |agent|
-    pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
-    expect(pipeline).to_not be_nil
-    expect(pipeline.config_str).to eq(pipeline_config.config_string)
-    expect(pipeline.running?).to be_truthy
+    Stud.try(10.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
+      expect(pipeline).to_not be_nil
+      expect(pipeline.config_str).to eq(pipeline_config.config_string)
+      expect(pipeline.running?).to be_truthy
+    end
   end
 
   failure_message do |agent|
@@ -131,3 +134,17 @@ RSpec::Matchers.define :be_a_source_with_metadata do |protocol, id, text = nil|
    expect(actual.text).to match(text) unless text.nil?
   end
 end
+
+RSpec::Matchers.define :be_a_config_loading_error_hash do |regex|
+  match do |hash|
+    expect(hash).to include(:error)
+    error = hash[:error]
+    expect(error).to be_a(LogStash::ConfigLoadingError)
+    expect(error.message).to match(regex)
+  end
+
+  match_when_negated do
+    raise "Not implemented"
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha2
+  version: 6.0.0.beta1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,17 +83,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
   name: concurrent-ruby
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -147,7 +153,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.16
+        version: 0.9.20
   name: jruby-openssl
   prerelease: false
   type: :runtime
@@ -155,7 +161,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.16
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -217,7 +223,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.2.1
   name: rubyzip
   prerelease: false
   type: :runtime
@@ -225,7 +231,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -282,7 +288,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.9
-description: The core components of logstash, the scalable log and event management tool
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+  name: elasticsearch
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  name: manticore
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: The core components of logstash, the scalable log and event management
+  tool
 email:
 - info@elastic.co
 executables: []
@@ -330,12 +377,16 @@ files:
 - lib/logstash/config/file.rb
 - lib/logstash/config/grammar.rb
 - lib/logstash/config/mixin.rb
+- lib/logstash/config/modules_common.rb
 - lib/logstash/config/pipeline_config.rb
 - lib/logstash/config/source/base.rb
 - lib/logstash/config/source/local.rb
+- lib/logstash/config/source/modules.rb
 - lib/logstash/config/source/multi_local.rb
 - lib/logstash/config/source_loader.rb
+- lib/logstash/config/string_escape.rb
 - lib/logstash/converge_result.rb
+- lib/logstash/elasticsearch_client.rb
 - lib/logstash/environment.rb
 - lib/logstash/errors.rb
 - lib/logstash/event.rb
@@ -346,10 +397,10 @@ files:
 - lib/logstash/inputs/base.rb
 - lib/logstash/inputs/threadable.rb
 - lib/logstash/instrument/collector.rb
+- lib/logstash/instrument/global_metrics.rb
 - lib/logstash/instrument/metric.rb
 - lib/logstash/instrument/metric_store.rb
 - lib/logstash/instrument/metric_type.rb
-- lib/logstash/instrument/metric_type/base.rb
 - lib/logstash/instrument/metric_type/counter.rb
 - lib/logstash/instrument/metric_type/gauge.rb
 - lib/logstash/instrument/namespaced_metric.rb
@@ -357,6 +408,7 @@ files:
 - lib/logstash/instrument/null_metric.rb
 - lib/logstash/instrument/periodic_poller/base.rb
 - lib/logstash/instrument/periodic_poller/cgroup.rb
+- lib/logstash/instrument/periodic_poller/dlq.rb
 - lib/logstash/instrument/periodic_poller/jvm.rb
 - lib/logstash/instrument/periodic_poller/load_average.rb
 - lib/logstash/instrument/periodic_poller/os.rb
@@ -369,6 +421,23 @@ files:
 - lib/logstash/logging.rb
 - lib/logstash/logging/json.rb
 - lib/logstash/logging/logger.rb
+- lib/logstash/modules/cli_parser.rb
+- lib/logstash/modules/elasticsearch_config.rb
+- lib/logstash/modules/elasticsearch_importer.rb
+- lib/logstash/modules/elasticsearch_resource.rb
+- lib/logstash/modules/file_reader.rb
+- lib/logstash/modules/kibana_base.rb
+- lib/logstash/modules/kibana_client.rb
+- lib/logstash/modules/kibana_config.rb
+- lib/logstash/modules/kibana_dashboards.rb
+- lib/logstash/modules/kibana_importer.rb
+- lib/logstash/modules/kibana_resource.rb
+- lib/logstash/modules/kibana_settings.rb
+- lib/logstash/modules/logstash_config.rb
+- lib/logstash/modules/resource_base.rb
+- lib/logstash/modules/scaffold.rb
+- lib/logstash/modules/settings_merger.rb
+- lib/logstash/modules/util.rb
 - lib/logstash/namespace.rb
 - lib/logstash/output_delegator.rb
 - lib/logstash/output_delegator_strategies/legacy.rb
@@ -396,13 +465,11 @@ files:
 - lib/logstash/plugin.rb
 - lib/logstash/plugins/hooks_registry.rb
 - lib/logstash/plugins/registry.rb
-- lib/logstash/program.rb
 - lib/logstash/queue_factory.rb
 - lib/logstash/runner.rb
 - lib/logstash/settings.rb
 - lib/logstash/shutdown_watcher.rb
 - lib/logstash/state_resolver.rb
-- lib/logstash/string_interpolation.rb
 - lib/logstash/timestamp.rb
 - lib/logstash/universal_plugin.rb
 - lib/logstash/util.rb
@@ -456,6 +523,7 @@ files:
 - spec/logstash/config/source/local_spec.rb
 - spec/logstash/config/source/multi_local_spec.rb
 - spec/logstash/config/source_loader_spec.rb
+- spec/logstash/config/string_escape_spec.rb
 - spec/logstash/converge_result_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/event_dispatcher_spec.rb
@@ -474,6 +542,7 @@ files:
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/cgroup_spec.rb
+- spec/logstash/instrument/periodic_poller/dlq_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/instrument/periodic_poller/os_spec.rb
@@ -482,6 +551,9 @@ files:
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
+- spec/logstash/modules/cli_parser_spec.rb
+- spec/logstash/modules/logstash_config_spec.rb
+- spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -503,6 +575,7 @@ files:
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
+- spec/logstash/settings/splittable_string_array_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings/time_value_spec.rb
 - spec/logstash/settings/writable_directory_spec.rb
@@ -520,6 +593,7 @@ files:
 - spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/wrapped_acked_queue_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb
@@ -548,14 +622,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
+- jar org.apache.logging.log4j:log4j-slf4j-impl, 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
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.7.4
-- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.7.4
+- jar com.fasterxml.jackson.core:jackson-core, 2.7.3
+- jar com.fasterxml.jackson.core:jackson-databind, 2.7.3
+- jar com.fasterxml.jackson.core:jackson-annotations, 2.7.3
+- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.7.3
+- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.7.3
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -584,6 +660,7 @@ test_files:
 - spec/logstash/config/source/local_spec.rb
 - spec/logstash/config/source/multi_local_spec.rb
 - spec/logstash/config/source_loader_spec.rb
+- spec/logstash/config/string_escape_spec.rb
 - spec/logstash/converge_result_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/event_dispatcher_spec.rb
@@ -602,6 +679,7 @@ test_files:
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/cgroup_spec.rb
+- spec/logstash/instrument/periodic_poller/dlq_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/instrument/periodic_poller/os_spec.rb
@@ -610,6 +688,9 @@ test_files:
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
+- spec/logstash/modules/cli_parser_spec.rb
+- spec/logstash/modules/logstash_config_spec.rb
+- spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -631,6 +712,7 @@ test_files:
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
+- spec/logstash/settings/splittable_string_array_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings/time_value_spec.rb
 - spec/logstash/settings/writable_directory_spec.rb
@@ -648,6 +730,7 @@ test_files:
 - spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/wrapped_acked_queue_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb

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

@@ -1,31 +0,0 @@
-# encoding: utf-8
-require "logstash/util"
-
-module LogStash module Instrument module MetricType
-  class Base
-    attr_reader :namespaces, :key
-
-    def initialize(namespaces, key)
-      @namespaces = namespaces
-      @key = key
-    end
-
-    def inspect
-      "#{self.class.name} - namespaces: #{namespaces} key: #{key} value: #{value}"
-    end
-
-    def to_hash
-      {
-        key => value
-      }
-    end
-
-    def to_json_data
-      value
-    end
-
-    def type
-      @type ||= LogStash::Util.class_name(self).downcase
-    end
-  end
-end; end; end