Skip to content

Teach exception_detector.rb to deal with escaped tabs (\u0009) … #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Teach exception_detector.rb to deal with escaped tabs (\u0009) … #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/fluent/plugin/exception_detector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ def self.supported
rule(:start_state,
/(?:Exception|Error|Throwable|V8 errors stack trace)[:\r\n]/,
:java),
rule(:java, /^[\t ]+(?:eval )?at /, :java),
rule(:java, /^[\t ]*(?:Caused by|Suppressed):/, :java),
rule(:java, /^[\t ]*... \d+\ more/, :java)
rule(:java, /^(\\u0009|[\t ])+(?:eval )?at /, :java),
rule(:java, /^(\\u0009|[\t ])*(?:Caused by|Suppressed):/, :java),
rule(:java, /^(\\u0009|[\t ])*... \d+\ more/, :java)
].freeze

PYTHON_RULES = [
Expand Down
68 changes: 68 additions & 0 deletions test/plugin/test_exception_detector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,70 @@ class ExceptionDetectorTest < Test::Unit::TestCase

JAVA_EXC = (JAVA_EXC_PART1 + JAVA_EXC_PART2).freeze

COMPLEX_JAVA_EXC_TABS = <<END.freeze
javax.servlet.ServletException: Something bad happened
at com.example.myproject.OpenSessionInViewFilter.doFilter(OpenSessionInViewFilter.java:60)
at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
at com.example.myproject.ExceptionHandlerFilter.doFilter(ExceptionHandlerFilter.java:28)
at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
at com.example.myproject.OutputBufferFilter.doFilter(OutputBufferFilter.java:33)
at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388)
at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216)
at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182)
at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765)
at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418)
at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152)
at org.mortbay.jetty.Server.handle(Server.java:326)
at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542)
at org.mortbay.jetty.HttpConnection$RequestHandler.content(HttpConnection.java:943)
at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:756)
at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:218)
at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404)
at org.mortbay.jetty.bio.SocketConnector$Connection.run(SocketConnector.java:228)
at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582)
Caused by: com.example.myproject.MyProjectServletException
at com.example.myproject.MyServlet.doPost(MyServlet.java:169)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:820)
at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511)
at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166)
at com.example.myproject.OpenSessionInViewFilter.doFilter(OpenSessionInViewFilter.java:30)
... 27 more
END

COMPLEX_JAVA_EXC_ESCAPED_TABS = <<END.freeze
javax.servlet.ServletException: Something bad happened
\\u0009at com.example.myproject.OpenSessionInViewFilter.doFilter(OpenSessionInViewFilter.java:60)
\\u0009at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
\\u0009at com.example.myproject.ExceptionHandlerFilter.doFilter(ExceptionHandlerFilter.java:28)
\\u0009at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
\\u0009at com.example.myproject.OutputBufferFilter.doFilter(OutputBufferFilter.java:33)
\\u0009at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157)
\\u0009at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388)
\\u0009at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216)
\\u0009at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182)
\\u0009at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765)
\\u0009at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418)
\\u0009at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152)
\\u0009at org.mortbay.jetty.Server.handle(Server.java:326)
\\u0009at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542)
\\u0009at org.mortbay.jetty.HttpConnection$RequestHandler.content(HttpConnection.java:943)
\\u0009at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:756)
\\u0009at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:218)
\\u0009at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404)
\\u0009at org.mortbay.jetty.bio.SocketConnector$Connection.run(SocketConnector.java:228)
\\u0009at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582)
Caused by: com.example.myproject.MyProjectServletException
\\u0009at com.example.myproject.MyServlet.doPost(MyServlet.java:169)
\\u0009at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
\\u0009at javax.servlet.http.HttpServlet.service(HttpServlet.java:820)
\\u0009at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511)
\\u0009at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166)
\\u0009at com.example.myproject.OpenSessionInViewFilter.doFilter(OpenSessionInViewFilter.java:30)
\\u0009... 27 more
END

COMPLEX_JAVA_EXC = <<END.freeze
javax.servlet.ServletException: Something bad happened
at com.example.myproject.OpenSessionInViewFilter.doFilter(OpenSessionInViewFilter.java:60)
Expand Down Expand Up @@ -531,6 +595,8 @@ def check_exception(exception, detects_end)
def test_java
check_exception(JAVA_EXC, false)
check_exception(COMPLEX_JAVA_EXC, false)
check_exception(COMPLEX_JAVA_EXC_TABS, false)
check_exception(COMPLEX_JAVA_EXC_ESCAPED_TABS, false)
end

def test_js
Expand Down Expand Up @@ -593,6 +659,8 @@ def test_mixed_languages
check_exception(NODE_JS_EXC, false)
check_exception(PHP_EXC, false)
check_exception(PHP_ON_GAE_EXC, true)
check_exception(COMPLEX_JAVA_EXC_TABS, false)
check_exception(COMPLEX_JAVA_EXC_ESCAPED_TABS, false)
check_exception(CLIENT_JS_EXC, false)
check_exception(GO_EXC, false)
check_exception(GO_ON_GAE_EXC, false)
Expand Down