Skip to content
Open
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
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class ProcessData implements ProcessInfo, JsonSerializable<ProcessData> {

private static final Comparator<ProcessInfo> COMPARATOR =
Comparator.nullsFirst(
Comparator.comparing(ProcessInfo::getName).thenComparing(ProcessInfo::getPid));
Comparator.comparing(ProcessInfo::getName).thenComparingInt(ProcessInfo::getPid));

static {
String spaceOrNull = " " + (char) 0;
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-tooling/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public enum ProcessorType {
}
}

private enum IncludeExclude {
enum IncludeExclude {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is it necessary to change the visibility of these classes?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was changed because the build failed after errorProneVersion new version bump enforces more checks:

Execution failed for task ':agent:agent-tooling:compileJava' (registered by plugin class 'org.gradle.api.plugins.JavaBasePlugin').
> Compilation failed; see the compiler output below.
  C:\repos\ApplicationInsights-Java\agent\agent-tooling\src\main\java\com\microsoft\applicationinsights\agent\internal\configuration\Configuration.java:929: warning: [ExposedPrivateType] Signature of non-private member 'validate' should not reference private classes: IncludeExclude
      public void validate(ProcessorType processorType, IncludeExclude includeExclude) {
                                                        ^
      (see https://errorprone.info/bugpattern/ExposedPrivateType)
    Did you mean 'private void validate(ProcessorType processorType, IncludeExclude includeExclude) {' or 'public enum IncludeExclude {'?

INCLUDE,
EXCLUDE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ public static class ConfigurationException extends RuntimeException {
}
}

private static class JsonOrigin {
static class JsonOrigin {

private static final JsonOrigin ENV_VAR =
new JsonOrigin("env var " + APPLICATIONINSIGHTS_CONFIGURATION_CONTENT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ private AiSampler(
}

@Override
@SuppressWarnings("ReferenceEquality") // intentional identity check on the two percentage objects
public SamplingResult shouldSample(
Context parentContext,
String traceId,
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion licenses/more-licenses.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down