fluent-plugin-detect-exceptions 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c58018cba8b1e1901dd3ee3535abab41cb1e6df827ed31b846af250ce8576b7
-  data.tar.gz: d9624b643b2beae71d8c8e4807241aed9c1ed811cef569fd4a07ef7e095d7f0b
+  metadata.gz: 3fa3afee1139adec8fe98c8406bd72035d844aadf9f1715c01c5db3e45bd7e1c
+  data.tar.gz: 63b1bba51e317c9931d4904551b64ef94c56b0946bccec6f67edc2311c0bbba2
 SHA512:
-  metadata.gz: 8d5a9de978855c5ac41e5639f9dab7705606c772ea35694299b1c917bdbc327ddf9937fcd64f4ee4c6e283c8dcc1b2de13b5dbc23f5c33ed96fe450dec0223f5
-  data.tar.gz: 5e04f33f4b0ec87ddfce9a9e0e1a09d8389e15c7896737ce8db11d41788aa0b0408e978047125908d7ff2917ad440f0c2144d0e974fa6d89c38d1878ca0f8279
+  metadata.gz: 60bbd111f5818ebfa4eda68c87236c3d985df25e66acf12e29f2851f52c4f9e0c74a0d8bbeeb5f077f1b154c4f23fa2bb223ac26f230aff29fdc5d0ddfa69272
+  data.tar.gz: 85e20f53eb5e72b7062b6d60d724f55edc53997530dce6ca6adc252bb422a7c5466c73dc5370909ec944a52f7097a8d632649b2ed32fb16962689073dfe3415b

data/Gemfile.lock

@@ -1,32 +1,33 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-detect-exceptions (0.0.12)
+    fluent-plugin-detect-exceptions (0.0.13)
       fluentd (>= 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    cool.io (1.5.3)
+    concurrent-ruby (1.1.5)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     flexmock (2.3.6)
-    fluentd (1.2.6)
+    fluentd (1.7.4)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
+      msgpack (>= 1.2.0, < 2.0.0)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
+      tzinfo (~> 2.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    msgpack (1.2.6)
-    parser (2.6.0.0)
+    msgpack (1.3.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
-    power_assert (1.1.3)
+    power_assert (1.1.5)
     powerpack (0.1.2)
     rainbow (2.2.2)
       rake
@@ -37,19 +38,18 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    serverengine (2.1.0)
+    ruby-progressbar (1.10.1)
+    serverengine (2.1.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.3)
-    test-unit (3.2.8)
+    test-unit (3.3.4)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.9)
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -63,4 +63,4 @@ DEPENDENCIES
   test-unit (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

data/fluent-plugin-detect-exceptions.gemspec

@@ -11,7 +11,7 @@ eos
   gem.homepage      = \
     'https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.0.12'
+  gem.version       = '0.0.13'
   gem.authors       = ['Stackdriver Agents']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/exception_detector.rb

@@ -59,6 +59,18 @@ module Fluent
            :java_start_exception),
       rule(:java_after_exception, /^[\r\n]*$/, :java_after_exception),
       rule([:java_after_exception, :java], /^[\t ]+(?:eval )?at /, :java),
+
+      rule([:java_after_exception, :java],
+           # C# nested exception.
+           /^[\t ]+--- End of inner exception stack trace ---$/,
+           :java),
+
+      rule([:java_after_exception, :java],
+           # C# exception from async code.
+           /^--- End of stack trace from previous (?x:
+           )location where exception was thrown ---$/,
+           :java),
+
       rule([:java_after_exception, :java], /^[\t ]*(?:Caused by|Suppressed):/,
            :java_after_exception),
       rule([:java_after_exception, :java],
@@ -83,6 +95,8 @@ module Fluent
 
     GO_RULES = [
       rule(:start_state, /\bpanic: /, :go_after_panic),
+      rule(:start_state, /http: panic serving/, :go_goroutine),
+      rule(:go_after_panic, /^$/, :go_goroutine),
       rule([:go_after_panic, :go_after_signal, :go_frame_1],
            /^$/, :go_goroutine),
       rule(:go_after_panic, /^\[signal /, :go_after_signal),

data/test/plugin/test_exception_detector.rb

@@ -242,6 +242,26 @@ created by main.main
 	server.go:20 +0x91
 END
 
+  GO_HTTP = <<END.freeze
+2019/01/15 07:48:05 http: panic serving [::1]:54143: test panic
+goroutine 24 [running]:
+net/http.(*conn).serve.func1(0xc00007eaa0)
+	/usr/local/go/src/net/http/server.go:1746 +0xd0
+panic(0x12472a0, 0x12ece10)
+	/usr/local/go/src/runtime/panic.go:513 +0x1b9
+main.doPanic(0x12f0ea0, 0xc00010e1c0, 0xc000104400)
+	/Users/ingvar/src/go/src/httppanic.go:8 +0x39
+net/http.HandlerFunc.ServeHTTP(0x12be2e8, 0x12f0ea0, 0xc00010e1c0, 0xc000104400)
+	/usr/local/go/src/net/http/server.go:1964 +0x44
+net/http.(*ServeMux).ServeHTTP(0x14a17a0, 0x12f0ea0, 0xc00010e1c0, 0xc000104400)
+	/usr/local/go/src/net/http/server.go:2361 +0x127
+net/http.serverHandler.ServeHTTP(0xc000085040, 0x12f0ea0, 0xc00010e1c0, 0xc000104400)
+	/usr/local/go/src/net/http/server.go:2741 +0xab
+net/http.(*conn).serve(0xc00007eaa0, 0x12f10a0, 0xc00008a780)
+	/usr/local/go/src/net/http/server.go:1847 +0x646
+created by net/http.(*Server).Serve
+	/usr/local/go/src/net/http/server.go:2851 +0x2f5
+END
   CSHARP_EXC = <<END.freeze
 System.Collections.Generic.KeyNotFoundException: The given key was not present in the dictionary.
   at System.Collections.Generic.Dictionary`2[System.String,System.Collections.Generic.Dictionary`2[System.Int32,System.Double]].get_Item (System.String key) [0x00000] in <filename unknown>:0
@@ -256,6 +276,33 @@ System.Collections.Generic.KeyNotFoundException: The given key was not present i
   at System.Threading.Thread.StartInternal () [0x00000] in <filename unknown>:0
 END
 
+  CSHARP_NESTED_EXC = <<END.freeze
+System.InvalidOperationException: This is the outer exception ---> System.InvalidOperationException: This is the inner exception
+  at ExampleApp.NestedExceptionExample.LowestLevelMethod() in c:/ExampleApp/ExampleApp/NestedExceptionExample.cs:line 33
+  at ExampleApp.NestedExceptionExample.ThirdLevelMethod() in c:/ExampleApp/ExampleApp/NestedExceptionExample.cs:line 28
+  at ExampleApp.NestedExceptionExample.SecondLevelMethod() in c:/ExampleApp/ExampleApp/NestedExceptionExample.cs:line 18
+  --- End of inner exception stack trace ---
+  at ExampleApp.NestedExceptionExample.SecondLevelMethod() in c:/ExampleApp/ExampleApp/NestedExceptionExample.cs:line 22
+  at ExampleApp.NestedExceptionExample.TopLevelMethod() in c:/ExampleApp/ExampleApp/NestedExceptionExample.cs:line 11
+  at ExampleApp.Program.Main(String[] args) in c:/ExampleApp/ExampleApp/Program.cs:line 11
+END
+
+  CSHARP_ASYNC_EXC = <<END.freeze
+System.InvalidOperationException: This is an exception
+   at ExampleApp2.AsyncExceptionExample.LowestLevelMethod() in c:/ExampleApp/ExampleApp/AsyncExceptionExample.cs:line 36
+   at ExampleApp2.AsyncExceptionExample.<ThirdLevelMethod>d__2.MoveNext() in c:/ExampleApp/ExampleApp/AsyncExceptionExample.cs:line 31
+--- End of stack trace from previous location where exception was thrown ---
+   at System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(Task task)
+   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+   at System.Runtime.CompilerServices.TaskAwaiter.GetResult()
+   at ExampleApp2.AsyncExceptionExample.<SecondLevelMethod>d__1.MoveNext() in c:/ExampleApp/ExampleApp/AsyncExceptionExample.cs:line 25
+--- End of stack trace from previous location where exception was thrown ---
+   at System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(Task task)
+   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+   at System.Runtime.CompilerServices.TaskAwaiter.GetResult()
+   at ExampleApp2.AsyncExceptionExample.<TopLevelMethod>d__0.MoveNext() in c:/ExampleApp/ExampleApp/AsyncExceptionExample.cs:line 14
+END
+
   RUBY_EXC = <<END.freeze
  NoMethodError (undefined method `resursivewordload' for #<BooksController:0x007f8dd9a0c738>):
   app/controllers/books_controller.rb:69:in `recursivewordload'
@@ -570,6 +617,8 @@ END
 
   def test_csharp
     check_exception(CSHARP_EXC, false)
+    check_exception(CSHARP_NESTED_EXC, false)
+    check_exception(CSHARP_ASYNC_EXC, false)
   end
 
   def test_python
@@ -585,6 +634,7 @@ END
     check_exception(GO_EXC, false)
     check_exception(GO_ON_GAE_EXC, false)
     check_exception(GO_SIGNAL_EXC, false)
+    check_exception(GO_HTTP, false)
   end
 
   def test_ruby
@@ -627,6 +677,8 @@ END
     check_exception(GO_ON_GAE_EXC, false)
     check_exception(GO_SIGNAL_EXC, false)
     check_exception(CSHARP_EXC, false)
+    check_exception(CSHARP_NESTED_EXC, false)
+    check_exception(CSHARP_ASYNC_EXC, false)
     check_exception(V8_JS_EXC, false)
     check_exception(RUBY_EXC, false)
     check_exception(DART_ERR, false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-detect-exceptions
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Stackdriver Agents
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for combining stack traces as multi-line JSON logs