logstash-core 1.5.0.rc3.snapshot2-java → 1.5.0.rc3.snapshot3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec518211d023c5f4499757aed7d6e3cfdf7c2fa
-  data.tar.gz: 8434ea102ecd49a99ddbf66f9c1730028087f661
+  metadata.gz: 349047620a2726f0c42566a25c9e6a2b229d9ece
+  data.tar.gz: d6d9a858c12499f66ff7f0d2e250267208bd77d3
 SHA512:
-  metadata.gz: a2312511be9d28f1a5d0b07fc66bfba8a50dcdb3299c15b6ee9bc803356f2fc4ee668b9c38047b64cfc4532117f4c43e9fa6fd20236cb20abd391001c75177ba
-  data.tar.gz: 44784d222a78ba4cfe8ee0a9b84b342d780280fcc62fbb3b0823bb1c0f110b08ca941e3e2c204e8f31bcd3c245b390170e012e35b030d41fd6e9ae9603a8a8ee
+  metadata.gz: e5fe3f78adde94e7fbc5327fdebb3534f3086f14d86d558a6f225c930256bbdf7edd9ce175bc08757e6c3cbc6872db8166a25f439718712a3eb20b5c5e4a18d0
+  data.tar.gz: d0f571cbc5d26b5b0a54a4e79b3ca87abb698bd5d4ad9a05bc6ff7ecfdf7f1f726f1b40c99643c99319f58d742d45f06f08c7a7c95048421051f7f2a9ada60cc

data/lib/logstash/config/config_ast.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 require 'logstash/errors'
 require "treetop"
+
 class Treetop::Runtime::SyntaxNode
+
   def compile
     return "" if elements.nil?
     return elements.collect(&:compile).reject(&:empty?).join("")
@@ -55,11 +57,31 @@ class Treetop::Runtime::SyntaxNode
   end
 end
 
+
 module LogStash; module Config; module AST
+
+  def self.defered_conditionals=(val)
+    @defered_conditionals = val
+  end
+
+  def self.defered_conditionals
+    @defered_conditionals
+  end
+
+  def self.defered_conditionals_index
+    @defered_conditionals_index
+  end
+
+  def self.defered_conditionals_index=(val)
+    @defered_conditionals_index = val
+  end
+
   class Node < Treetop::Runtime::SyntaxNode; end
 
   class Config < Node
     def compile
+      LogStash::Config::AST.defered_conditionals = []
+      LogStash::Config::AST.defered_conditionals_index = 0
       code = []
 
       code << <<-CODE
@@ -94,6 +116,9 @@ module LogStash; module Config; module AST
       end
 
       code += definitions.join("\n").split("\n", -1).collect { |l| "  #{l}" }
+
+      code += LogStash::Config::AST.defered_conditionals
+
       return code.join("\n")
     end
   end
