logstash-core 1.5.4.snapshot3-java → 1.5.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81637255e5a0f8848a3ea9a4539cc10aa6d6eff9
-  data.tar.gz: b7d330113cecfba7f28f6ea335e30761f51a6631
+  metadata.gz: bcdaa633e8abfba5f4119b3f86ddb01025884bb2
+  data.tar.gz: 0a5cc230da55ff5a750de1348aa644ca315d222c
 SHA512:
-  metadata.gz: d4208838fc91f40f20707f5e0d5df0879d391eb78e304a3bc7d060de883a9af3ce15798618cb4fcd32448c4b7e73f2f80747be86a4461def9d73cfceb4bd8d66
-  data.tar.gz: 4dfe6842bd6947a1817051756c7d158a381528775c1db3c41ff5657fabc68085743fdfdc6e67391ce12cabb16f1ac1c7a0db41495ee447888a5fa45a97bb04d2
+  metadata.gz: 44f580d37db8bef96651db6f7cca1609b2844bcdfc8f1cee49ea62d61d144b09fae59cde0d2d79c40231247c19913a468285c44f37cc2c71a73fd3589ab8f0c2
+  data.tar.gz: cbe4e467858261ad10efb3d92387cfc88742e29418edcd53386662ea642eb82740581e3e9fae1513e570b694dffffcea67137be4d81a84eb7d38fdd0300b4547

data/lib/logstash/java_integration.rb

@@ -78,6 +78,22 @@ module java::util::Collection
     self.removeAll([o]) ? o : block_given? ? yield : nil
   end
 
+  def compact
+    duped = Java::JavaUtil::ArrayList.new(self)
+    duped.compact!
+    duped
+  end
+
+  def compact!
+    size_before = self.size
+    self.removeAll(java::util::Collections.singleton(nil))
+    if size_before == self.size
+      nil
+    else
+      self
+    end
+  end
+
   # support the Ruby intersection method on Java Collection
   def &(other)
     # transform self into a LinkedHashSet to remove duplicates and preserve order as defined by the Ruby Array intersection contract

data/lib/logstash/json.rb

@@ -32,15 +32,23 @@ module LogStash
     ### JRuby
 
     def jruby_load(data, options = {})
-      options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data)
+      # TODO [guyboertje] remove these comments in 5.0
+      # options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data)
+
+      JrJackson::Ruby.parse(data, options)
+
     rescue JrJackson::ParseError => e
       raise LogStash::Json::ParserError.new(e.message)
     end
 
     def jruby_dump(o)
+      # TODO [guyboertje] remove these comments in 5.0
       # test for enumerable here to work around an omission in JrJackson::Json.dump to
       # also look for Java::JavaUtil::ArrayList, see TODO submit issue
-      o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o)
+      # o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o)
+
+      JrJackson::Base.generate(o, {})
+
     rescue => e
       raise LogStash::Json::GeneratorError.new(e.message)
     end

data/lib/logstash/patches.rb

@@ -3,3 +3,4 @@ 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/patches/silence_concurrent_ruby_warning.rb

@@ -0,0 +1,54 @@
+# 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

data/lib/logstash/patches/stronger_openssl_defaults.rb

@@ -61,7 +61,7 @@ class OpenSSL::SSL::SSLContext
   # For more details see: https://github.com/elastic/logstash/issues/3657
   remove_const(:DEFAULT_PARAMS) if const_defined?(:DEFAULT_PARAMS)
   DEFAULT_PARAMS = {
-    :ssl_version => "SSLv23",
+    :ssl_version => "TLS",
     :ciphers => MOZILLA_INTERMEDIATE_CIPHERS,
     :options => __default_options # Not a constant because it's computed at start-time.
   }

data/lib/logstash/string_interpolation.rb

@@ -46,7 +46,7 @@ module LogStash
         position = match.offset(0).last
       end
 
-      if position < template.size - 1
+      if position < template.size
         nodes << StaticNode.new(template[position..-1])
       end
 

data/lib/logstash/util/java_version.rb

@@ -53,6 +53,7 @@ module LogStash::Util::JavaVersion
     return nil if version_string.nil?
 
     parsed = parse_java_version(version_string)
+    return false unless parsed
 
     if parsed[:major] == 1 && parsed[:minor] == 7 && parsed[:patch] == 0 && parsed[:update] < 51
       true

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "1.5.4.snapshot3"
+LOGSTASH_VERSION = "1.5.5"
 
 # 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,6 +23,8 @@ 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 "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
   # investigated what the cause might be. -Jordan
