logstash-core 2.0.0.rc1-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6738c5b93f083b5b3e4ab2089e8abe1b5a39d2a
-  data.tar.gz: c25d3996b2157eb78939cd68baa65f5793f2248a
+  metadata.gz: 75665fe7267b003aff27beb502af98bf15da04ed
+  data.tar.gz: 949bcf9fa8437800a8ae612c7adfa1b9d76e261f
 SHA512:
-  metadata.gz: d92f22f1ec3d512218edd532e328ddbc5df2c8889a056ecbea4bac493d394247428ac93e3353f744825620669235699e1d6e33b45f1a6fcec61f4ce453f03ba3
-  data.tar.gz: 5cceb907fa2837e4567366df43b315011eafaad2f81ce795b7a4712d400b879e2ab68b4a26e01dc21a3e360952306c8e07d911898957ffe8b0a5e029ec4293b0
+  metadata.gz: 2859fffb9a6e5da8dee8ae148d75d0f658969cdd6bc95b9e2c862f93e5236ed7c0dfd4bff70646e4771f739bad7ab290d4a1fceb02b49c52f0be0c3369929b70
+  data.tar.gz: 7501db7d701e0385f1ad1f417132fcca54017f7a94194ea2b7c1d73a8244b99dd96b2dae58e76d0cdd515159efda835d10c8d14a514ba8d33ce092633ed98513

data/lib/logstash/patches.rb

@@ -3,4 +3,3 @@ require "logstash/patches/bugfix_jruby_2558"
 require "logstash/patches/cabin"
 require "logstash/patches/profile_require_calls"
 require "logstash/patches/stronger_openssl_defaults"
-require "logstash/patches/silence_concurrent_ruby_warning"

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "2.0.0-rc1"
+LOGSTASH_VERSION = "2.0.1"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.

data/logstash-core.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "clamp", "~> 0.6.5" #(MIT license) for command line args/flags
   gem.add_runtime_dependency "filesize", "0.0.4" #(MIT license) for :bytes config validator
   gem.add_runtime_dependency "gems", "~> 0.8.3"  #(MIT license)
-  gem.add_runtime_dependency "concurrent-ruby", "~> 0.9.1"
+  gem.add_runtime_dependency "concurrent-ruby", "0.9.2"
   gem.add_runtime_dependency "jruby-openssl", ">= 0.9.11" # Required to support TLSv1.2
 
   # TODO(sissel): Treetop 1.5.x doesn't seem to work well, but I haven't
@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
 
   if RUBY_PLATFORM == 'java'
     gem.platform = RUBY_PLATFORM
-    gem.add_runtime_dependency "jrjackson", "~> 0.3.6" #(Apache 2.0 license)
+    gem.add_runtime_dependency "jrjackson", "~> 0.3.7" #(Apache 2.0 license)
   else
     gem.add_runtime_dependency "oj" #(MIT-style license)
   end

data/spec/license_spec.rb

@@ -12,6 +12,7 @@ describe "Project licenses" do
     Regexp.union([ /mit/,
                    /apache*/,
                    /bsd/,
+                   /artistic 2.*/,
                    /ruby/,
                    /lgpl/])
   }

data/spec/util/retryable_spec.rb

@@ -0,0 +1,139 @@
+require "logstash/util/retryable"
+
+describe LogStash::Retryable do
+  class C
+    include LogStash::Retryable
+  end
+
+  class E < StandardError; end;
+  class F < StandardError; end;
+
+  subject {C.new}
+
+  context "with default fixed 1 second retry sleep" do
+
+    it "should execute once" do
+      expect(subject).to receive(:sleep).never
+      expect(subject.retryable(:rescue => nil){|i| expect(i).to eq(0); "foo"}).to eq("foo")
+    end
+
+    it "should not retry on non rescued exceptions" do
+      i = 0
+      expect(subject).to receive(:sleep).never
+      expect{subject.retryable(:rescue => E){i += 1; raise F}}.to raise_error(F)
+      expect(i).to eq(1)
+    end
+
+    it "should execute once and retry once by default" do
+      i = 0
+      expect(subject).to receive(:sleep).once.with(1)
+      expect{subject.retryable{i += 1; raise E}}.to raise_error(E)
+      expect(i).to eq(2)
+    end
+
+    it "should retry on rescued exceptions" do
+      i = 0
+      expect(subject).to receive(:sleep).once.with(1)
+      expect{subject.retryable(:rescue => E){i += 1; raise E}}.to raise_error(E)
+      expect(i).to eq(2)
+    end
+
+    it "should retry indefinitely" do
+      i = 0
+      expect(subject).to receive(:sleep).exactly(50).times.with(1)
+      expect{subject.retryable(:tries => 0, :rescue => E){i += 1; raise i <= 50 ? E : F}}.to raise_error(F)
+    end
+
+    it "should execute once and retry once by default and execute on_retry callback" do
+      i = 0
+      callback_values = []
+
+      callback = lambda do |retry_count, e|
+        callback_values << [retry_count, e]
+      end
+
+      expect(subject).to receive(:sleep).once.with(1)
+
+      expect do
+        subject.retryable(:on_retry => callback){i += 1; raise E}
+      end.to raise_error
+
+      expect(i).to eq(2)
+
+      expect(callback_values.size).to eq(1)
+      expect(callback_values[0][0]).to eq(1)
+      expect(callback_values[0][1]).to be_a(E)
+    end
+
+    it "should execute once and retry n times" do
+      i = 0
+      n = 3
+      expect(subject).to receive(:sleep).exactly(n).times.with(1)
+      expect{subject.retryable(:tries => n){i += 1; raise E}}.to raise_error(E)
+      expect(i).to eq(n + 1)
+    end
+
+    it "should execute once and retry n times and execute on_retry callback" do
+      i = 0
+      n = 3
+      callback_values = []
+
+      callback = lambda do |retry_count, e|
+        callback_values << [retry_count, e]
+      end
+
+      expect(subject).to receive(:sleep).exactly(n).times.with(1)
+
+      expect do
+        subject.retryable(:tries => n, :on_retry => callback){i += 1; raise E}
+      end.to raise_error
+
+      expect(i).to eq(n + 1)
+
+      expect(callback_values.size).to eq(n)
+      n.times.each do |j|
+        expect(callback_values[j].first).to eq(j + 1)
+        expect(callback_values[j].last).to be_a(E)
+      end
+    end
+  end
+
+  context "with exponential backoff" do
+
+    it "should execute once and retry once with base sleep by default" do
+      expect(subject).to receive(:sleep).once.with(2)
+      expect do
+        subject.retryable(:base_sleep => 2, :max_sleep => 10){raise E}
+      end.to raise_error(E)
+    end
+
+    it "should execute once and retry n times with exponential backoff sleep" do
+      n = 3
+      s = 0.5
+
+      n.times.each do |i|
+        expect(subject).to receive(:sleep).once.with(s * (2 ** i)).ordered
+      end
+      expect do
+        subject.retryable(:tries => n, :base_sleep => s, :max_sleep => 100){raise E}
+      end.to raise_error(E)
+    end
+
+    it "should execute once and retry n times with exponential backoff sleep capping at max_sleep" do
+      n = 20
+      base_sleep = 0.1
+      max_sleep = 1
+
+      expect(subject).to receive(:sleep).once.with(0.1).ordered
+      expect(subject).to receive(:sleep).once.with(0.2).ordered
+      expect(subject).to receive(:sleep).once.with(0.4).ordered
+      expect(subject).to receive(:sleep).once.with(0.8).ordered
+      (n - 4).times.each do |i|
+        expect(subject).to receive(:sleep).once.with(1).ordered
+      end
+      expect do
+        subject.retryable(:tries => n, :base_sleep => base_sleep, :max_sleep => max_sleep){raise E}
+      end.to raise_error(E)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: java
 authors:
 - Jordan Sissel
