logstash-core 5.6.9-java → 5.6.10-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c20ed02342c5af6169fdc709d06dda7e09d2290a
4
- data.tar.gz: 7db5edf4112f52efc36e0cc946eecae14dd9f417
3
+ metadata.gz: 3685d79f80d71973d4ccaf11cb11db22a039d195
4
+ data.tar.gz: b9c59e7ef2e12bc8d0d336766f3b612aa44843b0
5
5
  SHA512:
6
- metadata.gz: 386bfe0425dfa4964524fcee4a47b4fd53bbc585edf5d45702c957dbd101a12f988a02fab422d115ef4a27ba9e481be2cb54763fea6459d37e3df8b327497cc7
7
- data.tar.gz: 73af940d17bcd306c9f81fedab8c668cf71a4a692fa12d14f85b99d919834ec7a5620974e1a6128a32537c86e7df911aca704be5df04f11863a25d88892403f3
6
+ metadata.gz: c9b915546582275a9c64605c9ec7c9815814149aa54ca117618781e0db174e5cf0a4ed21f6a9c3283ea1caa032ee1565a5c9bff12fc64caea852708225deeeb7
7
+ data.tar.gz: 797049793991f9809ce1dbf7e579dd8a97e48036564d16f66ec3019c7b78791977799e4d4092cb09889391135058c33f81de48e034252ee6525eaf0fe797b3d2
@@ -5,8 +5,9 @@
5
5
  gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2"
6
6
  gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2"
7
7
  gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2"
8
- gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.4"
9
- gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.4"
10
- gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.4"
11
- gem.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.4"
12
- gem.requirements << "jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.4"
8
+ gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.5"
9
+ gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.5"
10
+ gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.5"
11
+ gem.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.5"
12
+ gem.requirements << "jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.5"
13
+ gem.requirements << "jar com.google.guava:guava, 22.0"
@@ -2,25 +2,35 @@
2
2
  begin
3
3
  require 'jar_dependencies'
4
4
  rescue LoadError
5
+ require 'com/fasterxml/jackson/core/jackson-annotations/2.9.5/jackson-annotations-2.9.5.jar'
5
6
  require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar'
6
- require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
7
+ require 'com/google/guava/guava/22.0/guava-22.0.jar'
8
+ require 'com/fasterxml/jackson/core/jackson-core/2.9.5/jackson-core-2.9.5.jar'
7
9
  require 'org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar'
8
- require 'com/fasterxml/jackson/core/jackson-annotations/2.9.4/jackson-annotations-2.9.4.jar'
10
+ require 'com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar'
11
+ require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.5/jackson-dataformat-cbor-2.9.5.jar'
12
+ require 'com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar'
13
+ require 'org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar'
14
+ require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
9
15
  require 'org/apache/logging/log4j/log4j-slf4j-impl/2.6.2/log4j-slf4j-impl-2.6.2.jar'
10
- require 'com/fasterxml/jackson/core/jackson-databind/2.9.4/jackson-databind-2.9.4.jar'
11
- require 'com/fasterxml/jackson/core/jackson-core/2.9.4/jackson-core-2.9.4.jar'
12
- require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.4/jackson-module-afterburner-2.9.4.jar'
13
- require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.4/jackson-dataformat-cbor-2.9.4.jar'
16
+ require 'com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar'
17
+ require 'com/fasterxml/jackson/core/jackson-databind/2.9.5/jackson-databind-2.9.5.jar'
18
+ require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.5/jackson-module-afterburner-2.9.5.jar'
14
19
  end
15
20
 
16
21
  if defined? Jars
22
+ require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.5'
17
23
  require_jar 'org.apache.logging.log4j', 'log4j-core', '2.6.2'
18
- require_jar 'org.apache.logging.log4j', 'log4j-api', '2.6.2'
24
+ require_jar 'com.google.guava', 'guava', '22.0'
25
+ require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.5'
19
26
  require_jar 'org.slf4j', 'slf4j-api', '1.7.21'
20
- require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.4'
27
+ require_jar 'com.google.code.findbugs', 'jsr305', '1.3.9'
28
+ require_jar 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.5'
29
+ require_jar 'com.google.j2objc', 'j2objc-annotations', '1.1'
30
+ require_jar 'org.codehaus.mojo', 'animal-sniffer-annotations', '1.14'
31
+ require_jar 'org.apache.logging.log4j', 'log4j-api', '2.6.2'
21
32
  require_jar 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.2'
22
- require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.4'
23
- require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.4'
24
- require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.4'
25
- require_jar 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.4'
33
+ require_jar 'com.google.errorprone', 'error_prone_annotations', '2.0.18'
34
+ require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.5'
35
+ require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.5'
26
36
  end
