logstash-core 6.8.20-java → 7.0.0.alpha1-java

data/spec/logstash/util/wrapped_acked_queue_spec.rb

@@ -38,7 +38,7 @@ describe LogStash::WrappedAckedQueue do
     let(:checkpoint_writes) { 1024 }
     let(:checkpoint_interval) { 0 }
     let(:path) { Stud::Temporary.directory }
-    let(:queue) { LogStash::WrappedAckedQueue.new(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval, false, max_bytes) }
+    let(:queue) { LogStash::WrappedAckedQueue.new(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval, max_bytes) }
 
     after do
       queue.close

data/spec/logstash/webserver_spec.rb

@@ -12,7 +12,7 @@ def block_ports(range)
 
   range.each do |port|
     begin
-      server = TCPServer.new("127.0.0.1", port)
+      server = TCPServer.new("localhost", port)
       servers << server
     rescue => e
       # The port can already be taken
@@ -45,7 +45,7 @@ describe LogStash::WebServer do
 
   subject { LogStash::WebServer.new(logger,
                                     agent,
-                                    { :http_host => "127.0.0.1", :http_ports => port_range })}
+                                    { :http_host => "localhost", :http_ports => port_range })}
 
   let(:port_range) { 10000..10010 }
 
@@ -89,9 +89,8 @@ describe LogStash::WebServer do
     after(:each) { free_ports(@servers) }
 
     context "when we have available ports" do
-      let(:blocked_range) { 10000..10005 }
       before(:each) do
-        @servers = block_ports(blocked_range)
+        @servers = block_ports(10000..10005)
       end
 
       it "successfully find an available port" do
@@ -100,13 +99,10 @@ describe LogStash::WebServer do
         end
 
         sleep(1)
-        address = subject.address
-        port = address.split(":").last.to_i
-        expect(port_range).to cover(port)
-        expect(blocked_range).to_not cover(port)
 
-        response = open("http://#{address}").read
+        response = open("http://localhost:10006").read
         expect { LogStash::Json.load(response) }.not_to raise_error
+        expect(subject.address).to eq("localhost:10006")
 
         subject.stop
         t.join

data/spec/support/matchers.rb

@@ -51,50 +51,44 @@ end
 
 RSpec::Matchers.define :have_pipeline? do |pipeline_config|
   match do |agent|
-    pipeline = nil
-    try(30) do
-      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
-      expect(pipeline).to_not be_nil
-    end
+    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(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
   end
 
   match_when_negated do |agent|
-    pipeline = nil
-    try(30) do
-      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
-      expect(pipeline).to_not be_nil
-    end
-    # either the pipeline_id is not in the running pipelines OR it is but have different configurations
-    expect(!agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s) ||  pipeline.config_str != pipeline_config.config_string).to be_truthy
+    pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
+    pipeline.nil? || pipeline.config_str != pipeline_config.config_string
   end
 end
 
 RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
   match do |agent|
-    pipeline = nil
-    try(30) do
+    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
-    expect(pipeline.config_str).to eq(pipeline_config.config_string)
-    expect(pipeline.running?).to be_truthy
-    expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
   end
 
   failure_message do |agent|
     pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
 
     if pipeline.nil?
-      "Expected pipeline to exist and running, be we cannot find '#{pipeline_config.pipeline_id.to_s}' in the running pipelines '#{agent.running_pipelines.keys.join(",")}'"
-    else
-      if !pipeline.running?
-        "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines but its not running"
-      elsif pipeline.config_str != pipeline_config.config_string
-        "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines and running, but the config_string doesn't match,\nExpected:\n#{pipeline_config.config_string}\n\ngot:\n#{pipeline.config_str}"
+      "Expected pipeline to exist and running, be we cannot find `#{pipeline_config.pipeline_id}` in the running pipelines `#{agent.pipelines.keys.join(",")}`"
+      else
+        if pipeline.running? == false
+          "Found `#{pipeline_config.pipeline_id}` in the list of pipelines but its not running"
+        elsif pipeline.config_str != pipeline_config.config_string
+          "Found `#{pipeline_config.pipeline_id}` in the list of pipelines and running, but the config_string doesn't match,
+Expected:
+#{pipeline_config.config_string}
+
+got:
+#{pipeline.config_str}"
+        end
       end
-    end
   end
 
   match_when_negated do

data/spec/support/shared_contexts.rb

@@ -26,12 +26,12 @@ shared_context "api setup" do
     @agent.execute
     pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
     pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
