Skip to content

Commit 4cf74ca

Browse files
Copilottrask
andauthored
Fix ErrorProne 2.38.0 build failures by updating checker configuration (#4257)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: trask <[email protected]> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 9b08cfa commit 4cf74ca

File tree

8 files changed

+18
-11
lines changed

8 files changed

+18
-11
lines changed

agent/agent-profiler/agent-alerting/src/test/java/com/microsoft/applicationinsights/alerting/AlertingSubsystemTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ private static AlertingSubsystem getAlertMonitor(
3030
AlertConfiguration.builder()
3131
.setType(AlertMetricType.CPU)
3232
.setEnabled(true)
33-
.setThreshold((float) 80)
33+
.setThreshold(80.0f)
3434
.setProfileDurationSeconds(30)
3535
.setCooldownSeconds(14400)
3636
.build(),
3737
AlertConfiguration.builder()
3838
.setType(AlertMetricType.MEMORY)
3939
.setEnabled(true)
40-
.setThreshold((float) 20)
40+
.setThreshold(20.0f)
4141
.setProfileDurationSeconds(120)
4242
.setCooldownSeconds(14400)
4343
.build(),
@@ -89,14 +89,14 @@ void manualAlertWorks() {
8989
AlertConfiguration.builder()
9090
.setType(AlertMetricType.CPU)
9191
.setEnabled(true)
92-
.setThreshold((float) 80)
92+
.setThreshold(80.0f)
9393
.setProfileDurationSeconds(30)
9494
.setCooldownSeconds(14400)
9595
.build(),
9696
AlertConfiguration.builder()
9797
.setType(AlertMetricType.MEMORY)
9898
.setEnabled(true)
99-
.setThreshold((float) 20)
99+
.setThreshold(20.0f)
100100
.setProfileDurationSeconds(120)
101101
.setCooldownSeconds(14400)
102102
.build(),
@@ -130,14 +130,14 @@ void manualAlertDoesNotTriggerAfterExpired() {
130130
AlertConfiguration.builder()
131131
.setType(AlertMetricType.CPU)
132132
.setEnabled(true)
133-
.setThreshold((float) 80)
133+
.setThreshold(80.0f)
134134
.setProfileDurationSeconds(30)
135135
.setCooldownSeconds(14400)
136136
.build(),
137137
AlertConfiguration.builder()
138138
.setType(AlertMetricType.MEMORY)
139139
.setEnabled(true)
140-
.setThreshold((float) 20)
140+
.setThreshold(20.0f)
141141
.setProfileDurationSeconds(120)
142142
.setCooldownSeconds(14400)
143143
.build(),

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertConfigParserTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void saneDataIsParsed() {
4343
AlertConfiguration.builder()
4444
.setType(AlertMetricType.CPU)
4545
.setEnabled(true)
46-
.setThreshold((float) 80)
46+
.setThreshold(80.0f)
4747
.setProfileDurationSeconds(30)
4848
.setCooldownSeconds(14400)
4949
.build());
@@ -53,7 +53,7 @@ void saneDataIsParsed() {
5353
AlertConfiguration.builder()
5454
.setType(AlertMetricType.MEMORY)
5555
.setEnabled(true)
56-
.setThreshold((float) 20)
56+
.setThreshold(20.0f)
5757
.setProfileDurationSeconds(120)
5858
.setCooldownSeconds(14400)
5959
.build());

buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ tasks {
5454

5555
// Don't support Android without desugar
5656
disable("AndroidJdkLibsChecker")
57-
disable("Java7ApiChecker")
5857
disable("StaticOrDefaultInterfaceMethod")
5958

6059
// needed temporarily while hosting azure-monitor-opentelemetry-exporter in this repo
@@ -70,6 +69,9 @@ tasks {
7069
// cognitive load is dubious.
7170
disable("YodaCondition")
7271

72+
// Requires adding compile dependency to JSpecify
73+
disable("AddNullMarkedToPackageInfo")
74+
7375
if (name.contains("Jmh")) {
7476
disable("MemberName")
7577
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public void setException(Throwable throwable, int stackSize) {
5656
this.throwable = throwable;
5757
}
5858

59+
@SuppressWarnings("EnumOrdinal")
5960
public void setSeverityLevel(SeverityLevel severityLevel) {
6061
data.setSeverityLevel(
6162
severityLevel == null
@@ -65,6 +66,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {
6566
}
6667

6768
@Nullable
69+
@SuppressWarnings("EnumOrdinal")
6870
public SeverityLevel getSeverityLevel() {
6971
return data.getSeverityLevel() == null
7072
? null

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void setMessage(String message) {
4747
data.setMessage(message);
4848
}
4949

50+
@SuppressWarnings("EnumOrdinal")
5051
public void setSeverityLevel(SeverityLevel severityLevel) {
5152
data.setSeverityLevel(
5253
severityLevel == null
@@ -56,6 +57,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {
5657
}
5758

5859
@Nullable
60+
@SuppressWarnings("EnumOrdinal")
5961
public SeverityLevel getSeverityLevel() {
6062
return data.getSeverityLevel() == null
6163
? null

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
3333

3434
val autoServiceVersion = "1.1.1"
3535
val autoValueVersion = "1.11.0"
36-
val errorProneVersion = "2.36.0"
36+
val errorProneVersion = "2.38.0"
3737
val jmhVersion = "1.37"
3838
val mockitoVersion = "4.11.0"
3939
val slf4jVersion = "2.0.17"

licenses/more-licenses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _2025-07-08 14:53:50 UTC_
3636
> - **POM Project URL**: [http://stephenc.github.com/jcip-annotations](http://stephenc.github.com/jcip-annotations)
3737
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
3838
39-
**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.36.0`
39+
**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.38.0`
4040
> - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations)
4141
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
4242
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedProfilerSettingsServlet.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import javax.servlet.http.HttpServletRequest;
1616
import javax.servlet.http.HttpServletResponse;
1717

18+
@SuppressWarnings("TimeInStaticInitializer")
1819
public class MockedProfilerSettingsServlet extends HttpServlet {
1920

2021
private static final Map<ProfilerState, String> CONFIGS;

0 commit comments

Comments
 (0)