diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 55a33a48007..eb23874d993 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -4,7 +4,7 @@ # To regenerate this file, run: ./gradlew :agent:agent-gc-monitor:gc-monitor-api:dependencies --write-locks com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 3640d81435d..95d276b49ef 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -4,7 +4,7 @@ # To regenerate this file, run: ./gradlew :agent:agent-gc-monitor:gc-monitor-core:dependencies --write-locks com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/jvm/ProcessData.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/jvm/ProcessData.java index bdfee50d6b2..33fd3a7136b 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/jvm/ProcessData.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/jvm/ProcessData.java @@ -39,7 +39,7 @@ public class ProcessData implements ProcessInfo, JsonSerializable { private static final Comparator COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ProcessInfo::getName).thenComparing(ProcessInfo::getPid)); + Comparator.comparing(ProcessInfo::getName).thenComparingInt(ProcessInfo::getPid)); static { String spaceOrNull = " " + (char) 0; diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index b8cf63f91cf..dc5c034bf95 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -23,7 +23,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath com.github.oshi:oshi-common:7.4.2=runtimeClasspath com.github.oshi:oshi-core:7.4.2=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath com.microsoft.azure:msal4j:1.23.1=runtimeClasspath commons-codec:commons-codec:1.22.0=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java index 57861e0a0d0..46f0f744ef0 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java @@ -926,7 +926,7 @@ public static class ProcessorIncludeExclude { public List metricNames = new ArrayList<>(); public List attributes = new ArrayList<>(); - public void validate(ProcessorType processorType, IncludeExclude includeExclude) { + private void validate(ProcessorType processorType, IncludeExclude includeExclude) { if (matchType == null) { throw new FriendlyException( processorType.anX diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 7ad86aebd8e..93e4cb90af9 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -1220,7 +1220,7 @@ static String getJsonEncodingExceptionMessage(@Nullable String message, String l return "The configuration " + location + " contains malformed JSON"; } - static String getJsonEncodingExceptionMessage(String message, JsonOrigin jsonOrigin) { + private static String getJsonEncodingExceptionMessage(String message, JsonOrigin jsonOrigin) { if (message != null && !message.isEmpty()) { return message; } diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java index 7d3feadf1e4..7d9f6bdbeed 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java @@ -48,6 +48,7 @@ private AiSampler( } @Override + @SuppressWarnings("ReferenceEquality") // intentional identity check on the two percentage objects public SamplingResult shouldSample( Context parentContext, String traceId, diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index fc8ff901751..ddb93104b02 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -31,7 +31,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.1.1" val autoValueVersion = "1.11.1" -val errorProneVersion = "2.49.0" +val errorProneVersion = "2.50.0" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.18" diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 402a31415ef..c9b95bc5762 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -31,7 +31,7 @@ > - **Embedded license files**: [jackson-datatype-jsr310-2.22.0.jar/META-INF/LICENSE](jackson-datatype-jsr310-2.22.0.jar/META-INF/LICENSE) - [jackson-datatype-jsr310-2.22.0.jar/META-INF/NOTICE](jackson-datatype-jsr310-2.22.0.jar/META-INF/NOTICE) -**5** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.49.0` +**5** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.50.0` > - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations) > - **Manifest License**: [http://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)