Skip to content

Commit 126ed26

Browse files
committed
Update errorprone
1 parent e8ec93c commit 126ed26

File tree

36 files changed

+66
-9
lines changed

36 files changed

+66
-9
lines changed

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MachineNameFinder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@
2121

2222
package com.microsoft.applicationinsights.agent.bootstrap.diagnostics;
2323

24+
import org.checkerframework.checker.nullness.qual.Nullable;
25+
2426
public class MachineNameFinder extends CachedDiagnosticsValueFinder {
2527
public static final String PROPERTY_NAME = "MachineName";
2628

2729
@Override
30+
@Nullable
2831
protected String populateValue() {
2932
String computerName = System.getenv("COMPUTERNAME");
3033
if (computerName != null) {

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/PidFinder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.lang.management.ManagementFactory;
2525
import java.lang.management.RuntimeMXBean;
2626
import java.lang.reflect.Method;
27+
import org.checkerframework.checker.nullness.qual.Nullable;
2728

2829
public class PidFinder extends CachedDiagnosticsValueFinder {
2930
public static final String PROPERTY_NAME = "PID";
@@ -38,6 +39,7 @@ protected String populateValue() {
3839
return getPidUsingRuntimeBean();
3940
}
4041

42+
@Nullable
4143
private static String getPidUsingRuntimeBean() {
4244
// will only work with sun based jvm
4345
RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
@@ -59,6 +61,7 @@ private static String getPidUsingRuntimeBean() {
5961
}
6062
}
6163

64+
@Nullable
6265
private static String getPidUsingProcessHandle() {
6366
try {
6467
// if java.specification.version < 9, the next line will fail.

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SiteNameFinder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
package com.microsoft.applicationinsights.agent.bootstrap.diagnostics;
2323

24+
import org.checkerframework.checker.nullness.qual.Nullable;
25+
2426
public class SiteNameFinder extends CachedDiagnosticsValueFinder {
2527
// visible for testing
2628
static final String WEBSITE_SITE_NAME_ENV_VAR = "WEBSITE_SITE_NAME";
@@ -33,6 +35,7 @@ public String getName() {
3335
}
3436

3537
@Override
38+
@Nullable
3639
protected String populateValue() {
3740
String value = System.getenv(SiteNameFinder.WEBSITE_SITE_NAME_ENV_VAR);
3841
return value == null || value.isEmpty() ? null : value;

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFile.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.util.concurrent.TimeUnit;
4444
import okio.BufferedSink;
4545
import okio.Okio;
46+
import org.checkerframework.checker.nullness.qual.Nullable;
4647
import org.slf4j.Logger;
4748
import org.slf4j.LoggerFactory;
4849

@@ -313,6 +314,7 @@ private static String getUniqueId(Object pid) {
313314
}
314315
}
315316

317+
@Nullable
316318
private static String capitalize(String input) {
317319
if (input == null) {
318320
return null;

agent/agent-profiler/agent-alerting-api/src/main/java/com/microsoft/applicationinsights/alerting/config/AlertingConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
package com.microsoft.applicationinsights.alerting.config;
2323

2424
import java.util.Objects;
25+
import org.checkerframework.checker.nullness.qual.Nullable;
2526

2627
/** Contains the overall configuration of the entire alerting subsystem. */
2728
public class AlertingConfiguration {
@@ -66,7 +67,7 @@ public CollectionPlanConfiguration getCollectionPlanConfiguration() {
6667
}
6768

6869
@Override
69-
public boolean equals(Object obj) {
70+
public boolean equals(@Nullable Object obj) {
7071
if (obj == this) {
7172
return true;
7273
}
@@ -124,7 +125,7 @@ public long getCooldown() {
124125
}
125126

126127
@Override
127-
public boolean equals(Object obj) {
128+
public boolean equals(@Nullable Object obj) {
128129
if (obj == this) {
129130
return true;
130131
}

agent/agent-profiler/agent-alerting-api/src/main/java/com/microsoft/applicationinsights/alerting/config/CollectionPlanConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.time.ZonedDateTime;
2525
import java.util.Objects;
26+
import org.checkerframework.checker.nullness.qual.Nullable;
2627

2728
public class CollectionPlanConfiguration {
2829

@@ -81,7 +82,7 @@ public String getSettingsMoniker() {
8182
}
8283

8384
@Override
84-
public boolean equals(Object obj) {
85+
public boolean equals(@Nullable Object obj) {
8586
if (obj == this) {
8687
return true;
8788
}

agent/agent-profiler/agent-alerting-api/src/main/java/com/microsoft/applicationinsights/alerting/config/DefaultConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
package com.microsoft.applicationinsights.alerting.config;
2323

2424
import java.util.Objects;
25+
import org.checkerframework.checker.nullness.qual.Nullable;
2526

2627
public class DefaultConfiguration {
2728

@@ -37,7 +38,7 @@ public DefaultConfiguration(
3738
}
3839

3940
@Override
40-
public boolean equals(Object obj) {
41+
public boolean equals(@Nullable Object obj) {
4142
if (obj == this) {
4243
return true;
4344
}

agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/TelemetryDataPoint.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.microsoft.applicationinsights.alerting.config.AlertMetricType;
2525
import java.time.ZonedDateTime;
2626
import java.util.Objects;
27+
import org.checkerframework.checker.nullness.qual.Nullable;
2728

2829
/** Individual sample of telemetry data. */
2930
public class TelemetryDataPoint implements Comparable<TelemetryDataPoint> {
@@ -62,7 +63,7 @@ public AlertMetricType getType() {
6263
}
6364

6465
@Override
65-
public boolean equals(Object obj) {
66+
public boolean equals(@Nullable Object obj) {
6667
if (obj == this) {
6768
return true;
6869
}

agent/agent-profiler/agent-service-profiler/src/main/java/com/microsoft/applicationinsights/serviceprofilerapi/client/uploader/OsPlatformProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
package com.microsoft.applicationinsights.serviceprofilerapi.client.uploader;
2323

2424
import com.microsoft.applicationinsights.serviceprofilerapi.client.contract.OsPlatforms;
25+
import org.checkerframework.checker.nullness.qual.Nullable;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728

2829
public final class OsPlatformProvider {
2930
private static final Logger LOGGER = LoggerFactory.getLogger(OsPlatformProvider.class.getName());
3031

32+
@Nullable
3133
public static String getOsPlatformDescription() {
3234
if (isWindows()) {
3335
return OsPlatforms.WINDOWS;

agent/agent-profiler/agent-service-profiler/src/main/java/com/microsoft/applicationinsights/serviceprofilerapi/profiler/JfrProfiler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.function.Consumer;
4949
import javax.management.InstanceNotFoundException;
5050
import javax.management.MBeanServerConnection;
51+
import org.checkerframework.checker.nullness.qual.Nullable;
5152
import org.slf4j.Logger;
5253
import org.slf4j.LoggerFactory;
5354

@@ -184,6 +185,7 @@ protected void profileAndUpload(AlertBreach alertBreach, Duration duration) {
184185
alertBreach.getType(), duration, uploadNewRecording(alertBreach, recordingStart));
185186
}
186187

188+
@Nullable
187189
private Recording startRecording(AlertMetricType alertType) {
188190
synchronized (activeRecordingLock) {
189191
if (activeRecording != null) {

0 commit comments

Comments
 (0)