logstash-core 1.5.6-java → 2.0.0.beta1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723f34de549c83a2114afd134860e9a93cafb310
-  data.tar.gz: 73fce31c78dc734c8922fe2a38257c43bce819b7
+  metadata.gz: 8280b889d663e0310425acfb0f7d75f4e1a024e0
+  data.tar.gz: a164ff373d9abbd7189adf99af24bacb3bc91238
 SHA512:
-  metadata.gz: cec9fae39b4b2c75bf262b2be5749a65d9e13e534e5483e7f32179fb4528cf0a79eae63f35792f571b364711dd52b616cf40324c579a8a84e1ecb770fa35b6a3
-  data.tar.gz: e7882a5bef5a3b932c61f0992a68c81f4402ce6f034f4140b435bbb53203cc5ad45da640290a36487f6c4ad831c0caa8ed279c92350be9c70f4b20e5f6f37e13
+  metadata.gz: c8b4f816cac02bf178e9b408a28a8178d4b608adbca9d58e0528fe9f9b52b1c0ab37edddd88f83b8f8b9b66de4fed6f9aafe8b4867b7ab5aca48588df8edeccb
+  data.tar.gz: 4dd5b531749f62087e2816b5855e4093f8039ad07a5c9753b1a8d2a58f9d3a311b7459f129ed4eaf38c311132c16537c766c6f85556bf438fe5809d924b75173

data/lib/logstash/agent.rb

@@ -7,22 +7,22 @@ require "net/http"
 LogStash::Environment.load_locale!
 
 class LogStash::Agent < Clamp::Command
+  DEFAULT_INPUT = "input { stdin { type => stdin } }"
+  DEFAULT_OUTPUT = "output { stdout { codec => rubydebug } }"
+
   option ["-f", "--config"], "CONFIG_PATH",
     I18n.t("logstash.agent.flag.config"),
     :attribute_name => :config_path
 
   option "-e", "CONFIG_STRING",
-    I18n.t("logstash.agent.flag.config-string"),
+    I18n.t("logstash.agent.flag.config-string",
+           :default_input => DEFAULT_INPUT, :default_output => DEFAULT_OUTPUT),
     :default => "", :attribute_name => :config_string
 
   option ["-w", "--filterworkers"], "COUNT",
     I18n.t("logstash.agent.flag.filterworkers"),
     :attribute_name => :filter_workers, :default => 1, &:to_i
 
-  option "--watchdog-timeout", "SECONDS",
-    I18n.t("logstash.agent.flag.watchdog-timeout"),
-    :default => 10, &:to_f
-
   option ["-l", "--log"], "FILE",
     I18n.t("logstash.agent.flag.log"),
     :attribute_name => :log_file
@@ -102,11 +102,11 @@ class LogStash::Agent < Clamp::Command
     else
       # include a default stdin input if no inputs given
       if @config_string !~ /input *{/
-        @config_string += "input { stdin { type => stdin } }"
+        @config_string += DEFAULT_INPUT
       end
       # include a default stdout output if no outputs given
       if @config_string !~ /output *{/
-        @config_string += "output { stdout { codec => rubydebug } }"
+        @config_string += DEFAULT_OUTPUT
       end
     end
 

data/lib/logstash/json.rb

@@ -32,23 +32,15 @@ module LogStash
     ### JRuby
 
     def jruby_load(data, options = {})
-      # 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)
-
+      options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data)
     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)
-
-      JrJackson::Base.generate(o, {})
-
+      o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o)
     rescue => e
       raise LogStash::Json::GeneratorError.new(e.message)
     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 => "TLS",
+    :ssl_version => "SSLv23",
     :ciphers => MOZILLA_INTERMEDIATE_CIPHERS,
     :options => __default_options # Not a constant because it's computed at start-time.
   }

data/lib/logstash/plugin.rb

@@ -97,18 +97,6 @@ class LogStash::Plugin
     return "#{self.class.name}: #{@params}"
   end
 
-  protected
-  def update_watchdog(state)
-    Thread.current[:watchdog] = Time.now
-    Thread.current[:watchdog_state] = state
-  end
-
-  protected
-  def clear_watchdog
-    Thread.current[:watchdog] = nil
-    Thread.current[:watchdog_state] = nil
-  end
-
   public
   def inspect
     if !@params.nil?

data/lib/logstash/string_interpolation.rb

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

data/lib/logstash/version.rb

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

data/locales/en.yml

@@ -128,7 +128,7 @@ en:
           This is often a permissions issue, or the wrong 
           path was specified?
       flag:
-        # Note: Wrap these at 45 chars so they display nicely when clamp emits
+        # Note: Wrap these at 55 chars so they display nicely when clamp emits
         # them in an 80-character terminal
         config: |+
           Load the logstash config from a specific file
@@ -141,20 +141,18 @@ en:
         config-string: |+
           Use the given string as the configuration
           data. Same syntax as the config file. If no
-          input is specified, then 'stdin 
-          { type => stdin }' is the default input.
-          If no output is specified, then  'stdout
-          { codec => rubydebug } }' is default output.
+          input is specified, then the following is
+          used as the default input:
+          "%{default_input}"
+          and if no output is specified, then the
+          following is used as the default output:
+          "%{default_output}"
+          If you wish to use both defaults, please use
+          the empty string for the '-e' flag.
         configtest: |+
-          Check configuration, then exit.
+          Check configuration for valid syntax and then exit.
         filterworkers: |+
           Sets the number of filter workers to run.
-        watchdog-timeout: |+
-          Set the filter watchdog timeout (in seconds).
-          This timeout is used to detect stuck filters;
-          stuck filters usually symptoms of bugs.
-          When a filter takes longer than TIMEOUT
-          seconds, it will cause logstash to abort.
         log: |+
           Write logstash internal logs to the given
           file. Without this flag, logstash will emit

data/logstash-core.gemspec

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

data/spec/core/event_spec.rb

@@ -50,10 +50,6 @@ 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
@@ -104,10 +100,6 @@ 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)
@@ -446,14 +438,14 @@ describe LogStash::Event do
         end
       end
     end
-  end
 
-  context "signal events" do
-    it "should define the shutdown event" do
-      # the SHUTDOWN and FLUSH constants are part of the plugin API contract
-      # if they are changed, all plugins must be updated
-      expect(LogStash::SHUTDOWN).to be_a(LogStash::ShutdownEvent)
-      expect(LogStash::FLUSH).to be_a(LogStash::FlushEvent)
+    context "signal events" do
+      it "should define the shutdown event" do
+        # the SHUTDOWN and FLUSH constants are part of the plugin API contract
+        # if they are changed, all plugins must be updated
+        expect(LogStash::SHUTDOWN).to be_a(LogStash::ShutdownEvent)
+        expect(LogStash::FLUSH).to be_a(LogStash::FlushEvent)
+      end
     end
   end
 

data/spec/license_spec.rb

@@ -16,18 +16,6 @@ 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|
@@ -45,7 +33,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 2.0.0.beta1
 platform: java
 authors:
 - Jordan Sissel
@@ -10,190 +10,162 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   name: cabin
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.1
-  name: pry
+        version: 0.7.0
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
-  name: stud
+        version: 0.10.1
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
-  name: clamp
+        version: 0.0.19
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
-  name: filesize
+        version: 0.6.5
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
-  name: gems
+        version: 0.0.4
   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
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  name: concurrent-ruby
+        version: 0.8.3
   prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        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
+  name: treetop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.9.11
-- !ruby/object:Gem::Dependency
+        version: 1.5.0
   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: 1.5.0
-- !ruby/object:Gem::Dependency
+        version: 0.6.9
   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.6.9
-- !ruby/object:Gem::Dependency
+        version: 0.5.4
   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.5.4
-- !ruby/object:Gem::Dependency
+        version: 0.3.5
   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.5
-- !ruby/object:Gem::Dependency
+        version: 0.2.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
-  name: jrjackson
+        version: 0.2.9
   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
@@ -236,7 +208,6 @@ files:
 - lib/logstash/runner.rb
 - lib/logstash/sized_queue.rb
 - lib/logstash/string_interpolation.rb
-- lib/logstash/threadwatchdog.rb
 - lib/logstash/timestamp.rb
 - lib/logstash/util.rb
 - lib/logstash/util/accessors.rb
@@ -277,7 +248,6 @@ files:
 - 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
@@ -300,12 +270,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.4.5
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -331,7 +301,6 @@ test_files:
 - 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

data/lib/logstash/threadwatchdog.rb

@@ -1,37 +0,0 @@
-# encoding: utf-8
-require "logstash/namespace"
-require "logstash/logging"
-
-class LogStash::ThreadWatchdog
-  attr_accessor :logger
-  attr_accessor :threads
-
-  class TimeoutError < StandardError; end
-
-  public
-  def initialize(threads, watchdog_timeout=10)
-    @threads = threads
-    @watchdog_timeout = watchdog_timeout
-  end # def initialize
-
-  public
-  def watch
-    while sleep(1)
-      cutoff = Time.now - @watchdog_timeout
-      @threads.each do |t|
-        watchdog = t[:watchdog]
-        if watchdog and watchdog <= cutoff
-          age = Time.now - watchdog
-          @logger.fatal("thread watchdog timeout",
-                        :thread => t,
-                        :backtrace => t.backtrace,
-                        :thread_watchdog => watchdog,
-                        :age => age,
-                        :cutoff => @watchdog_timeout,
-                        :state => t[:watchdog_state])
-          raise TimeoutError, "watchdog timeout"
-        end
-      end
-    end
-  end # def watch
-end # class LogStash::ThreadWatchdog

data/spec/util/buftok_spec.rb

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