@@ -45,7 +45,7 @@ module LogStash
45
45
  Setting::String.new("http.host", "127.0.0.1"),
46
46
  Setting::PortRange.new("http.port", 9600..9700),
47
47
  Setting::String.new("http.environment", "production"),
48
- Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
48
+ Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
49
49
  Setting::Boolean.new("queue.drain", false),
50
50
  Setting::Bytes.new("queue.page_capacity", "250mb"),
51
51
  Setting::Bytes.new("queue.max_bytes", "1024mb"),
@@ -19,10 +19,6 @@ module LogStash
19
19
  queue_path = ::File.join(settings.get("path.queue"), settings.get("pipeline.id"))
20
20
 
21
21
  case queue_type
22
- when "memory_acked"
23
- # memory_acked is used in tests/specs
24
- FileUtils.mkdir_p(queue_path)
25
- LogStash::Util::WrappedAckedQueue.create_memory_based(queue_path, queue_page_capacity, queue_max_events, queue_max_bytes)
26
22
  when "persisted"
27
23
  # persisted is the disk based acked queue
28
24
  FileUtils.mkdir_p(queue_path)
@@ -31,7 +27,7 @@ module LogStash
31
27
  # memory is the legacy and default setting
32
28
  LogStash::Util::WrappedSynchronousQueue.new
33
29
  else
34
- raise ConfigurationError, "Invalid setting `#{queue_type}` for `queue.type`, supported types are: 'memory_acked', 'memory', 'persisted'"
30
+ raise ConfigurationError, "Invalid setting `#{queue_type}` for `queue.type`, supported types are 'memory' and 'persisted'"
35
31
  end
36
32
  end
37
33
  end
@@ -306,7 +306,7 @@ class LogStash::Runner < Clamp::StrictCommand
306
306
  end
307
307
 
308
308
  # lock path.data before starting the agent
309
- @data_path_lock = FileLockFactory.getDefault().obtainLock(setting("path.data"), ".lock");
309
+ @data_path_lock = FileLockFactory.obtainLock(java.nio.file.Paths.get(setting("path.data")).to_absolute_path, ".lock")
310
310
 
311
311
  @agent = create_agent(@settings)
312
312
 
@@ -351,7 +351,7 @@ class LogStash::Runner < Clamp::StrictCommand
351
351
  Stud::untrap("INT", sigint_id) unless sigint_id.nil?
352
352
  Stud::untrap("TERM", sigterm_id) unless sigterm_id.nil?
353
353
  Stud::untrap("HUP", sighup_id) unless sighup_id.nil?
354
- FileLockFactory.getDefault().releaseLock(@data_path_lock) if @data_path_lock
354
+ FileLockFactory.releaseLock(@data_path_lock) if @data_path_lock
355
355
  @log_fd.close if @log_fd
356
356
  end # def self.main
357
357
 
@@ -20,12 +20,6 @@ module LogStash; module Util
20
20
  class QueueClosedError < ::StandardError; end
21
21
  class NotImplementedError < ::StandardError; end
22
22
 
23
- def self.create_memory_based(path, capacity, max_events, max_bytes)
24
- self.allocate.with_queue(
25
- LogStash::AckedMemoryQueue.new(path, capacity, max_events, max_bytes)
26
- )
27
- end
28
-
29
23
  def self.create_file_based(path, capacity, max_events, checkpoint_max_writes, checkpoint_max_acks, checkpoint_max_interval, max_bytes)
