From 45ea63df65fda925896c3740fc1f04c7e3ae0606 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 8 Jul 2025 11:13:34 -0700 Subject: [PATCH 1/3] Update version --- buildSrc/build.gradle.kts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 98fe5b87fea..6cb4155886b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,7 +8,10 @@ plugins { spotless { java { googleJavaFormat() - licenseHeaderFile(rootProject.file("../buildscripts/spotless.license.java"), "(package|import|public)") + licenseHeaderFile( + rootProject.file("../buildscripts/spotless.license.java"), + "(package|import|public)" + ) target("src/**/*.java") } } @@ -28,7 +31,7 @@ dependencies { // When updating, update above in plugins too implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4") - implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7") + implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.2.1") implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8") implementation("org.owasp:dependency-check-gradle:12.1.3") From 0d04c3de0d5a9d8147a48723f777da3b433fde8b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 8 Jul 2025 11:19:30 -0700 Subject: [PATCH 2/3] volatile --- .../agent/internal/telemetry/BatchItemProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java index 3de2f6b6f06..b88972d1b1f 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java @@ -98,7 +98,7 @@ private static final class Worker implements Runnable { private final long exporterTimeoutNanos; private final int maxPendingExports; - private long nextExportTime; + private volatile long nextExportTime; private final Queue queue; private final int queueCapacity; From a5641a5efe6a1cc08330987c910a6e2bd77528f0 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 8 Jul 2025 11:23:48 -0700 Subject: [PATCH 3/3] remove --- .../agent/internal/init/AppInsightsCertificate.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AppInsightsCertificate.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AppInsightsCertificate.java index 57d5a71accb..4bd5987f28b 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AppInsightsCertificate.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AppInsightsCertificate.java @@ -3,7 +3,6 @@ package com.microsoft.applicationinsights.agent.internal.init; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -75,9 +74,6 @@ boolean isInJavaKeystore() { return loadedCertificates.contains(APP_INSIGHT_ROOT_CERTIFICATE); } - @SuppressFBWarnings( - value = "SECCI", // Command Injection - justification = "No user data is used to construct the command below") private String loadCertificates() { String keyStoreLocation = System.getProperty("java.home") + "/lib/security/cacerts"; return executeWithoutException(