@@ -10,190 +10,190 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cabin
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+  name: cabin
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
+  name: pry
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
+  name: stud
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: clamp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.0.19
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
+  name: clamp
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: filesize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.6.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.4
+  name: filesize
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: gems
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
+  name: gems
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
+  name: concurrent-ruby
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.11
+  name: jruby-openssl
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: treetop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.9.11
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 1.5.0
+  name: treetop
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: i18n
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.9
+  name: i18n
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: minitar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
+  name: minitar
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
+  name: thread_safe
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
+  name: jrjackson
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.7
 description: The core components of logstash, the scalable log and event management tool
 email:
 - jls@semicomplete.com
@@ -230,7 +230,6 @@ files:
 - lib/logstash/patches/cabin.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/rubygems.rb
-- lib/logstash/patches/silence_concurrent_ruby_warning.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/plugin.rb
@@ -288,6 +287,7 @@ files:
 - spec/util/java_version_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
+- spec/util/retryable_spec.rb
 - spec/util/unicode_trimmer_spec.rb
 - spec/util/worker_threads_default_printer_spec.rb
 - spec/util_spec.rb
@@ -306,9 +306,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.5
@@ -346,6 +346,7 @@ test_files:
 - spec/util/java_version_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
+- spec/util/retryable_spec.rb
 - spec/util/unicode_trimmer_spec.rb
 - spec/util/worker_threads_default_printer_spec.rb
 - spec/util_spec.rb

data/lib/logstash/patches/silence_concurrent_ruby_warning.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-require "logstash/namespace"
-require "concurrent/concern/logging"
-require "concurrent/concern/deprecation"
-require "concurrent/version"
-require "cabin"
-
-# Concurrent-ruby is throwing warning when the code is run under jdk7, and they
-# will provide best effort support, logstash has to support JDK7 for a few months.
-#
-# By default all deprecation warnings of the concurrent ruby
-# library use the `WARN` level which is show everytime we boot logstash,
-# This monkeypatch change the log level of the deprecation warning to be `debug`
-# instead. This monkey patch might be a bit over kill but there is no
-# easy way to override the java version check.
-#
-# ref: https://github.com/ruby-concurrency/concurrent-ruby/blob/v0.9.1/lib/concurrent/configuration.rb#L284-L295
-#
-# This patch is only valid for 0.9.1
-if Concurrent::VERSION == "0.9.1"
-  module Concurrent
-    module Concern
-      module Deprecation
-        include Concern::Logging
-
-        def deprecated(message, strip = 2)
-          caller_line = caller(strip).first if strip > 0
-          klass       = if Module === self
-                          self
-                        else
-                          self.class
-                        end
-          message     = if strip > 0
-                          format("[DEPRECATED] %s\ncalled on: %s", message, caller_line)
-                        else
-                          format('[DEPRECATED] %s', message)
-                        end
-
-          # lets use our logger
-          logger = Cabin::Channel.get(LogStash)
-          logger.debug(message, :class => klass.to_s)
-        end
-
-        extend self
-      end
-    end
-  end
-else
-  # This is added a guard to check if we need to update this code or not.
-  # Keep in mind, the latest releases of concurrent-ruby brokes a few stuff.
-  #
-  # Even the latest master version changed how they handle deprecation.
-  raise "Logstash expects concurrent-ruby version 0.9.1 and version #{Concurrent::VERSION} is installed, please verify this patch: #{__FILE__}"
-end