Skip to content

Commit eee700d

Browse files
dependabot[bot]github-actions[bot]heyams
authored
Bump errorProneVersion from 2.29.2 to 2.30.0 (#3835)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Helen <[email protected]> Co-authored-by: heyams <[email protected]>
1 parent ec143c4 commit eee700d

File tree

16 files changed

+56
-28
lines changed

16 files changed

+56
-28
lines changed

agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.26=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
77
io.netty:netty-bom:4.1.112.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.6.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.6.0=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.26=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
77
io.netty:netty-bom:4.1.112.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.6.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.6.0=runtimeClasspath

agent/agent-tooling/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
2424
com.fasterxml.woodstox:woodstox-core:6.7.0=runtimeClasspath
2525
com.github.oshi:oshi-core:6.6.2=runtimeClasspath
2626
com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
27-
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
27+
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
2828
com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath
2929
com.microsoft.azure:msal4j:1.16.1=runtimeClasspath
3030
com.nimbusds:content-type:2.3=runtimeClasspath

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/JmxDataFetcher.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.Collection;
1111
import java.util.HashMap;
1212
import java.util.List;
13+
import java.util.Locale;
1314
import java.util.Map;
1415
import java.util.Set;
1516
import javax.management.AttributeNotFoundException;
@@ -44,7 +45,7 @@ public static Map<String, Collection<Object>> fetch(
4445
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
4546
Set<ObjectName> objects = server.queryNames(new ObjectName(objectName), null);
4647
if (objects.isEmpty()) {
47-
String errorMsg = String.format("Cannot find object name '%s'", objectName);
48+
String errorMsg = String.format(Locale.ROOT, "Cannot find object name '%s'", objectName);
4849
throw new IllegalArgumentException(errorMsg);
4950
}
5051

@@ -81,7 +82,7 @@ public static List<Object> fetch(String objectName, String attribute) throws Exc
8182
Set<ObjectName> objects = server.queryNames(new ObjectName(objectName), null);
8283
logger.trace("Matching object names for pattern {}: {}", objectName, objects.toString());
8384
if (objects.isEmpty()) {
84-
String errorMsg = String.format("Cannot find object name '%s'", objectName);
85+
String errorMsg = String.format(Locale.ROOT, "Cannot find object name '%s'", objectName);
8586
throw new IllegalArgumentException(errorMsg);
8687
}
8788

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/OshiPerformanceCounter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package com.microsoft.applicationinsights.agent.internal.perfcounter;
55

66
import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
7+
import java.util.Locale;
78
import java.util.Map;
89
import java.util.concurrent.atomic.AtomicBoolean;
910
import org.slf4j.Logger;
@@ -115,7 +116,8 @@ private static long getProcessBytes(OSProcess processInfo) {
115116
// use for calculating I/O bytes
116117
private static long getProcessBytesLinux(int processId) {
117118
Map<String, String> io =
118-
FileUtil.getKeyValueMapFromFile(String.format(ProcPath.PID_IO, processId), ":");
119+
FileUtil.getKeyValueMapFromFile(
120+
String.format(Locale.ROOT, ProcPath.PID_IO, processId), ":");
119121
long bytesRead = ParseUtil.parseLongOrDefault(io.getOrDefault("read_bytes", ""), 0L);
120122
long bytesWritten = ParseUtil.parseLongOrDefault(io.getOrDefault("write_bytes", ""), 0L);
121123
return bytesRead + bytesWritten;

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/PerformanceCounterContainer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils;
77
import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
88
import java.util.List;
9+
import java.util.Locale;
910
import java.util.concurrent.CopyOnWriteArrayList;
1011
import java.util.concurrent.ScheduledThreadPoolExecutor;
1112
import java.util.concurrent.TimeUnit;
@@ -76,9 +77,11 @@ public void setCollectionFrequencyInSec(long collectionFrequencyInSec) {
7677
if (collectionFrequencyInSec < MIN_COLLECTION_FREQUENCY_IN_SEC) {
7778
String errorMessage =
7879
String.format(
80+
Locale.ROOT,
7981
"Collecting Interval: illegal value '%d'. The minimum value, '%d', "
8082
+ "is used instead.",
81-
collectionFrequencyInSec, MIN_COLLECTION_FREQUENCY_IN_SEC);
83+
collectionFrequencyInSec,
84+
MIN_COLLECTION_FREQUENCY_IN_SEC);
8285
logger.error(errorMessage);
8386

8487
collectionFrequencyInSec = MIN_COLLECTION_FREQUENCY_IN_SEC;

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/util/TimestampContract.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.time.ZonedDateTime;
1111
import java.time.format.DateTimeFormatter;
1212
import java.util.Date;
13+
import java.util.Locale;
1314
import java.util.regex.Matcher;
1415
import java.util.regex.Pattern;
1516

@@ -22,7 +23,7 @@
2223
public final class TimestampContract {
2324
// Cant use ISO_INSTANT as it does not pad the nanos to 7 figures
2425
private static final DateTimeFormatter FORMATTER =
25-
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.nX");
26+
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.nX", Locale.ROOT);
2627

2728
private static final Pattern TIMESTAMP_PATTERN = Pattern.compile(".*\\.([0-9]+)Z$");
2829

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.nio.file.Path;
1616
import java.nio.file.Paths;
1717
import java.util.HashMap;
18+
import java.util.Locale;
1819
import java.util.Map;
1920
import org.junit.jupiter.api.AfterEach;
2021
import org.junit.jupiter.api.BeforeEach;
@@ -144,7 +145,7 @@ void testRpConfigurationOverlayWithEnvVarAndSysPropPopulated() throws Exception
144145
envVars.put("APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE", String.valueOf(testSamplingPercentage));
145146
RpConfiguration config = new RpConfiguration();
146147

147-
config.connectionString = String.format("original-%s", testConnectionString);
148+
config.connectionString = String.format(Locale.ROOT, "original-%s", testConnectionString);
148149
config.sampling.percentage = testSamplingPercentage + 1.0;
149150

150151
ConfigurationBuilder.overlayFromEnv(config, this::envVars, this::systemProperties);

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/internal/util/LocalStringsUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
77
import java.text.SimpleDateFormat;
88
import java.util.Date;
9+
import java.util.Locale;
910
import java.util.concurrent.ThreadLocalRandom;
1011

1112
public class LocalStringsUtils {
1213

1314
private static final SimpleDateFormat simpleDateFormat =
14-
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
15+
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ", Locale.ROOT);
1516

1617
public static boolean isNullOrEmpty(String value) {
1718
return value == null || value.isEmpty();

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/Duration.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package com.microsoft.applicationinsights.telemetry;
55

6+
import java.util.Locale;
67
import java.util.Objects;
78

89
/**
@@ -106,11 +107,11 @@ public long getTotalMilliseconds() {
106107
public String toString() {
107108
StringBuilder sb = new StringBuilder();
108109
if (days != 0) {
109-
sb.append(String.format("%02d.", days));
110+
sb.append(String.format(Locale.ROOT, "%02d.", days));
110111
}
111-
sb.append(String.format("%02d:%02d:%02d", hours, minutes, seconds));
112+
sb.append(String.format(Locale.ROOT, "%02d:%02d:%02d", hours, minutes, seconds));
112113
if (milliseconds > 0) {
113-
sb.append(String.format(".%03d0000", milliseconds));
114+
sb.append(String.format(Locale.ROOT, ".%03d0000", milliseconds));
114115
}
115116
return sb.toString();
116117
}

0 commit comments

Comments
 (0)