fix(deps): update errorproneversion to v2.25.0 (main) (minor) (#10593)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <[email protected]>

Author: renovate[bot]

custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.errorprone.bugpatterns.checkreturnvalue;
+
+import com.google.errorprone.ErrorProneFlags;
+
+public final class CanIgnoreReturnValueSuggesterFactory {
+
+  // calls package private constructor of CanIgnoreReturnValueSuggester
+  public static CanIgnoreReturnValueSuggester createCanIgnoreReturnValueSuggester(
+      ErrorProneFlags errorProneFlags) {
+    return new CanIgnoreReturnValueSuggester(errorProneFlags);
+  }
+
+  private CanIgnoreReturnValueSuggesterFactory() {}
+}

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java

@@ -13,6 +13,7 @@
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
+import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
 import com.google.errorprone.matchers.Description;
 import com.google.inject.Inject;
 import com.sun.source.tree.ClassTree;
@@ -33,7 +34,8 @@ public class OtelCanIgnoreReturnValueSuggester extends BugChecker
 
   @Inject
   OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags) {
-    delegate = new CanIgnoreReturnValueSuggester(errorProneFlags);
+    delegate =
+        CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(errorProneFlags);
   }
 
   public OtelCanIgnoreReturnValueSuggester() {

dependencyManagement/build.gradle.kts

@@ -39,7 +39,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.10.4"
-val errorProneVersion = "2.24.1"
+val errorProneVersion = "2.25.0"
 val byteBuddyVersion = "1.14.12"
 val asmVersion = "9.6"
 val jmhVersion = "1.37"

instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.test.annotation;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -158,7 +157,7 @@ void excludedMethod() throws Exception {
     new TracedWithSpan().ignored();
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
   }
 
   @Test
@@ -253,7 +252,7 @@ void completingCompletionStage() throws Exception {
     new TracedWithSpan().completionStage(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.complete("Done");
 
@@ -286,7 +285,7 @@ void exceptionallyCompletingCompletionStage() throws Exception {
     new TracedWithSpan().completionStage(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.completeExceptionally(new IllegalArgumentException("Boom"));
 
@@ -405,7 +404,7 @@ void completingCompletableFuture() throws Exception {
     new TracedWithSpan().completableFuture(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.complete("Done");
 
@@ -438,7 +437,7 @@ void exceptionallyCompletingCompletableFuture() throws Exception {
     new TracedWithSpan().completableFuture(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.completeExceptionally(new IllegalArgumentException("Boom"));
 

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java

@@ -101,7 +101,7 @@ void noExistingSpan() throws Exception {
 
     new ExtractAttributesUsingAddingSpanAttributes().withSpanAttributes("foo", "bar", null, "baz");
 
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
   }
 
   @Test

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java

@@ -158,7 +158,7 @@ void excludedMethod() throws Exception {
     new TracedWithSpan().ignored();
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
   }
 
   @Test
@@ -253,7 +253,7 @@ void completingCompletionStage() throws Exception {
     new TracedWithSpan().completionStage(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.complete("Done");
 
@@ -286,7 +286,7 @@ void exceptionallyCompletingCompletionStage() throws Exception {
     new TracedWithSpan().completionStage(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.completeExceptionally(new IllegalArgumentException("Boom"));
 
@@ -405,7 +405,7 @@ void completingCompletableFuture() throws Exception {
     new TracedWithSpan().completableFuture(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.complete("Done");
 
@@ -438,7 +438,7 @@ void exceptionallyCompletingCompletableFuture() throws Exception {
     new TracedWithSpan().completableFuture(future);
 
     Thread.sleep(500); // sleep a bit just to make sure no span is captured
-    assertThat(testing.waitForTraces(0));
+    assertThat(testing.waitForTraces(0)).isEmpty();
 
     future.completeExceptionally(new IllegalArgumentException("Boom"));