30
24
  self.allocate.with_queue(
31
25
  LogStash::AckedQueue.new(path, capacity, max_events, checkpoint_max_writes, checkpoint_max_acks, checkpoint_max_interval, max_bytes)
@@ -110,19 +110,4 @@ describe LogStash::Instrument::WrappedWriteClient do
110
110
 
111
111
  include_examples "queue tests"
112
112
  end
113
-
114
- context "AckedMemoryQueue" do
115
- let(:queue) { LogStash::Util::WrappedAckedQueue.create_memory_based("", 1024, 10, 4096) }
116
-
117
- before do
118
- read_client.set_events_metric(metric.namespace([:stats, :events]))
119
- read_client.set_pipeline_metric(metric.namespace([:stats, :pipelines, :main, :events]))
120
- end
121
-
122
- after do
123
- queue.close
124
- end
125
-
126
- include_examples "queue tests"
127
- end
128
113
  end
@@ -79,7 +79,7 @@ describe LogStash::Pipeline do
79
79
  let(:number_of_events) { 100_000 }
80
80
  let(:page_capacity) { 1 * 1024 * 512 } # 1 128
81
81
  let(:max_bytes) { 1024 * 1024 * 1024 } # 1 gb
82
- let(:queue_type) { "persisted" } # "memory" "memory_acked"
82
+ let(:queue_type) { "persisted" } # "memory"
83
83
  let(:times) { [] }
84
84
 
85
85
  let(:pipeline_thread) do
@@ -8,7 +8,7 @@ describe LogStash::QueueFactory do
8
8
  let(:settings_array) do
9
9
  [
10
10
  LogStash::Setting::WritableDirectory.new("path.queue", Stud::Temporary.pathname),
11
- LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
11
+ LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
12
12
  LogStash::Setting::Bytes.new("queue.page_capacity", "250mb"),
13
13
  LogStash::Setting::Bytes.new("queue.max_bytes", "1024mb"),
14
14
  LogStash::Setting::Numeric.new("queue.max_events", 0),
@@ -57,18 +57,6 @@ describe LogStash::QueueFactory do
57
57
  end
58
58
  end
59
59
 
60
- context "when `queue.type` is `memory_acked`" do
61
- before do
62
- settings.set("queue.type", "memory_acked")
63
- end
64
-
65
- it "returns a `WrappedAckedQueue`" do
66
- queue = subject.create(settings)
67
- expect(queue).to be_kind_of(LogStash::Util::WrappedAckedQueue)
68
- queue.close
69
- end
70
- end
71
-
72
60
  context "when `queue.type` is `memory`" do
73
61
  before do
74
62
  settings.set("queue.type", "memory")
@@ -30,20 +30,6 @@ describe LogStash::Util::WrappedAckedQueue do
30
30
  end
31
31
  end
32
32
 
33
- context "memory" do
34
- let(:page_capacity) { 1024 }
35
- let(:max_events) { 0 }
36
- let(:max_bytes) { 0 }
37
- let(:path) { Stud::Temporary.directory }
38
- let(:queue) { LogStash::Util::WrappedAckedQueue.create_memory_based(path, page_capacity, max_events, max_bytes) }
39
-
40
- after do
41
- queue.close
42
- end
43
-
44
- include_examples "queue tests"
45
- end
46
-
47
33
  context "persisted" do
48
34
  let(:page_capacity) { 1024 }
49
35
  let(:max_events) { 0 }
@@ -1,12 +1,12 @@
1
1
  ---
2
- logstash: 5.6.9
3
- logstash-core: 5.6.9
2
+ logstash: 5.6.10
3
+ logstash-core: 5.6.10
4
4
  logstash-core-plugin-api: 2.1.29
5
5
 
6
6
  # Note: this file is copied to the root of logstash-core because its gemspec needs it when
7
7
  # bundler evaluates the gemspec via bin/logstash
8
8
  # Ensure Jackson version here is kept in sync with version used by jrjackson gem
9
- jrjackson: 0.4.5
10
- jackson: 2.9.4
9
+ jrjackson: 0.4.6
10
+ jackson: 2.9.5
11
11
 
12
12
  # This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.6.9
4
+ version: 5.6.10
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-12 00:00:00.000000000 Z
11
+ date: 2018-06-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ dependencies:
251
251
  requirements:
252
252
  - - '='
253
253
  - !ruby/object:Gem::Version
254
- version: 0.4.5
254
+ version: 0.4.6
255
255
  name: jrjackson
256
256
  prerelease: false
257
257
  type: :runtime
@@ -259,7 +259,7 @@ dependencies:
259
259
  requirements:
260
260
  - - '='
261
261
  - !ruby/object:Gem::Version
262
- version: 0.4.5
262
+ version: 0.4.6
263
263
  - !ruby/object:Gem::Dependency
264
264
  requirement: !ruby/object:Gem::Requirement
265
265
  requirements:
@@ -599,11 +599,12 @@ requirements:
599
599
  - jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2
600
600
  - jar org.apache.logging.log4j:log4j-api, 2.6.2
601
601
  - jar org.apache.logging.log4j:log4j-core, 2.6.2
602
- - jar com.fasterxml.jackson.core:jackson-core, 2.9.4
603
- - jar com.fasterxml.jackson.core:jackson-databind, 2.9.4
604
- - jar com.fasterxml.jackson.core:jackson-annotations, 2.9.4
605
- - jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.4
606
- - jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.4
602
+ - jar com.fasterxml.jackson.core:jackson-core, 2.9.5
603
+ - jar com.fasterxml.jackson.core:jackson-databind, 2.9.5
604
+ - jar com.fasterxml.jackson.core:jackson-annotations, 2.9.5
605
+ - jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.5
606
+ - jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.5
607
+ - jar com.google.guava:guava, 22.0
607
608
  rubyforge_project:
608
609
  rubygems_version: 2.4.8
609
610
  signing_key: