From 74d4faf68a7aec10700315326ec1eb2c750472c0 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 16:17:17 -0400 Subject: [PATCH] Remove unused SpotBugs suppressions from dd-smoke-tests Co-Authored-By: Claude Opus 4.8 (1M context) --- .../application/build.gradle | 1 - .../apmtracingdisabled/Controller.java | 2 -- .../controller/IastWebController.java | 3 --- .../springboot/controller/XssController.java | 21 ------------------- .../profiling/ProfilingTestApplication.java | 3 --- 5 files changed, 30 deletions(-) diff --git a/dd-smoke-tests/apm-tracing-disabled/application/build.gradle b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle index b5653805e95..cac44f5c2dd 100644 --- a/dd-smoke-tests/apm-tracing-disabled/application/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle @@ -34,7 +34,6 @@ if (hasProperty('apiJar')) { } dependencies { - compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8' implementation 'org.springframework.boot:spring-boot-starter-web' // OpenTracing 0.32.0 is the last release and is intentionally pinned: this smoke test // exercises the legacy OpenTracing bridge in dd-trace-ot. Do not "upgrade" — there is diff --git a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java index 3bb55197614..8fdda3fd75e 100644 --- a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java +++ b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java @@ -1,6 +1,5 @@ package datadog.smoketest.apmtracingdisabled; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.opentracing.Span; import io.opentracing.util.GlobalTracer; import java.io.IOException; @@ -51,7 +50,6 @@ public String pathParam( } @GetMapping("/iast") - @SuppressFBWarnings public void write( @RequestParam(name = "injection", required = false) String injection, @RequestParam(name = "url", required = false) String url, diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java index 6545f3f3625..f9b20ca2796 100644 --- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java +++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java @@ -6,7 +6,6 @@ import datadog.smoketest.springboot.TestBean; import datadog.smoketest.springboot.controller.mock.JakartaMockTransport; import ddtest.client.sources.Hasher; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; @@ -186,14 +185,12 @@ public String commandInjectionProcessBuilder(final HttpServletRequest request) { return "Command Injection page"; } - @SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL") @GetMapping("/path_traversal/file") public String pathTraversalFile(final HttpServletRequest request) { new File(request.getParameter("path")); return "Path Traversal page"; } - @SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL") @GetMapping("/path_traversal/paths") public String pathTraversalPaths(final HttpServletRequest request) { Paths.get(request.getParameter("path")); diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java index 32cad411098..7889a3c81a9 100644 --- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java +++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java @@ -2,7 +2,6 @@ import ddtest.securitycontrols.InputValidator; import ddtest.securitycontrols.Sanitizer; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.Locale; import javax.servlet.http.HttpServletRequest; @@ -18,7 +17,6 @@ public class XssController { @GetMapping("/write") - @SuppressFBWarnings public void write(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(request.getParameter("string")); @@ -28,7 +26,6 @@ public void write(final HttpServletRequest request, final HttpServletResponse re } @GetMapping("/write2") - @SuppressFBWarnings public void write2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(request.getParameter("string").toCharArray()); @@ -38,7 +35,6 @@ public void write2(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/write3") - @SuppressFBWarnings public void write3(final HttpServletRequest request, final HttpServletResponse response) { try { String insecure = request.getParameter("string"); @@ -49,7 +45,6 @@ public void write3(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/write4") - @SuppressFBWarnings public void write4(final HttpServletRequest request, final HttpServletResponse response) { try { char[] buf = request.getParameter("string").toCharArray(); @@ -60,7 +55,6 @@ public void write4(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/print") - @SuppressFBWarnings public void print(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().print(request.getParameter("string")); @@ -70,7 +64,6 @@ public void print(final HttpServletRequest request, final HttpServletResponse re } @GetMapping("/print2") - @SuppressFBWarnings public void print2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().print(request.getParameter("string").toCharArray()); @@ -80,7 +73,6 @@ public void print2(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/println") - @SuppressFBWarnings public void println(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().println(request.getParameter("string")); @@ -90,7 +82,6 @@ public void println(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/println2") - @SuppressFBWarnings public void println2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().println(request.getParameter("string").toCharArray()); @@ -100,7 +91,6 @@ public void println2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf") - @SuppressFBWarnings public void printf(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -111,7 +101,6 @@ public void printf(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/printf2") - @SuppressFBWarnings public void printf2(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -122,7 +111,6 @@ public void printf2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf3") - @SuppressFBWarnings public void printf3(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -133,7 +121,6 @@ public void printf3(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf4") - @SuppressFBWarnings public void printf4(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -144,7 +131,6 @@ public void printf4(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format") - @SuppressFBWarnings public void format(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -155,7 +141,6 @@ public void format(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/format2") - @SuppressFBWarnings public void format2(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -166,7 +151,6 @@ public void format2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format3") - @SuppressFBWarnings public void format3(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -177,7 +161,6 @@ public void format3(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format4") - @SuppressFBWarnings public void format4(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -194,7 +177,6 @@ public String responseBody(final HttpServletRequest request, final HttpServletRe } @GetMapping("/sanitize") - @SuppressFBWarnings public void sanitize(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(Sanitizer.sanitize(request.getParameter("string"))); @@ -204,7 +186,6 @@ public void sanitize(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/validateAll") - @SuppressFBWarnings public void validateAll(final HttpServletRequest request, final HttpServletResponse response) { try { String s = request.getParameter("string"); @@ -216,7 +197,6 @@ public void validateAll(final HttpServletRequest request, final HttpServletRespo } @GetMapping("/validateAll2") - @SuppressFBWarnings public void validate2(final HttpServletRequest request, final HttpServletResponse response) { try { String string1 = request.getParameter("string"); @@ -229,7 +209,6 @@ public void validate2(final HttpServletRequest request, final HttpServletRespons } @GetMapping("/validate") - @SuppressFBWarnings public void validate(final HttpServletRequest request, final HttpServletResponse response) { try { String string1 = request.getParameter("string"); diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java index 8d7a5d67c0c..5db03d485a2 100644 --- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java +++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java @@ -4,7 +4,6 @@ import datadog.trace.api.profiling.Profiling; import datadog.trace.api.profiling.ProfilingContextAttribute; import datadog.trace.api.profiling.ProfilingScope; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; import java.util.List; @@ -54,7 +53,6 @@ public static void main(final String[] args) throws Exception { } @Trace - @SuppressFBWarnings("DM_GC") private static void tracedMethod() throws InterruptedException { System.out.println("Tracing"); tracedBusyMethod(); @@ -68,7 +66,6 @@ private static void tracedMethod() throws InterruptedException { } @Trace - @SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") private static void tracedBusyMethod() { long startTime = THREAD_MX_BEAN.getCurrentThreadCpuTime(); Random random = new Random();