Try to make tomcat async servlet exception test less flaky (#4772)

open-telemetry · Dec 2, 2021 · bbb5717 · bbb5717
1 parent 32d5ffd
commit bbb5717
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy
@@ -112,7 +112,13 @@ class TestServlet3 {
  break
  case EXCEPTION:
  resp.status = endpoint.status
- resp.writer.print(endpoint.body)
+ def writer = resp.writer
+ writer.print(endpoint.body)
+ if (req.getClass().getName().contains("catalina")) {
+ // on tomcat close the writer to ensure response is sent immediately, otherwise
+ // there is a chance that tomcat resets the connection before the response is sent
+ writer.close()
+ }
  throw new ServletException(endpoint.body)
  }
  }

diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy
@@ -113,7 +113,13 @@ class TestServlet5 {
  break
  case EXCEPTION:
  resp.status = endpoint.status
- resp.writer.print(endpoint.body)
+ def writer = resp.writer
+ writer.print(endpoint.body)
+ if (req.getClass().getName().contains("catalina")) {
+ // on tomcat close the writer to ensure response is sent immediately, otherwise
+ // there is a chance that tomcat resets the connection before the response is sent
+ writer.close()
+ }
  throw new ServletException(endpoint.body)
  }
  }

diff --git a/...c/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.groovy b/...c/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.groovy
@@ -62,6 +62,10 @@ class AsyncServlet extends HttpServlet {
  resp.writer.print(endpoint.body)
  break
  case EXCEPTION:
+ resp.status = endpoint.status
+ def writer = resp.writer
+ writer.print(endpoint.body)
+ writer.close()
  throw new ServletException(endpoint.body)
  }
  }

diff --git a/...rc/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy b/...rc/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy
@@ -62,7 +62,9 @@ class AsyncServlet extends AbstractHttpServlet {
  break
  case EXCEPTION:
  resp.status = endpoint.status
- resp.writer.print(endpoint.body)
+ def writer = resp.writer
+ writer.print(endpoint.body)
+ writer.close()
  throw new ServletException(endpoint.body)
  }
  }