review

Author: trask

instrumentation/servlet/servlet-3.0/testing/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/TestServlet3.java

@@ -157,6 +157,12 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
                       context.complete();
                     } else if (EXCEPTION.equals(endpoint)) {
                       resp.setStatus(endpoint.getStatus());
+                      if (req.getClass().getName().contains("catalina") && !testLatestDeps()) {
+                        // Set Content-Length so the response is self-delimiting; combined with
+                        // the writer.close() below, this lets the client read a complete 500
+                        // response on older Tomcat before the post-throw connection reset.
+                        resp.setContentLength(endpoint.getBody().length());
+                      }
                       PrintWriter writer = resp.getWriter();
                       writer.print(endpoint.getBody());
                       if (req.getClass().getName().contains("catalina") && !testLatestDeps()) {

instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/TestServlet5.java

@@ -156,6 +156,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
                     } else if (EXCEPTION.equals(endpoint)) {
                       resp.setStatus(endpoint.getStatus());
                       if (isOldTomcat(req)) {
+                        // Set Content-Length so the response is self-delimiting; combined with
+                        // the writer.close() below, this lets the client read a complete 500
+                        // response on older Tomcat before the post-throw connection reset.
                         resp.setContentLength(endpoint.getBody().length());
                       }
                       PrintWriter writer = resp.getWriter();
@@ -240,6 +243,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
               } else if (EXCEPTION.equals(endpoint)) {
                 resp.setStatus(endpoint.getStatus());
                 if (isOldTomcat(req)) {
+                  // Set Content-Length so the response is self-delimiting; combined with the
+                  // writer.close() below, this lets the client read a complete 500 response on
+                  // older Tomcat before the post-throw connection reset.
                   resp.setContentLength(endpoint.getBody().length());
                 }
                 PrintWriter writer = resp.getWriter();

instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.java

@@ -60,6 +60,12 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
                     resp.getWriter().print(endpoint.getBody());
                   } else if (endpoint.equals(EXCEPTION)) {
                     resp.setStatus(endpoint.getStatus());
+                    if (!testLatestDeps()) {
+                      // Set Content-Length so the response is self-delimiting; combined with
+                      // the writer.close() below, this lets the client read a complete 500
+                      // response on older Tomcat before the post-throw connection reset.
+                      resp.setContentLength(endpoint.getBody().length());
+                    }
                     PrintWriter writer = resp.getWriter();
                     writer.print(endpoint.getBody());
                     if (!testLatestDeps()) {

instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.java

@@ -59,6 +59,12 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) {
                     resp.getWriter().print(endpoint.getBody());
                   } else if (endpoint.equals(EXCEPTION)) {
                     resp.setStatus(endpoint.getStatus());
+                    if (!testLatestDeps()) {
+                      // Set Content-Length so the response is self-delimiting; combined with
+                      // the writer.close() below, this lets the client read a complete 500
+                      // response on older Tomcat before the post-throw connection reset.
+                      resp.setContentLength(endpoint.getBody().length());
+                    }
                     PrintWriter writer = resp.getWriter();
                     writer.print(endpoint.getBody());
                     if (!testLatestDeps()) {