logstash-core 5.6.9-java → 5.6.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20ed02342c5af6169fdc709d06dda7e09d2290a
-  data.tar.gz: 7db5edf4112f52efc36e0cc946eecae14dd9f417
+  metadata.gz: 3685d79f80d71973d4ccaf11cb11db22a039d195
+  data.tar.gz: b9c59e7ef2e12bc8d0d336766f3b612aa44843b0
 SHA512:
-  metadata.gz: 386bfe0425dfa4964524fcee4a47b4fd53bbc585edf5d45702c957dbd101a12f988a02fab422d115ef4a27ba9e481be2cb54763fea6459d37e3df8b327497cc7
-  data.tar.gz: 73af940d17bcd306c9f81fedab8c668cf71a4a692fa12d14f85b99d919834ec7a5620974e1a6128a32537c86e7df911aca704be5df04f11863a25d88892403f3
+  metadata.gz: c9b915546582275a9c64605c9ec7c9815814149aa54ca117618781e0db174e5cf0a4ed21f6a9c3283ea1caa032ee1565a5c9bff12fc64caea852708225deeeb7
+  data.tar.gz: 797049793991f9809ce1dbf7e579dd8a97e48036564d16f66ec3019c7b78791977799e4d4092cb09889391135058c33f81de48e034252ee6525eaf0fe797b3d2

data/gemspec_jars.rb

@@ -5,8 +5,9 @@
 gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2"
 gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2"
 gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.4"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.4"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.4"
-gem.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.4"
-gem.requirements << "jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.4"
+gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.5"
+gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.5"
+gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.5"
+gem.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.5"
+gem.requirements << "jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.5"
+gem.requirements << "jar com.google.guava:guava, 22.0"

data/lib/logstash-core_jars.rb

@@ -2,25 +2,35 @@
 begin
   require 'jar_dependencies'
 rescue LoadError
+  require 'com/fasterxml/jackson/core/jackson-annotations/2.9.5/jackson-annotations-2.9.5.jar'
   require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar'
-  require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
+  require 'com/google/guava/guava/22.0/guava-22.0.jar'
+  require 'com/fasterxml/jackson/core/jackson-core/2.9.5/jackson-core-2.9.5.jar'
   require 'org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar'
-  require 'com/fasterxml/jackson/core/jackson-annotations/2.9.4/jackson-annotations-2.9.4.jar'
+  require 'com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar'
+  require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.5/jackson-dataformat-cbor-2.9.5.jar'
+  require 'com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar'
+  require 'org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar'
+  require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
   require 'org/apache/logging/log4j/log4j-slf4j-impl/2.6.2/log4j-slf4j-impl-2.6.2.jar'
-  require 'com/fasterxml/jackson/core/jackson-databind/2.9.4/jackson-databind-2.9.4.jar'
-  require 'com/fasterxml/jackson/core/jackson-core/2.9.4/jackson-core-2.9.4.jar'
-  require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.4/jackson-module-afterburner-2.9.4.jar'
-  require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.4/jackson-dataformat-cbor-2.9.4.jar'
+  require 'com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar'
+  require 'com/fasterxml/jackson/core/jackson-databind/2.9.5/jackson-databind-2.9.5.jar'
+  require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.5/jackson-module-afterburner-2.9.5.jar'
 end
 
 if defined? Jars
+  require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.5'
   require_jar 'org.apache.logging.log4j', 'log4j-core', '2.6.2'
-  require_jar 'org.apache.logging.log4j', 'log4j-api', '2.6.2'
+  require_jar 'com.google.guava', 'guava', '22.0'
+  require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.5'
   require_jar 'org.slf4j', 'slf4j-api', '1.7.21'
-  require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.4'
+  require_jar 'com.google.code.findbugs', 'jsr305', '1.3.9'
+  require_jar 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.5'
+  require_jar 'com.google.j2objc', 'j2objc-annotations', '1.1'
+  require_jar 'org.codehaus.mojo', 'animal-sniffer-annotations', '1.14'
+  require_jar 'org.apache.logging.log4j', 'log4j-api', '2.6.2'
   require_jar 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.2'
-  require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.4'
-  require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.4'
-  require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.4'
-  require_jar 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.4'
+  require_jar 'com.google.errorprone', 'error_prone_annotations', '2.0.18'
+  require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.5'
+  require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.5'
 end

data/lib/logstash/environment.rb

@@ -45,7 +45,7 @@ module LogStash
             Setting::String.new("http.host", "127.0.0.1"),
             Setting::PortRange.new("http.port", 9600..9700),
             Setting::String.new("http.environment", "production"),
-            Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
+            Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
             Setting::Boolean.new("queue.drain", false),
             Setting::Bytes.new("queue.page_capacity", "250mb"),
             Setting::Bytes.new("queue.max_bytes", "1024mb"),

data/lib/logstash/queue_factory.rb

@@ -19,10 +19,6 @@ module LogStash
       queue_path = ::File.join(settings.get("path.queue"), settings.get("pipeline.id"))
 
       case queue_type
-      when "memory_acked"
-        # memory_acked is used in tests/specs
-        FileUtils.mkdir_p(queue_path)
-        LogStash::Util::WrappedAckedQueue.create_memory_based(queue_path, queue_page_capacity, queue_max_events, queue_max_bytes)
       when "persisted"
         # persisted is the disk based acked queue
         FileUtils.mkdir_p(queue_path)
@@ -31,7 +27,7 @@ module LogStash
         # memory is the legacy and default setting
         LogStash::Util::WrappedSynchronousQueue.new
       else