@@ -124,20 +149,15 @@ module LogStash; module Config; module AST
             #{name}_flush = lambda do |options, &block|
               @logger.debug? && @logger.debug(\"Flushing\", :plugin => #{name})
 
-              flushed_events = #{name}.flush(options)
+              events = #{name}.flush(options)
 
-              return if flushed_events.nil? || flushed_events.empty?
+              return if events.nil? || events.empty?
 
-              flushed_events.each do |event|
-                @logger.debug? && @logger.debug(\"Flushing\", :plugin => #{name}, :event => event)
+              @logger.debug? && @logger.debug(\"Flushing\", :plugin => #{name}, :events => events)
 
-                events = [event]
-                #{plugin.compile_starting_here.gsub(/^/, "  ")}
-
-                block.call(event)
-                events.flatten.each{|e| block.call(e) if e != event}
-              end
+              #{plugin.compile_starting_here.gsub(/^/, "  ")}
 
+              events.each{|e| block.call(e)}
             end
 
             if #{name}.respond_to?(:flush)
@@ -210,7 +230,7 @@ module LogStash; module Config; module AST
         return "start_input(#{variable_name})"
       when "filter"
         return <<-CODE
-          events = #{variable_name}.multi_filter(events)
+          #{variable_name}.filter(event) {|new_event| events << new_event }
         CODE
       when "output"
         return "#{variable_name}.handle(event)\n"
@@ -357,14 +377,38 @@ module LogStash; module Config; module AST
       # at the end, events is returned to handle the case where no branch match and no branch code is executed
       # so we must make sure to return the current event.
 
-      <<-CODE
-        #{super}
-        end
-      CODE
+      type = recursive_select_parent(PluginSection).first.plugin_type.text_value
+
+      if type == "filter"
+        i = LogStash::Config::AST.defered_conditionals_index += 1
+        source = <<-CODE
+          def cond_func_#{i}(input_events)
+            result = []
+            input_events.each do |event|
+              events = [event]
+              #{super}
+              end
+              result += events
+            end
+            result
+          end
+        CODE
+        LogStash::Config::AST.defered_conditionals << source
+
+        <<-CODE
+          events = cond_func_#{i}(events)
+        CODE
+      else
+        <<-CODE
+          #{super}
+          end
+        CODE
+      end
     end
   end
 
   class BranchEntry < Node; end
+
   class If < BranchEntry
     def compile
       children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }

data/lib/logstash/event.rb

@@ -235,6 +235,10 @@ class LogStash::Event
       # Take the inside of the %{ ... }
       key = tok[2 ... -1]
 
+      if key[0] == "+" && !@data.has_key?(TIMESTAMP)
+        raise LogStash::Error, "Unable to format \"#{key}\" in string \"#{format}\", #{TIMESTAMP} field not found"
+      end
+
       if key == "+%s"
         # Got %{+%s}, support for unix epoch time
         next @data[TIMESTAMP].to_i

data/lib/logstash/filters/base.rb

@@ -146,24 +146,6 @@ class LogStash::Filters::Base < LogStash::Plugin
     raise "#{self.class}#filter must be overidden"
   end # def filter
 
-
-  # in 1.5.0 multi_filter is meant to be used in the generated filter function in LogStash::Config::AST::Plugin only
-  # and is temporary until we refactor the filter method interface to accept events list and return events list,
-  # just list in multi_filter see https://github.com/elastic/logstash/issues/2872.
-  # refactoring the filter method will mean updating all plugins which we want to avoid doing for 1.5.0.
-  #
-  # @param events [Array<LogStash::Event] list of events to filter
-  # @return [Array<LogStash::Event] filtered events and any new events generated by the filter
-  public
-  def multi_filter(events)
-    result = []
-    events.each do |event|
-      result << event
-      filter(event){|new_event| result << new_event}
-    end
-    result
-  end
-
   public
   def execute(event, &block)
     filter(event, &block)

data/lib/logstash/java_integration.rb

@@ -6,36 +6,75 @@ require "java"
 # not test for is_a?(Array) or is_a?(Hash) and we do not want to include tests for
 # both classes everywhere. see LogStash::JSon.
 
-class Java::JavaUtil::ArrayList
-  # have ArrayList objects report is_a?(Array) == true
-  def is_a?(clazz)
-    return true if clazz == Array
+class Array
+  # enable class equivalence between Array and ArrayList
+  # so that ArrayList will work with case o when Array ...
+  def self.===(other)
+    return true if other.is_a?(Java::JavaUtil::Collection)
     super
   end
 end
 
+class Hash
+  # enable class equivalence between Hash and LinkedHashMap
+  # so that LinkedHashMap will work with case o when Hash ...
+  def self.===(other)
+    return true if other.is_a?(Java::JavaUtil::Map)
+    super
+  end
+end
+
+
+# this is a temporary fix to solve a bug in JRuby where classes implementing the Map interface, like LinkedHashMap
+# have a bug in the has_key? method that is implemented in the Enumerable module that is somehow mixed in the Map interface.
+# this bug makes has_key? (and all its aliases) return false for a key that has a nil value.
+# Only LinkedHashMap is patched here because patching the Map interface is not working.
+# TODO find proper fix, and submit upstream
+# releavant JRuby files:
+# https://github.com/jruby/jruby/blob/master/core/src/main/ruby/jruby/java/java_ext/java.util.rb
+# https://github.com/jruby/jruby/blob/master/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
 class Java::JavaUtil::LinkedHashMap
-  # have LinkedHashMap objects report is_a?(Array) == true
+  def has_key?(key)
+    self.containsKey(key)
+  end
+  alias_method :include?, :has_key?
+  alias_method :member?, :has_key?
+  alias_method :key?, :has_key?
+end
+
+module java::util::Map
+  # have Map objects like LinkedHashMap objects report is_a?(Array) == true
   def is_a?(clazz)
     return true if clazz == Hash
     super
   end
 end
 
-class Array
-  # enable class equivalence between Array and ArrayList
-  # so that ArrayList will work with case o when Array ...
-  def self.===(other)
-    return true if other.is_a?(Java::JavaUtil::ArrayList)
+module java::util::Collection
+  # have Collections objects like ArrayList report is_a?(Array) == true
+  def is_a?(clazz)
+    return true if clazz == Array
     super
   end
-end
 
-class Hash
-  # enable class equivalence between Hash and LinkedHashMap
-  # so that LinkedHashMap will work with case o when Hash ...
-  def self.===(other)
-    return true if other.is_a?(Java::JavaUtil::LinkedHashMap)
-    super
+  # support the Ruby Array delete method on a Java Collection
+  def delete(o)
+    self.removeAll([o]) ? o : block_given? ? yield : nil
+  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
+    duped = Java::JavaUtil::LinkedHashSet.new(self)
+    duped.retainAll(other)
+    duped
+  end
+
+  # support the Ruby union method on Java Collection
+  def |(other)
+    # transform self into a LinkedHashSet to remove duplicates and preserve order as defined by the Ruby Array union contract
+    duped = Java::JavaUtil::LinkedHashSet.new(self)
+    duped.addAll(other)
+    duped
   end
 end

data/lib/logstash/util/accessors.rb

@@ -55,7 +55,8 @@ module LogStash::Util
 
     def include?(accessor)
       target, key = lookup_path(accessor)
-      return target.include?(key)
+      return false unless target
+      target.is_a?(Array) ? !target[key.to_i].nil? : target.include?(key)
     end
 
     private

data/lib/logstash/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc3.snapshot2
+  version: 1.5.0.rc3.snapshot3
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin