From 9a881b3a2dc86faae0162ea1a7f616eaad622aec Mon Sep 17 00:00:00 2001
From: Seth Rylan Gainey <seth.rylan@gmail.com>
Date: Thu, 2 Sep 2021 14:18:09 -0400
Subject: [PATCH 1/3] Add support for Reactor/Webflux formatted exceptions.

---
 lib/fluent/plugin/exception_detector.rb |  5 ++++-
 test/plugin/test_exception_detector.rb  | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/fluent/plugin/exception_detector.rb b/lib/fluent/plugin/exception_detector.rb
index d7c78b4..52d5eb8 100644
--- a/lib/fluent/plugin/exception_detector.rb
+++ b/lib/fluent/plugin/exception_detector.rb
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2021 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ def self.supported
            :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], /^[\t ]+(?:eval )?|_ checkpoint /, :java),
 
       rule([:java_after_exception, :java],
            # C# nested exception.
@@ -73,6 +74,8 @@ def self.supported
 
       rule([:java_after_exception, :java], /^[\t ]*(?:Caused by|Suppressed):/,
            :java_after_exception),
+      rule([:java_after_exception, :java], /^(?:Error has been observed at the following site\(s\)|Stack trace):/,
+           :java),
       rule([:java_after_exception, :java],
            /^[\t ]*... \d+ (?:more|common frames omitted)/, :java)
     ].freeze
diff --git a/test/plugin/test_exception_detector.rb b/test/plugin/test_exception_detector.rb
index f001d0e..fa3d0c9 100644
--- a/test/plugin/test_exception_detector.rb
+++ b/test/plugin/test_exception_detector.rb
@@ -90,6 +90,28 @@ class ExceptionDetectorTest < Test::Unit::TestCase
 Caused by: com.sun.mail.smtp.SMTPAddressFailedException: 550 5.7.1 <[REDACTED_EMAIL_ADDRESS]>... Relaying denied
 END
 
+  REACTOR_JAVA_EXC = <<END.freeze
+org.springframework.web.reactive.function.client.WebClientRequestException: finishConnect(..) failed: Connection refused: localhost:8080; nested exception is io.netty.channel.AbstractChannel$AnnotatedConnectException: finishConnect(..) failed: Connection refused: localhost:8080
+  at org.springframework.web.reactive.function.client.ExchangeFunctions$DefaultExchangeFunction.lambda$wrapException$9(ExchangeFunctions.java:141)
+  Suppressed: reactor.core.publisher.FluxOnAssembly$OnAssemblyException:
+Error has been observed at the following site(s):
+  |_ checkpoint ⇢ Request to GET localhost:8080
+Stack trace:
+    at org.springframework.web.reactive.function.client.ExchangeFunctions$DefaultExchangeFunction.lambda$wrapException$9(ExchangeFunctions.java:141)
+    at reactor.core.publisher.MonoErrorSupplied.subscribe(MonoErrorSupplied.java:70)
+    at reactor.core.publisher.Mono.subscribe(Mono.java:4150)
+    at reactor.core.publisher.FluxOnErrorResume$ResumeSubscriber.onError(FluxOnErrorResume.java:103)
+    at org.springframework.cloud.sleuth.instrument.reactor.ScopePassingSpanSubscriber.onError(ScopePassingSpanSubscriber.java:95)
+    at reactor.core.publisher.FluxPeek$PeekSubscriber.onError(FluxPeek.java:221)
+    at java.lang.Thread.run(Thread.java:834)
+Caused by: io.netty.channel.AbstractChannel$AnnotatedConnectException: finishConnect(..) failed: Connection refused: localhost:8080
+Caused by: java.net.ConnectException: finishConnect(..) failed: Connection refused
+  at io.netty.channel.unix.Errors.newConnectException0(Errors.java:155)
+  at io.netty.channel.unix.Errors.handleConnectErrno(Errors.java:128)
+  at io.netty.channel.unix.Socket.finishConnect(Socket.java:278)
+  at java.lang.Thread.run(Thread.java:834)
+END
+
   NODE_JS_EXC = <<END.freeze
 ReferenceError: myArray is not defined
   at next (/app/node_modules/express/lib/router/index.js:256:14)
@@ -607,6 +629,7 @@ def test_java
     check_exception(JAVA_EXC, false)
     check_exception(COMPLEX_JAVA_EXC, false)
     check_exception(NESTED_JAVA_EXC, false)
+    check_exception(REACTOR_JAVA_EXC, false)
   end
 
   def test_js

From 849170c55bc5e41823893e191d2c6889a271b1aa Mon Sep 17 00:00:00 2001
From: Seth Rylan Gainey <seth.rylan@gmail.com>
Date: Thu, 2 Sep 2021 16:33:03 -0400
Subject: [PATCH 2/3] Rubocop updates.

---
 lib/fluent/plugin/exception_detector.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/fluent/plugin/exception_detector.rb b/lib/fluent/plugin/exception_detector.rb
index 52d5eb8..a4eb937 100644
--- a/lib/fluent/plugin/exception_detector.rb
+++ b/lib/fluent/plugin/exception_detector.rb
@@ -59,7 +59,8 @@ def self.supported
            :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], /^[\t ]+(?:eval )?|_ checkpoint /, :java),
+      rule([:java_after_exception, :java], /^[\t ]+(?:eval )?|_ checkpoint /,
+           :java),
 
       rule([:java_after_exception, :java],
            # C# nested exception.
@@ -74,8 +75,10 @@ def self.supported
 
       rule([:java_after_exception, :java], /^[\t ]*(?:Caused by|Suppressed):/,
            :java_after_exception),
-      rule([:java_after_exception, :java], /^(?:Error has been observed at the following site\(s\)|Stack trace):/,
+      rule([:java_after_exception, :java],
+           /^(?:Error has been observed at the following site\(s\)):/,
            :java),
+      rule([:java_after_exception, :java], /^(?:Stack trace):/, :java),
       rule([:java_after_exception, :java],
            /^[\t ]*... \d+ (?:more|common frames omitted)/, :java)
     ].freeze

From 908931bebc33459bbd67949a2c49539d6742206c Mon Sep 17 00:00:00 2001
From: Seth Rylan Gainey <seth.rylan@gmail.com>
Date: Thu, 2 Sep 2021 16:35:19 -0400
Subject: [PATCH 3/3] Revert year change.

---
 lib/fluent/plugin/exception_detector.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fluent/plugin/exception_detector.rb b/lib/fluent/plugin/exception_detector.rb
index a4eb937..b93e62d 100644
--- a/lib/fluent/plugin/exception_detector.rb
+++ b/lib/fluent/plugin/exception_detector.rb
@@ -1,4 +1,4 @@
-# Copyright 2021 Google Inc. All rights reserved.
+# Copyright 2016 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.