[Java] Enable tests/appsec/test_span_tags_headers.py

manifests/java.yml

@@ -2243,7 +2243,10 @@ manifest:
   tests/appsec/test_shell_execution.py::Test_ShellExecution::test_track_shell_exec: irrelevant (No method for shell execution in Java)
   tests/appsec/test_shell_execution.py::Test_ShellExecution::test_truncate_1st_argument: bug (APPSEC-55672)
   tests/appsec/test_shell_execution.py::Test_ShellExecution::test_truncate_blank_2nd_argument: bug (APPSEC-55672)
-  tests/appsec/test_span_tags_headers.py: bug (APPSEC-61286)
+  tests/appsec/test_span_tags_headers.py:
+    - weblog_declaration:
+        "*": v1.60.0-SNAPSHOT
+        spring-boot-3-native: irrelevant (GraalVM. Tracing support only)
   tests/appsec/test_suspicious_attacker_blocking.py::Test_Suspicious_Attacker_Blocking:
     - weblog_declaration:
         "*": v1.39.0

utils/build/docker/java/akka-http/src/main/scala/com/datadoghq/akka_http/AppSecRoutes.scala

@@ -46,7 +46,7 @@ object AppSecRoutes {
         val span = tracer.buildSpan("test-span").start
         span.setTag("test-tag", "my value")
         withSpan(span) {
-          complete("Hello world!\n")
+          complete(HttpEntity(ContentTypes.`text/plain(UTF-8)`, "Hello world!\n"))
         }
       }
     } ~

utils/build/docker/java/jersey-grizzly2/src/main/java/com/datadoghq/jersey/MyResource.java

@@ -48,12 +48,15 @@ public class MyResource {
     private final CryptoExamples cryptoExamples = new CryptoExamples();
 
     @GET
-    public String hello() {
+    public Response hello() {
         var tracer = GlobalTracer.get();
         Span span = tracer.buildSpan("test-span").start();
         span.setTag("test-tag", "my value");
         try {
-            return "Hello world!\n";
+            return Response.ok("Hello world!\n")
+                .header("Content-Type", "text/plain")
+                .header("Content-Length", "13")
+                .build();
         } finally {
             span.finish();
         }

utils/build/docker/java/play/app/controllers/AppSecController.scala

@@ -36,6 +36,7 @@ class AppSecController @Inject()(cc: MessagesControllerComponents, ws: WSClient,
     span.setTag("test-tag", "my value")
     withSpan(span) {
       Results.Ok("Hello world!\n")
+        .withHeaders("Content-Type" -> "text/plain", "Content-Length" -> "13")
     }
   }
 

utils/build/docker/java/ratpack/src/main/java/com/datadoghq/ratpack/Main.java

@@ -108,6 +108,7 @@ public static void main(String[] args) throws Exception {
                                 Span span = tracer.buildSpan("test-span").start();
                                 span.setTag("test-tag", "my value");
                                 try {
+                                    ctx.getResponse().getHeaders().set("Content-Length", "13");
                                     ctx.getResponse().send("text/plain", "Hello world!\n");
                                 } finally {
                                     span.finish();

utils/build/docker/java/resteasy-netty3/src/main/java/com/datadoghq/resteasy/MyResource.java

@@ -47,12 +47,15 @@ public class MyResource {
     private final CryptoExamples cryptoExamples = new CryptoExamples();
 
     @GET
-    public String hello() {
+    public Response hello() {
         var tracer = GlobalTracer.get();
         Span span = tracer.buildSpan("test-span").start();
         span.setTag("test-tag", "my value");
         try {
-            return "Hello world!\n";
+            return Response.ok("Hello world!\n")
+                .header("Content-Type", "text/plain")
+                .header("Content-Length", "13")
+                .build();
         } finally {
             span.finish();
         }

utils/build/docker/java/spring-boot-3-native/src/main/java/com/datadoghq/springbootnative/WebController.java

@@ -38,8 +38,11 @@ public class WebController {
   private static final Logger logger = LoggerFactory.getLogger(App.class);
 
   @RequestMapping("/")
-  String home() {
-    return "Hello world!\n";
+  ResponseEntity<String> home() {
+    return ResponseEntity.ok()
+        .contentType(MediaType.TEXT_PLAIN)
+        .contentLength(13)
+        .body("Hello world!\n");
   }
 
   @RequestMapping("/healthcheck")

utils/build/docker/java/spring-boot/src/main/java/com/datadoghq/system_tests/springboot/App.java

@@ -147,12 +147,15 @@ public class App {
     int PRODUCE_CONSUME_THREAD_TIMEOUT = 5000;
 
     @RequestMapping("/")
-    String home(HttpServletResponse response) {
+    ResponseEntity<String> home() {
         // open liberty set this header to en-US by default, it breaks the APPSEC-BLOCKING scenario
         // if a java engineer knows how to remove this?
         // waiting for that, just set a random value
-        response.setHeader("Content-Language", "not-set");
-        return "Hello world!\n";
+        return ResponseEntity.ok()
+            .contentType(MediaType.TEXT_PLAIN)
+            .header("Content-Language", "not-set")
+            .contentLength(13)
+            .body("Hello world!\n");
     }
 
     @RequestMapping("/healthcheck")

utils/build/docker/java/vertx3/src/main/java/com/datadoghq/vertx3/Main.java

@@ -69,13 +69,16 @@ public static void main(String[] args) {
         Router router = Router.router(vertx);
 
         router.get("/")
-                .produces("text/plain")
                 .handler(ctx -> {
                     var tracer = GlobalTracer.get();
                     Span span = tracer.buildSpan("test-span").start();
                     span.setTag("test-tag", "my value");
                     try {
-                        ctx.response().setStatusCode(200).end("Hello world!\n");
+                        ctx.response()
+                                .setStatusCode(200)
+                                .putHeader("Content-Type", "text/plain")
+                                .putHeader("Content-Length", "13")
+                                .end("Hello world!\n");
                     } finally {
                         span.finish();
                     }

utils/build/docker/java/vertx4/src/main/java/com/datadoghq/vertx4/Main.java

@@ -71,13 +71,16 @@ public static void main(String[] args) {
         Router router = Router.router(vertx);
 
         router.get("/")
-                .produces("text/plain")
                 .handler(ctx -> {
                     var tracer = GlobalTracer.get();
                     Span span = tracer.buildSpan("test-span").start();
                     span.setTag("test-tag", "my value");
                     try {
-                        ctx.response().setStatusCode(200).end("Hello world!\n");
+                        ctx.response()
+                                .setStatusCode(200)
+                                .putHeader("Content-Type", "text/plain")
+                                .putHeader("Content-Length", "13")
+                                .end("Hello world!\n");
                     } finally {
                         span.finish();
                     }