-    @pipelines_registry = LogStash::PipelinesRegistry.new
-    expect(pipeline_creator.execute(@agent, @pipelines_registry)).to be_truthy
+    @pipelines = java.util.concurrent.ConcurrentHashMap.new
+    expect(pipeline_creator.execute(@agent, @pipelines)).to be_truthy
   end
 
   after :all do
-    @pipelines_registry.running_pipelines.each do |_, pipeline|
+    @pipelines.each do |_, pipeline|
       pipeline.shutdown
       pipeline.thread.join
     end

data/versions-gem-copy.yml

@@ -1,27 +1,27 @@
 ---
-logstash: 6.8.20
-logstash-core: 6.8.20
+# alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
+logstash: 7.0.0
+logstash-core: 7.0.0
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url
 # *and* for which jars artifacts are published for compile-time
 jruby:
-  version: 9.2.7.0
-  sha1: dc35f9bb991f526f058bf6b9591c460f98cffe9e
+  version: 9.1.13.0
+  sha1: 815bac27d5daa1459a4477d6d80584f007ce6a68
 
 # jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only,
 # not for the compile-time jars
 #
 #jruby-runtime-override:
-#  url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.2.0.0-SNAPSHOT.tar.gz
-#  version: 9.2.0.0-SNAPSHOT
+#  url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.1.13.0-SNAPSHOT.tar.gz
+#  version: 9.1.13.0-SNAPSHOT
 #  sha1: IGNORE
 
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when
 #       bundler evaluates the gemspec via bin/logstash
 # Ensure Jackson version here is kept in sync with version used by jrjackson gem
-jrjackson: 0.4.11
-jackson: 2.9.10
-jackson-databind: 2.9.10.1
+jrjackson: 0.4.6
+jackson: 2.9.5
 
 # This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.8.20
+  version: 7.0.0.alpha1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.1
   name: pry
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.19
   name: stud
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.5
   name: clamp
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.4
   name: filesize
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.3
   name: gems
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -90,8 +90,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
   name: concurrent-ruby
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -103,23 +103,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 1.6.6
   name: rack
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -130,8 +124,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.6
   name: sinatra
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -147,8 +141,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.16'
   name: puma
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -161,8 +155,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.20
   name: jruby-openssl
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,8 +169,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.6
   name: chronic_duration
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -189,8 +183,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.0
   name: treetop
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
@@ -203,8 +197,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.9
   name: i18n
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -217,8 +211,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
   name: minitar
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -231,8 +225,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.1
   name: rubyzip
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -245,8 +239,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
   name: thread_safe
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -257,15 +251,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.4.6
   name: jrjackson
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -276,8 +270,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.4
   name: elasticsearch
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -296,8 +290,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: manticore
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -420,7 +414,6 @@ files:
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/puma.rb
 - lib/logstash/patches/resolv.rb
-- lib/logstash/patches/resolv_9270.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/pipeline_action.rb
@@ -430,7 +423,6 @@ files:
 - lib/logstash/pipeline_action/stop.rb
 - lib/logstash/pipeline_reporter.rb
 - lib/logstash/pipeline_settings.rb
-- lib/logstash/pipelines_registry.rb
 - lib/logstash/plugin.rb
 - lib/logstash/plugins.rb
 - lib/logstash/plugins/builtin.rb
@@ -455,7 +447,6 @@ files:
 - lib/logstash/util/duration_formatter.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
-- lib/logstash/util/lazy_singleton.rb
 - lib/logstash/util/loggable.rb
 - lib/logstash/util/manticore_ssl_config_helper.rb
 - lib/logstash/util/modules_setting_array.rb
@@ -528,7 +519,6 @@ files:
 - spec/logstash/java_filter_delegator_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/java_pipeline_spec.rb
-- spec/logstash/jruby_version_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
@@ -546,7 +536,6 @@ files:
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
-- spec/logstash/pipelines_registry_spec.rb
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
 - spec/logstash/plugins/hooks_registry_spec.rb
@@ -593,7 +582,7 @@ files:
 - versions-gem-copy.yml
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
-- Apache License (2.0)
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -606,12 +595,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -669,7 +658,6 @@ test_files:
 - spec/logstash/java_filter_delegator_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/java_pipeline_spec.rb
-- spec/logstash/jruby_version_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
@@ -687,7 +675,6 @@ test_files:
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
-- spec/logstash/pipelines_registry_spec.rb
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
 - spec/logstash/plugins/hooks_registry_spec.rb