logstash-filter-grok 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2156be2aaef0d13ad330e90b4e944f07fd5caa4
-  data.tar.gz: 8942af6f6ca5680c40f4851e6ba94c669e79bfc1
+  metadata.gz: e45feb32b6599f171a7d75ef08a165301a02a798
+  data.tar.gz: d6895d5112db9412404ddb9da3806210b85a15b4
 SHA512:
-  metadata.gz: ab1e10603d6cbf3bd6ee646a2e2c201f327c0e435c06cfb4e729905ed062fbbd1ce8afa1cadc0a4ac69620af36657a7a2cc252cc28f26dec040d0e802bed20fd
-  data.tar.gz: 9aa1ba7a12e0f8bdff56979d508e367a34d5d1f140c10e73d0dd0571e72c5727e3cd3bf7d9ca7a097dbaa82584644a53bc9a4a5cd12a7147047045220211f9cd
+  metadata.gz: c5c7c112f2e3e3025ee58eb0ec4dd576db6073e07c3dfd40a53febeca25236aa585d4f8be56d4d6a7c55c4fb961cc665d4116655366ab899d84541da4dbd0301
+  data.tar.gz: 0d26a71dd53d0fd60bfbeaa7c16455c94206d0149c985677b1e413379d3eef5da3371321d1780102f925be5a47e05ca71d0ae7217f6a4e58bb2e8b922eee1b7e

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.2.2
+## 3.2.3
+  - No longer use 'trace' log level as it breaks rspec
+  - Fix race conditions in timeout enforcer
+
+## 3.2.3
   - Move one log message from info to debug to avoid noise
 
 ## 3.2.1

data/lib/logstash/filters/grok/timeout_enforcer.rb

@@ -14,24 +14,21 @@ class LogStash::Filters::Grok::TimeoutEnforcer
 
   def grok_till_timeout(event, grok, field, value)
     begin
-      thread = Thread.current
+      thread = java.lang.Thread.currentThread()
       start_thread_groking(thread)
       yield
-    rescue ::LogStash::Filters::Grok::TimeoutException => e
-      # These fields aren't present at the time the exception was raised
-      # so we add them here.
-      # We could store this metadata in the @threads_to_start_time hash
-      # but that'd come at a perf cost and this works just as well.
-      e.grok = grok
-      e.field = field
-      e.value = value
-      raise e
+    rescue InterruptedRegexpError => e
+      raise ::LogStash::Filters::Grok::TimeoutException.new(grok, field, value)
     ensure
       stop_thread_groking(thread)
+      # Clear any interrupts from any previous invocations that were not caught by Joni
+      thread.interrupted
     end
   end
 
   def start_thread_groking(thread)
+    # Clear any interrupts from any previous invocations that were not caught by Joni
+    thread.interrupted
     @timer_mutex.synchronize do
       @threads_to_start_time[thread] = java.lang.System.nanoTime()
     end
@@ -50,7 +47,10 @@ class LogStash::Filters::Grok::TimeoutEnforcer
         elapsed = java.lang.System.nanoTime - start_time
         if elapsed > @timeout_nanos
           elapsed_millis = elapsed / 1000
-          thread.raise(::LogStash::Filters::Grok::TimeoutException.new(elapsed_millis))
+          thread.interrupt()
+          # Ensure that we never attempt to cancel this thread twice in the event
+          # of weird races
+          stop_thread_groking(thread)
         end
       end
     end

data/lib/logstash/filters/grok/timeout_exception.rb

@@ -1,8 +1,7 @@
 class LogStash::Filters::Grok::TimeoutException < Exception
-  attr_accessor :elapsed_millis, :grok, :field, :value
+  attr_reader :grok, :field, :value
   
-  def initialize(elapsed_millis, grok=nil, field=nil, value=nil)
-    @elapsed_millis = elapsed_millis
+  def initialize(grok=nil, field=nil, value=nil)
     @field = field
     @value = value
     @grok = grok
@@ -20,4 +19,3 @@ class LogStash::Filters::Grok::TimeoutException < Exception
     end
   end
 end
-

data/logstash-filter-grok.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-grok'
-  s.version         = '3.2.2'
+  s.version         = '3.2.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parse arbitrary text and structure it."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -27,4 +27,3 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-grok
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement