diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java index 26ce5264..124b9272 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceTest.java @@ -43,7 +43,8 @@ class Ec2ResourceTest { + " \"region\" : \"us-west-2\"\n" + "}"; - @RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension(); + @RegisterExtension + public static final MockWebServerExtension server = new MockWebServerExtension(); @Test void imdsv2() { diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java index 633cd75e..38837620 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.io.TempDir; class SimpleHttpClientTest { - @RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension(); + @RegisterExtension + public static final MockWebServerExtension server = new MockWebServerExtension(); @Test void testFetchString() { @@ -58,11 +59,12 @@ class SimpleHttpClientTest { static class HttpsServerTest { @RegisterExtension @Order(1) - public static SelfSignedCertificateExtension certificate = new SelfSignedCertificateExtension(); + public static final SelfSignedCertificateExtension certificate = + new SelfSignedCertificateExtension(); @RegisterExtension @Order(2) - public static ServerExtension server = + public static final ServerExtension server = new ServerExtension() { @Override protected void configure(ServerBuilder sb) { diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/ResourceHolder.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/ResourceHolder.java index 9eacb544..a39fe2b9 100644 --- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/ResourceHolder.java +++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/ResourceHolder.java @@ -19,7 +19,9 @@ import javax.annotation.Nullable; @AutoService(AutoConfigurationCustomizerProvider.class) public final class ResourceHolder implements AutoConfigurationCustomizerProvider { - @Nullable static volatile Resource resource; + @SuppressWarnings("NonFinalStaticField") + @Nullable + static volatile Resource resource; @Override public void customize(AutoConfigurationCustomizer autoConfiguration) { diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java index c76cf4ca..283e3b3c 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java @@ -30,7 +30,8 @@ import org.skyscreamer.jsonassert.JSONAssert; class XraySamplerClientTest { - @RegisterExtension public static MockWebServerExtension server = new MockWebServerExtension(); + @RegisterExtension + public static final MockWebServerExtension server = new MockWebServerExtension(); private XraySamplerClient client; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index b45e65ad..385f5085 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -19,7 +19,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.1.1" val autoValueVersion = "1.10.4" -val errorProneVersion = "2.22.0" +val errorProneVersion = "2.24.1" val prometheusVersion = "0.16.0" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.10" diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java index 11737efb..e0f9ff22 100644 --- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java +++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java @@ -52,7 +52,10 @@ class InstrumenterHelperTest { private static final Set registeredBeans = new HashSet<>(); + @SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239 private static JMXConnectorServer jmxServer; + + @SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239 private static JmxClient jmxClient; // Will eventually be replaced with Jupiter extension in sdk-testing diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java index 8f696ee5..6a9886fe 100644 --- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java +++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java @@ -40,7 +40,10 @@ class MBeanHelperTest { private static final Set registeredBeans = new HashSet<>(); + @SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239 private static JMXConnectorServer jmxServer; + + @SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239 private static JmxClient jmxClient; @BeforeAll diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java index 4a463a56..03f6f025 100644 --- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java +++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/OtelHelperJmxTest.java @@ -41,6 +41,7 @@ class OtelHelperJmxTest { private static final Set registeredBeans = new HashSet<>(); + @SuppressWarnings("NonFinalStaticField") // https://github.com/google/error-prone/issues/4239 private static JMXConnectorServer jmxServer; @BeforeAll