-        raise ConfigurationError, "Invalid setting `#{queue_type}` for `queue.type`, supported types are: 'memory_acked', 'memory', 'persisted'"
+        raise ConfigurationError, "Invalid setting `#{queue_type}` for `queue.type`, supported types are 'memory' and 'persisted'"
       end
     end
   end

data/lib/logstash/runner.rb

@@ -306,7 +306,7 @@ class LogStash::Runner < Clamp::StrictCommand
     end
 
     # lock path.data before starting the agent
-    @data_path_lock = FileLockFactory.getDefault().obtainLock(setting("path.data"), ".lock");
+    @data_path_lock = FileLockFactory.obtainLock(java.nio.file.Paths.get(setting("path.data")).to_absolute_path, ".lock")
 
     @agent = create_agent(@settings)
 
@@ -351,7 +351,7 @@ class LogStash::Runner < Clamp::StrictCommand
     Stud::untrap("INT", sigint_id) unless sigint_id.nil?
     Stud::untrap("TERM", sigterm_id) unless sigterm_id.nil?
     Stud::untrap("HUP", sighup_id) unless sighup_id.nil?
-    FileLockFactory.getDefault().releaseLock(@data_path_lock) if @data_path_lock
+    FileLockFactory.releaseLock(@data_path_lock) if @data_path_lock
     @log_fd.close if @log_fd
   end # def self.main
 

data/lib/logstash/util/wrapped_acked_queue.rb

@@ -20,12 +20,6 @@ module LogStash; module Util
     class QueueClosedError < ::StandardError; end
     class NotImplementedError < ::StandardError; end
 
-    def self.create_memory_based(path, capacity, max_events, max_bytes)
-      self.allocate.with_queue(
-        LogStash::AckedMemoryQueue.new(path, capacity, max_events, max_bytes)
-      )
-    end
-
     def self.create_file_based(path, capacity, max_events, checkpoint_max_writes, checkpoint_max_acks, checkpoint_max_interval, max_bytes)
       self.allocate.with_queue(
         LogStash::AckedQueue.new(path, capacity, max_events, checkpoint_max_writes, checkpoint_max_acks, checkpoint_max_interval, max_bytes)

data/spec/logstash/instrument/wrapped_write_client_spec.rb

@@ -110,19 +110,4 @@ describe LogStash::Instrument::WrappedWriteClient do
 
     include_examples "queue tests"
   end
-
-  context "AckedMemoryQueue" do
-    let(:queue) { LogStash::Util::WrappedAckedQueue.create_memory_based("", 1024, 10, 4096) }
-
-    before do
-      read_client.set_events_metric(metric.namespace([:stats, :events]))
-      read_client.set_pipeline_metric(metric.namespace([:stats, :pipelines, :main, :events]))
-    end
-
-    after do
-      queue.close
-    end
-
-    include_examples "queue tests"
-  end
 end

data/spec/logstash/pipeline_pq_file_spec.rb

@@ -79,7 +79,7 @@ describe LogStash::Pipeline do
   let(:number_of_events) { 100_000 }
   let(:page_capacity) { 1 * 1024 * 512 } # 1 128
   let(:max_bytes) { 1024 * 1024 * 1024 } # 1 gb
-  let(:queue_type) { "persisted" } #  "memory" "memory_acked"
+  let(:queue_type) { "persisted" } #  "memory"
   let(:times) { [] }
 
   let(:pipeline_thread) do

data/spec/logstash/queue_factory_spec.rb

@@ -8,7 +8,7 @@ describe LogStash::QueueFactory do
   let(:settings_array) do
     [
       LogStash::Setting::WritableDirectory.new("path.queue", Stud::Temporary.pathname),
-      LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
+      LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
       LogStash::Setting::Bytes.new("queue.page_capacity", "250mb"),
       LogStash::Setting::Bytes.new("queue.max_bytes", "1024mb"),
       LogStash::Setting::Numeric.new("queue.max_events", 0),
@@ -57,18 +57,6 @@ describe LogStash::QueueFactory do
     end
   end
 
-  context "when `queue.type` is `memory_acked`" do
-    before do
-      settings.set("queue.type", "memory_acked")
-    end
-
-    it "returns a `WrappedAckedQueue`" do
-      queue =  subject.create(settings)
-      expect(queue).to be_kind_of(LogStash::Util::WrappedAckedQueue)
-      queue.close
-    end
-  end
-
   context "when `queue.type` is `memory`" do
     before do
       settings.set("queue.type", "memory")

data/spec/logstash/util/wrapped_acked_queue_spec.rb

@@ -30,20 +30,6 @@ describe LogStash::Util::WrappedAckedQueue do
     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 }

data/versions-gem-copy.yml

@@ -1,12 +1,12 @@
 ---
-logstash: 5.6.9
-logstash-core: 5.6.9
+logstash: 5.6.10
+logstash-core: 5.6.10
 logstash-core-plugin-api: 2.1.29
 
 # 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.5
-jackson: 2.9.4
+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: 5.6.9
+  version: 5.6.10
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   name: jrjackson
   prerelease: false
   type: :runtime
@@ -259,7 +259,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -599,11 +599,12 @@ 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.9.4
-- jar com.fasterxml.jackson.core:jackson-databind, 2.9.4
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.4
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.4
-- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.4
+- jar com.fasterxml.jackson.core:jackson-core, 2.9.5
+- jar com.fasterxml.jackson.core:jackson-databind, 2.9.5
+- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.5
+- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.5
+- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.5
+- jar com.google.guava:guava, 22.0
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: