Skip to content

Commit f035f7e

Browse files
renovate[bot]trask
andauthored
Update errorProneVersion to v2.24.1 (#1083)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 8fe0252 commit f035f7e

File tree

8 files changed

+20
-7
lines changed

8 files changed

+20
-7
lines changed

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class Ec2ResourceTest {
4343
+ " \"region\" : \"us-west-2\"\n"
4444
+ "}";
4545

46-
@RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension();
46+
@RegisterExtension
47+
public static final MockWebServerExtension server = new MockWebServerExtension();
4748

4849
@Test
4950
void imdsv2() {

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
class SimpleHttpClientTest {
2727

28-
@RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension();
28+
@RegisterExtension
29+
public static final MockWebServerExtension server = new MockWebServerExtension();
2930

3031
@Test
3132
void testFetchString() {
@@ -58,11 +59,12 @@ void testFailedFetchString() {
5859
static class HttpsServerTest {
5960
@RegisterExtension
6061
@Order(1)
61-
public static SelfSignedCertificateExtension certificate = new SelfSignedCertificateExtension();
62+
public static final SelfSignedCertificateExtension certificate =
63+
new SelfSignedCertificateExtension();
6264

6365
@RegisterExtension
6466
@Order(2)
65-
public static ServerExtension server =
67+
public static final ServerExtension server =
6668
new ServerExtension() {
6769
@Override
6870
protected void configure(ServerBuilder sb) {

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/ResourceHolder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
@AutoService(AutoConfigurationCustomizerProvider.class)
2020
public final class ResourceHolder implements AutoConfigurationCustomizerProvider {
2121

22-
@Nullable static volatile Resource resource;
22+
@SuppressWarnings("NonFinalStaticField")
23+
@Nullable
24+
static volatile Resource resource;
2325

2426
@Override
2527
public void customize(AutoConfigurationCustomizer autoConfiguration) {

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
class XraySamplerClientTest {
3232

33-
@RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension();
33+
@RegisterExtension
34+
public static final MockWebServerExtension server = new MockWebServerExtension();
3435

3536
private XraySamplerClient client;
3637

dependencyManagement/build.gradle.kts

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

2020
val autoServiceVersion = "1.1.1"
2121
val autoValueVersion = "1.10.4"
22-
val errorProneVersion = "2.22.0"
22+
val errorProneVersion = "2.24.1"
2323
val prometheusVersion = "0.16.0"
2424
val mockitoVersion = "4.11.0"
2525
val slf4jVersion = "2.0.10"

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ class InstrumenterHelperTest {
5252

5353
private static final Set<ObjectInstance> registeredBeans = new HashSet<>();
5454

55+
@SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239
5556
private static JMXConnectorServer jmxServer;
57+
58+
@SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239
5659
private static JmxClient jmxClient;
5760

5861
// Will eventually be replaced with Jupiter extension in sdk-testing

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ class MBeanHelperTest {
4040

4141
private static final Set<ObjectInstance> registeredBeans = new HashSet<>();
4242

43+
@SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239
4344
private static JMXConnectorServer jmxServer;
45+
46+
@SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239
4447
private static JmxClient jmxClient;
4548

4649
@BeforeAll

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class OtelHelperJmxTest {
4141

4242
private static final Set<ObjectInstance> registeredBeans = new HashSet<>();
4343

44+
@SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239
4445
private static JMXConnectorServer jmxServer;
4546

4647
@BeforeAll

0 commit comments

Comments
 (0)