From cecc10a78a28aa3b6176099fc2b93a89c55c0fe0 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 29 Jan 2025 10:28:41 -0800 Subject: [PATCH] Fix CodeQL warnings --- .../etw_testapp/EtwTestController.java | 9 +++------ .../etw_testapp/LongTestController.java | 13 ++----------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java index 81d7a0c263c..354b38c2a7a 100644 --- a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java +++ b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java @@ -1,15 +1,13 @@ package com.microsoft.applicationinsights.etw_testapp; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; +import java.util.concurrent.atomic.AtomicInteger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.concurrent.atomic.AtomicInteger; - -import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; - @RestController public class EtwTestController { private static final DiagnosticsLoggerProxy DIAGNOSTICS_LOGGER = new DiagnosticsLoggerProxy(); @@ -51,7 +49,6 @@ public ResponseEntity logPage( default: return ResponseEntity.notFound().build(); } - return ResponseEntity.ok( - level.toUpperCase() + " " + n + (t == null ? "" : "
\n" + t.toString())); + return ResponseEntity.ok(); } } diff --git a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java index 3bcd3fd5e45..87758df3e5a 100644 --- a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java +++ b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java @@ -1,5 +1,6 @@ package com.microsoft.applicationinsights.etw_testapp; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; import java.math.BigInteger; import java.text.SimpleDateFormat; import java.time.Duration; @@ -11,9 +12,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BinaryOperator; - -import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; - import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -246,14 +244,7 @@ public ResponseEntity startTest( period = Duration.parse("PT" + periodStr); } } catch (NumberFormatException | DateTimeParseException e) { - return ResponseEntity.badRequest() - .body( - "

Period parameter 'T' could not parse \"" - + periodStr - + "\"

" - + "

"
-                  + ExceptionUtils.getStackTrace(e)
-                  + "

"); + return ResponseEntity.badRequest().body("Period parameter could not be parsed"); } final long startTime;