plugin-api 2.0

.travis.yml

@@ -1,7 +1,11 @@
 sudo: false
+jdk:
+  - oraclejdk8
 language: ruby
 cache: bundler
 rvm:
-  - jruby-1.7.23
-script: 
+  - jruby-1.7.25
+before_install:
+  - git clone -b feature/event_interface https://github.com/elastic/logstash
+script:
   - bundle exec rspec spec

Gemfile

@@ -1,2 +1,9 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+
+# this is temporary for the feature/plugin-api-2_0 branch and is meant for travis testing
+gem "logstash-core", :path => "./logstash/logstash-core"
+gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
+gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
+gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"
+gem "logstash-patterns-core", :github => "logstash-plugins/logstash-patterns-core", :branch => "feature/plugin-api-2_0"

lib/logstash/filters/grok.rb

@@ -247,7 +247,7 @@ def register
       # will let folks redefine built-in patterns at runtime.
       @patternfiles += patterns_files_from_paths(@@patterns_path.to_a, "*")
       @patternfiles += patterns_files_from_paths(@patterns_dir, @patterns_files_glob)
-  
+
       @patterns = Hash.new { |h,k| h[k] = [] }
 
       @logger.info? and @logger.info("Match data", :match => @match)
@@ -269,8 +269,6 @@ def register
 
     public
     def filter(event)
-
-
       matched = false
       done = false
 
@@ -294,7 +292,7 @@ def filter(event)
 
     private
     def match(groks, field, event)
-      input = event[field]
+      input = event.get(field)
       if input.is_a?(Array)
         success = false
         input.each do |input|
@@ -327,21 +325,21 @@ def handle(field, value, event)
       return if (value.nil? || (value.is_a?(String) && value.empty?)) unless @keep_empty_captures
 
       if @overwrite.include?(field)
-        event[field] = value
+        event.set(field, value)
       else
-        v = event[field]
+        v = event.get(field)
         if v.nil?
-          event[field] = value
+          event.set(field, value)
         elsif v.is_a?(Array)
           # do not replace the code below with:
           #   event[field] << value
           # this assumes implementation specific feature of returning a mutable object
           # from a field ref which should not be assumed and will change in the future.
           v << value
-          event[field] = v
+          event.set(field, v)
         elsif v.is_a?(String)
           # Promote to array since we aren't overwriting.
-          event[field] = [v, value]
+          event.set(field, [v, value])
         end
       end
     end

logstash-filter-grok.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_runtime_dependency 'jls-grok', '~> 0.11.1'
   s.add_runtime_dependency 'logstash-patterns-core'