@@ -37,7 +39,7 @@ Gem::Specification.new do |gem|
 
   if RUBY_PLATFORM == 'java'
     gem.platform = RUBY_PLATFORM
-    gem.add_runtime_dependency "jrjackson", "~> 0.2.9" #(Apache 2.0 license)
+    gem.add_runtime_dependency "jrjackson", "~> 0.3.6" #(Apache 2.0 license)
   else
     gem.add_runtime_dependency "oj" #(MIT-style license)
   end

data/spec/core/event_spec.rb

@@ -50,6 +50,10 @@ describe LogStash::Event do
         expect(subject.sprintf("%{+%s}")).to eq("1356998400")
       end
 
+      it "should work if there is no fieldref in the string" do
+        expect(subject.sprintf("bonjour")).to eq("bonjour")
+      end
+
       it "should raise error when formatting %{+%s} when @timestamp field is missing" do
         str = "hello-%{+%s}"
         subj = subject.clone
@@ -100,6 +104,10 @@ describe LogStash::Event do
         expect(subject.sprintf("%{[j][k3]}")).to eq("{\"4\":\"m\"}")
       end
 
+      it "should not strip last character" do
+        expect(subject.sprintf("%{type}%{message}|")).to eq("sprintfhello world|")
+      end
+
       context "#encoding" do
         it "should return known patterns as UTF-8" do
           expect(subject.sprintf("%{message}").encoding).to eq(Encoding::UTF_8)

data/spec/lib/logstash/java_integration_spec.rb

@@ -211,6 +211,36 @@ describe "Java integration" do
         end
       end
     end
+
+    context "when compacting" do
+      context "#compact with nils" do
+        let(:initial_array) { [1,2,3,nil,nil,6] }
+        it "should remove nil values from a copy" do
+          expect(subject.compact).to eq([1,2,3,6])
+          expect(subject).to eq([1,2,3,nil,nil,6])
+        end
+      end
+
+      context "#compact! with nils" do
+        let(:initial_array) { [1,2,3,nil,nil,6] }
+        it "should remove nil values" do
+          expect(subject.compact!).to eq([1,2,3,6])
+          expect(subject).to eq([1,2,3,6])
+        end
+
+        it "should return the original" do
+          expect(subject.compact!.object_id).to eq(subject.object_id)
+        end
+      end
+
+      context "#compact! without nils" do
+        let(:initial_array) { [1,2,3,6] }
+        it "should return nil" do
+          expect(subject.compact!).to be nil
+          expect(subject).to eq([1,2,3,6])
+        end
+      end
+    end
   end
 
   context "Enumerable implementation" do

data/spec/license_spec.rb

@@ -16,6 +16,18 @@ describe "Project licenses" do
                    /lgpl/])
   }
 
+  ##
+  # This licenses are skipped from the license test of many reasons, check
+  # the exact dependency for detailed information.
+  ##
+  let(:skipped_dependencies) do
+    [
+      # Skipped because of already included and bundled within JRuby so checking here is redundant.
+      # Need to take action about jruby licenses to enable again or keep skeeping.
+      "jruby-openssl"
+    ]
+  end
+
   shared_examples "runtime license test" do
 
     subject(:gem_name) do |example|
@@ -33,6 +45,7 @@ describe "Project licenses" do
     it "has runtime dependencies with expected licenses" do
       spec.runtime_dependencies.map { |dep| dep.to_spec }.each do |runtime_spec|
         next unless runtime_spec
+        next if skipped_dependencies.include?(runtime_spec.name)
         runtime_spec.licenses.each do |license|
           expect(license.downcase).to match(expected_licenses)
         end

data/spec/pluginmanager/util_spec.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+require "spec_helper"
+require "pluginmanager/util"
+require "gems"
+
+describe LogStash::PluginManager do
+
+  let(:plugin_name) { "logstash-output-elasticsearch" }
+
+  let(:version_data) do
+    [ { "authors"=>"Elastic", "built_at"=>"2015-08-11T00:00:00.000Z", "description"=>"Output events to elasticsearch",
+        "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"2.0.0.pre",
+        "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>true,
+        "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
+    { "authors"=>"Elastic", "built_at"=>"2015-08-10T00:00:00.000Z", "description"=>"Output events to elasticsearch",
+      "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"1.0.7",
+      "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>false,
+      "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
+    { "authors"=>"Elastic", "built_at"=>"2015-08-09T00:00:00.000Z", "description"=>"Output events to elasticsearch",
+      "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"1.0.4",
+      "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>false,
+      "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"} ]
+  end
+
+  before(:each) do
+    allow(Gems).to receive(:versions).with(plugin_name).and_return(version_data)
+  end
+
+  context "fetch plugin info" do
+
+    it "should search for the last version infomation non prerelease" do
+      version_info = LogStash::PluginManager.fetch_latest_version_info(plugin_name)
+      expect(version_info["number"]).to eq("1.0.7")
+    end
+
+
+    it "should search for the last version infomation with prerelease" do
+      version_info = LogStash::PluginManager.fetch_latest_version_info(plugin_name, :pre => true)
+      expect(version_info["number"]).to eq("2.0.0.pre")
+    end
+  end
+end

data/spec/util/buftok_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/buftok"
+
+describe  FileWatch::BufferedTokenizer  do
+
+  subject { FileWatch::BufferedTokenizer.new }
+
+  it "should tokenize a single token" do
+    expect(subject.extract("foo\n")).to eq(["foo"])
+  end
+
+  it "should merge multiple token" do
+    expect(subject.extract("foo")).to eq([])
+    expect(subject.extract("bar\n")).to eq(["foobar"])
+  end
+
+  it "should tokenize multiple token" do
+    expect(subject.extract("foo\nbar\n")).to eq(["foo", "bar"])
+  end
+
+  it "should ignore empty payload" do
+    expect(subject.extract("")).to eq([])
+    expect(subject.extract("foo\nbar")).to eq(["foo"])
+  end
+
+  it "should tokenize empty payload with newline" do
+    expect(subject.extract("\n")).to eq([""])
+    expect(subject.extract("\n\n\n")).to eq(["", "", ""])
+  end
+end

data/spec/util/java_version_spec.rb

@@ -27,6 +27,10 @@ describe "LogStash::Util::JavaVersion" do
     expect(mod.bad_java_version?("1.8.0-beta")).to be_falsey
   end
 
+  it "should not mark non-standard javas as bad (IBM JDK)" do
+    expect(mod.bad_java_version?("pwi3270sr9fp10-20150708_01 (SR9 FP10)")).to be_falsey
+  end
+
   describe "parsing java versions" do
     it "should return nil on a nil version" do
       expect(mod.parse_java_version(nil)).to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.4.snapshot3
+  version: 1.5.5
 platform: java
 authors:
 - Jordan Sissel
@@ -10,162 +10,190 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-28 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.7.0
-- !ruby/object:Gem::Dependency
+        version: 0.10.1
   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.10.1
-- !ruby/object:Gem::Dependency
+        version: 0.0.19
   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.0.19
-- !ruby/object:Gem::Dependency
+        version: 0.6.5
   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.6.5
-- !ruby/object:Gem::Dependency
+        version: 0.0.4
   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.0.4
-- !ruby/object:Gem::Dependency
+        version: 0.8.3
   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.8.3
+        version: 0.9.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
-  name: treetop
+        version: 0.9.11
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.6.9
-  name: i18n
+        version: 1.5.0
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
-  name: minitar
+        version: 0.6.9
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
-  name: thread_safe
+        version: 0.5.4
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.9
-  name: jrjackson
+        version: 0.3.5
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  prerelease: false
+  type: :runtime
 description: The core components of logstash, the scalable log and event management tool
 email:
 - jls@semicomplete.com
@@ -201,6 +229,7 @@ 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
@@ -246,8 +275,10 @@ files:
 - spec/logstash/agent_spec.rb
 - spec/logstash/patches_spec.rb
 - spec/outputs/base_spec.rb
+- spec/pluginmanager/util_spec.rb
 - spec/spec_helper.rb
 - spec/util/accessors_spec.rb
+- spec/util/buftok_spec.rb
 - spec/util/charset_spec.rb
 - spec/util/gemfile_spec.rb
 - spec/util/java_version_spec.rb
@@ -270,12 +301,12 @@ 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.8
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -298,8 +329,10 @@ test_files:
 - spec/logstash/agent_spec.rb
 - spec/logstash/patches_spec.rb
 - spec/outputs/base_spec.rb
+- spec/pluginmanager/util_spec.rb
 - spec/spec_helper.rb
 - spec/util/accessors_spec.rb
+- spec/util/buftok_spec.rb
 - spec/util/charset_spec.rb
 - spec/util/gemfile_spec.rb
 - spec/util/java_version_spec.rb