Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<TelemetryItem> queue;
private final int queueCapacity;
Expand Down
7 changes: 5 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand All @@ -28,7 +31,7 @@ dependencies {

// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
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")
Expand Down