fix(deps): update error-prone monorepo to v2.50.0 (#18957)

renovate[bot] · laurit · web-flow · commit ca9ebf1bc536 · 2026-06-12T09:24:01.000+03:00
Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: Lauri Tulmin &lt;ltulmin@splunk.com&gt;
diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -135,6 +135,8 @@ tasks {
         disable("AddNullMarkedToClass")
         disable("AddNullMarkedToPackageInfo")
 
+        disable("ReferenceEquality")
+
         if (otelProps.testLatestDeps) {
           // Some latest dep tests are compiled for java 17 although the base version uses an older
           // version. Disable rules that suggest using new language features.
@@ -158,6 +160,7 @@ tasks {
           disable("OtelCanIgnoreReturnValueSuggester")
           disable("OtelInternalJavadoc")
           disable("SuppressWarningsWithoutExplanation")
+          disable("ExposedPrivateType")
         }
       }
     }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.49.0"
+val errorProneVersion = "2.50.0"
 val byteBuddyVersion = "1.18.10"
 val asmVersion = "9.10.1"
 val jmhVersion = "1.37"
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/service/peer/internal/ServicePeerResolver.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/service/peer/internal/ServicePeerResolver.java
@@ -122,7 +122,7 @@ public void resolve(
   }
 
   @Nullable
-  ServicePeer resolveServicePeer(
+  private ServicePeer resolveServicePeer(
       String host, @Nullable Integer port, Supplier<String> pathSupplier) {
     Map<ServiceMatcher, ServicePeer> matchers = servicePeerMapping.get(host);
     if (matchers == null) {
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java
@@ -49,7 +49,12 @@
  * https://github.com/raphw/weak-lock-free/blob/ad0e5e0c04d4a31f9485bf12b89afbc9d75473b3/src/main/java/com/blogspot/mydailyjava/weaklockfree/WeakConcurrentMap.java
  */
 // Suppress warnings since this is vendored as-is.
-@SuppressWarnings({"MissingSummary", "EqualsBrokenForNull", "FieldMissingNullable"})
+@SuppressWarnings({
+  "MissingSummary",
+  "EqualsBrokenForNull",
+  "FieldMissingNullable",
+  "ReferenceEquality"
+})
 abstract class AbstractWeakConcurrentMap<K, V, L> implements Iterable<Map.Entry<K, V>> {
 
   private static final ReferenceQueue<Object> REFERENCE_QUEUE = new ReferenceQueue<>();
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java
@@ -50,7 +50,8 @@
   "MissingSummary",
   "UngroupedOverloads",
   "FieldMissingNullable",
-  "SuppressWarningsWithoutExplanation"
+  "SuppressWarningsWithoutExplanation",
+  "ReferenceEquality"
 })
 public class WeakConcurrentMap<K, V>
     extends AbstractWeakConcurrentMap<K, V, WeakConcurrentMap.LookupKey<K>> {
diff --git a/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedScopeParser.java b/instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/EmittedScopeParser.java
@@ -90,7 +90,7 @@ private static EmittedScope.Scope findScopeByName(
       Set<EmittedScope.Scope> scopes, String scopeName) {
     return scopes.stream()
         .filter(scope -> scopeName.equals(scope.getName()))
-        .min(Comparator.comparing(scope -> scope.getSchemaUrl() == null ? 1 : 0))
+        .min(Comparator.comparingInt(scope -> scope.getSchemaUrl() == null ? 1 : 0))
         .orElse(null);
   }
 
diff --git a/instrumentation/executors/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/executors/AbstractExecutorServiceTest.java b/instrumentation/executors/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/executors/AbstractExecutorServiceTest.java
@@ -158,7 +158,7 @@ protected void executeAndCancelTasks(Function<U, Future<?>> task) {
           }
 
           jobFutures.forEach(f -> f.cancel(false));
-          children.forEach(U::unblock);
+          children.forEach(TestTask::unblock);
         });
 
     // Just check there is a single trace, this test is primarily to make sure that scopes aren't
diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/AbstractOpenTelemetryMetricsReporterTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/AbstractOpenTelemetryMetricsReporterTest.java
@@ -430,7 +430,7 @@ private static void printMappingTable() {
           kafkaMetricsByGroup.get(group).stream()
               .sorted(
                   comparing(KafkaMetricId::getName)
-                      .thenComparing(kafkaMetricId -> kafkaMetricId.getAttributeKeys().size()))
+                      .thenComparingInt(kafkaMetricId -> kafkaMetricId.getAttributeKeys().size()))
               .collect(toList());
       // Iterate through metrics in alpha order by name
       for (KafkaMetricId kafkaMetricId : kafkaMetricIds) {
diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java
@@ -125,7 +125,7 @@ private interface Measurements {
 
   // if micrometer histograms are not being used then there's no need to keep any local state
   // OpenTelemetry metrics bridge does not support reading measurements
-  enum NoopMeasurements implements Measurements {
+  private enum NoopMeasurements implements Measurements {
     INSTANCE;
 
     @Override
diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java
@@ -139,7 +139,7 @@ private interface Measurements {
 
   // if micrometer histograms are not being used then there's no need to keep any local state
   // OpenTelemetry metrics bridge does not support reading measurements
-  enum NoopMeasurements implements Measurements {
+  private enum NoopMeasurements implements Measurements {
     INSTANCE;
 
     @Override
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
@@ -25,7 +25,7 @@ public static boolean shouldDecorate(Class<?> callbackClass) {
         && callbackClass != OnResponseErrorDecorator.class;
   }
 
-  private abstract static class OnMessageDecorator<M> implements BiConsumer<M, Connection> {
+  protected abstract static class OnMessageDecorator<M> implements BiConsumer<M, Connection> {
     private final BiConsumer<? super M, ? super Connection> delegate;
     private final boolean forceParentContext;
 
@@ -80,7 +80,7 @@ reactor.util.context.Context currentContext(HttpClientResponse message) {
     }
   }
 
-  private abstract static class OnMessageErrorDecorator<M> implements BiConsumer<M, Throwable> {
+  protected abstract static class OnMessageErrorDecorator<M> implements BiConsumer<M, Throwable> {
     private final BiConsumer<? super M, ? super Throwable> delegate;
 
     OnMessageErrorDecorator(BiConsumer<? super M, ? super Throwable> delegate) {
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SafeServiceLoader.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SafeServiceLoader.java
@@ -49,7 +49,7 @@ public static <T> List<T> load(Class<T> serviceClass, ClassLoader classLoader) {
   public static <T extends Ordered> List<T> loadOrdered(
       Class<T> serviceClass, ClassLoader classLoader) {
     List<T> result = load(serviceClass, classLoader);
-    result.sort(Comparator.comparing(Ordered::order));
+    result.sort(Comparator.comparingInt(Ordered::order));
     return result;
   }
 
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
@@ -57,8 +57,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
 
   @Nullable private static final Method findLoadedClassMethod = getFindLoadedClassMethod();
 
-  static final int TYPE_CAPACITY = 64;
-
+  private static final int TYPE_CAPACITY = 64;
   static final int BOOTSTRAP_HASH = 7236344; // Just a random number
 
   /**
@@ -69,16 +68,16 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
    *   <li>Allow for quick fast path equivalence check of composite keys
    * </ul>
    */
-  final Cache<ClassLoader, WeakReference<ClassLoader>> loaderRefCache = Cache.weak();
+  private final Cache<ClassLoader, WeakReference<ClassLoader>> loaderRefCache = Cache.weak();
 
   /**
    * Single shared Type.Resolution cache -- uses a composite key -- conceptually of loader & name
    */
-  final Cache<TypeCacheKey, TypePool.Resolution> sharedResolutionCache =
+  private final Cache<TypeCacheKey, TypePool.Resolution> sharedResolutionCache =
       Cache.bounded(TYPE_CAPACITY);
 
   // fast path for bootstrap
-  final SharedResolutionCacheAdapter bootstrapCacheProvider =
+  private final SharedResolutionCacheAdapter bootstrapCacheProvider =
       new SharedResolutionCacheAdapter(BOOTSTRAP_HASH, null, sharedResolutionCache);
 
   private final AgentLocationStrategy locationStrategy;
@@ -134,8 +133,7 @@ private static Class<?> findLoadedClass(ClassLoader classLoader, String classNam
     }
   }
 
-  @Override
-  public AgentTypePool typePool(ClassFileLocator classFileLocator, ClassLoader classLoader) {
+  private AgentTypePool agentTypePool(ClassFileLocator classFileLocator, ClassLoader classLoader) {
     return new AgentTypePool(
         getCacheProvider(classLoader),
         classFileLocator,
@@ -144,7 +142,12 @@ public AgentTypePool typePool(ClassFileLocator classFileLocator, ClassLoader cla
   }
 
   @Override
-  public AgentTypePool typePool(
+  public TypePool typePool(ClassFileLocator classFileLocator, ClassLoader classLoader) {
+    return agentTypePool(classFileLocator, classLoader);
+  }
+
+  @Override
+  public TypePool typePool(
       ClassFileLocator classFileLocator, ClassLoader classLoader, String name) {
     return typePool(classFileLocator, classLoader);
   }
@@ -655,7 +658,7 @@ private static AgentTypePool.LazyTypeDescriptionWithClass newLazyTypeDescription
     if (pool.classLoaderRef.get() != clazz.getClassLoader()) {
       ClassFileLocator classFileLocator =
           poolStrategy.locationStrategy.classFileLocator(clazz.getClassLoader());
-      pool = poolStrategy.typePool(classFileLocator, clazz.getClassLoader());
+      pool = poolStrategy.agentTypePool(classFileLocator, clazz.getClassLoader());
     }
     return pool.new LazyTypeDescriptionWithClass(clazz);
   }
diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java
@@ -13,7 +13,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -72,13 +71,13 @@ void setUpContext() {
 
   @SuppressWarnings("unchecked") // we lose parameter types for the KafkaTemplate
   @Override
-  @Test
-  void shouldInstrumentProducerAndConsumer() {
+  protected void runProducerTest(Runnable runnable) {
     contextRunner.run(
         applicationContext -> {
           testing = new SpringSmokeTestRunner(applicationContext.getBean(OpenTelemetry.class));
           kafkaTemplate = applicationContext.getBean(KafkaTemplate.class);
-          super.shouldInstrumentProducerAndConsumer();
+
+          runnable.run();
         });
   }
 }
diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java
@@ -11,7 +11,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.testcontainers.junit.jupiter.Container;
@@ -57,13 +56,13 @@ void setUpContext() {
   }
 
   @Override
-  @Test
-  void mongodb() {
+  protected void runMongoClientTest(Runnable runnable) {
     contextRunner.run(
         applicationContext -> {
           testing = new SpringSmokeTestRunner(applicationContext.getBean(OpenTelemetry.class));
           mongoClient = applicationContext.getBean(MongoClient.class);
-          super.mongodb();
+
+          runnable.run();
         });
   }
 }
diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java
@@ -42,64 +42,75 @@ abstract class AbstractKafkaSpringStarterSmokeTest extends AbstractSpringStarter
   @SuppressWarnings("deprecation") // using deprecated semconv
   @Test
   void shouldInstrumentProducerAndConsumer() {
-    testing.runWithSpan(
-        "producer",
+    runProducerTest(
         () -> {
-          kafkaTemplate.executeInTransaction(
-              ops -> {
-                // return type is incompatible between Spring Boot 2 and 3
-                try {
-                  ops.getClass()
-                      .getDeclaredMethod("send", String.class, Object.class, Object.class)
-                      .invoke(ops, "testTopic", "10", "testSpan");
-                } catch (Exception e) {
-                  throw new IllegalStateException(e);
-                }
-                return 0;
+          testing.runWithSpan(
+              "producer",
+              () -> {
+                kafkaTemplate.executeInTransaction(
+                    ops -> {
+                      // return type is incompatible between Spring Boot 2 and 3
+                      try {
+                        ops.getClass()
+                            .getDeclaredMethod("send", String.class, Object.class, Object.class)
+                            .invoke(ops, "testTopic", "10", "testSpan");
+                      } catch (Exception e) {
+                        throw new IllegalStateException(e);
+                      }
+                      return 0;
+                    });
               });
+
+          testing.waitAndAssertTraces(
+              trace ->
+                  trace.hasSpansSatisfyingExactly(
+                      span -> span.hasName("producer"),
+                      span ->
+                          span.hasName("testTopic publish")
+                              .hasKind(SpanKind.PRODUCER)
+                              .hasParent(trace.getSpan(0))
+                              .hasAttributesSatisfyingExactly(
+                                  equalTo(MESSAGING_SYSTEM, "kafka"),
+                                  equalTo(MESSAGING_DESTINATION_NAME, "testTopic"),
+                                  equalTo(MESSAGING_OPERATION, "publish"),
+                                  satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("producer")),
+                                  satisfies(
+                                      MESSAGING_DESTINATION_PARTITION_ID,
+                                      AbstractStringAssert::isNotEmpty),
+                                  satisfies(
+                                      MESSAGING_KAFKA_MESSAGE_OFFSET,
+                                      AbstractLongAssert::isNotNegative),
+                                  equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10")),
+                      span ->
+                          span.hasName("testTopic process")
+                              .hasKind(SpanKind.CONSUMER)
+                              .hasParent(trace.getSpan(1))
+                              .hasAttributesSatisfying(
+                                  equalTo(MESSAGING_SYSTEM, "kafka"),
+                                  equalTo(MESSAGING_DESTINATION_NAME, "testTopic"),
+                                  equalTo(MESSAGING_OPERATION, "process"),
+                                  satisfies(
+                                      MESSAGING_MESSAGE_BODY_SIZE,
+                                      AbstractLongAssert::isNotNegative),
+                                  satisfies(
+                                      MESSAGING_DESTINATION_PARTITION_ID,
+                                      AbstractStringAssert::isNotEmpty),
+                                  satisfies(
+                                      MESSAGING_KAFKA_MESSAGE_OFFSET,
+                                      AbstractLongAssert::isNotNegative),
+                                  equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10"),
+                                  equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "testListener"),
+                                  satisfies(
+                                      longKey("kafka.record.queue_time_ms"),
+                                      AbstractLongAssert::isNotNegative),
+                                  satisfies(
+                                      MESSAGING_CLIENT_ID, val -> val.startsWith("consumer"))),
+                      span -> span.hasName("consumer").hasParent(trace.getSpan(2))));
         });
+  }
 
-    testing.waitAndAssertTraces(
-        trace ->
-            trace.hasSpansSatisfyingExactly(
-                span -> span.hasName("producer"),
-                span ->
-                    span.hasName("testTopic publish")
-                        .hasKind(SpanKind.PRODUCER)
-                        .hasParent(trace.getSpan(0))
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(MESSAGING_SYSTEM, "kafka"),
-                            equalTo(MESSAGING_DESTINATION_NAME, "testTopic"),
-                            equalTo(MESSAGING_OPERATION, "publish"),
-                            satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("producer")),
-                            satisfies(
-                                MESSAGING_DESTINATION_PARTITION_ID,
-                                AbstractStringAssert::isNotEmpty),
-                            satisfies(
-                                MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative),
-                            equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10")),
-                span ->
-                    span.hasName("testTopic process")
-                        .hasKind(SpanKind.CONSUMER)
-                        .hasParent(trace.getSpan(1))
-                        .hasAttributesSatisfying(
-                            equalTo(MESSAGING_SYSTEM, "kafka"),
-                            equalTo(MESSAGING_DESTINATION_NAME, "testTopic"),
-                            equalTo(MESSAGING_OPERATION, "process"),
-                            satisfies(
-                                MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative),
-                            satisfies(
-                                MESSAGING_DESTINATION_PARTITION_ID,
-                                AbstractStringAssert::isNotEmpty),
-                            satisfies(
-                                MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative),
-                            equalTo(MESSAGING_KAFKA_MESSAGE_KEY, "10"),
-                            equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "testListener"),
-                            satisfies(
-                                longKey("kafka.record.queue_time_ms"),
-                                AbstractLongAssert::isNotNegative),
-                            satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("consumer"))),
-                span -> span.hasName("consumer").hasParent(trace.getSpan(2))));
+  protected void runProducerTest(Runnable runnable) {
+    runnable.run();
   }
 
   @Configuration
diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractMongodbSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractMongodbSpringStarterSmokeTest.java
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/util/TelemetryDataUtil.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/util/TelemetryDataUtil.java

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ tasks {`
`135`	`135`	`disable("AddNullMarkedToClass")`
`136`	`136`	`disable("AddNullMarkedToPackageInfo")`
`137`	`137`
	`138`	`+ disable("ReferenceEquality")`
	`139`	`+`
`138`	`140`	`if (otelProps.testLatestDeps) {`
`139`	`141`	`// Some latest dep tests are compiled for java 17 although the base version uses an older`
`140`	`142`	`// version. Disable rules that suggest using new language features.`
`@@ -158,6 +160,7 @@ tasks {`
`158`	`160`	`disable("OtelCanIgnoreReturnValueSuggester")`
`159`	`161`	`disable("OtelInternalJavadoc")`
`160`	`162`	`disable("SuppressWarningsWithoutExplanation")`
	`163`	`+ disable("ExposedPrivateType")`
`161`	`164`	`}`
`162`	`165`	`}`
`163`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public void resolve(`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Nullable`
`125`		`- ServicePeer resolveServicePeer(`
	`125`	`+ private ServicePeer resolveServicePeer(`
`126`	`126`	`String host, @Nullable Integer port, Supplier<String> pathSupplier) {`
`127`	`127`	`Map<ServiceMatcher, ServicePeer> matchers = servicePeerMapping.get(host);`
`128`	`128`	`if (matchers == null) {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private static EmittedScope.Scope findScopeByName(`
`90`	`90`	`Set<EmittedScope.Scope> scopes, String scopeName) {`
`91`	`91`	`return scopes.stream()`
`92`	`92`	`.filter(scope -> scopeName.equals(scope.getName()))`
`93`		`- .min(Comparator.comparing(scope -> scope.getSchemaUrl() == null ? 1 : 0))`
	`93`	`+ .min(Comparator.comparingInt(scope -> scope.getSchemaUrl() == null ? 1 : 0))`
`94`	`94`	`.orElse(null);`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected void executeAndCancelTasks(Function<U, Future<?>> task) {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`jobFutures.forEach(f -> f.cancel(false));`
`161`		`- children.forEach(U::unblock);`
	`161`	`+ children.forEach(TestTask::unblock);`
`162`	`162`	`});`
`163`	`163`
`164`	`164`	`// Just check there is a single trace, this test is primarily to make sure that scopes aren't`