From b4cc48c38b46706ca0324593eb1c79a6ddf3a0f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 May 2026 17:59:09 +0000 Subject: [PATCH 1/2] Update error-prone monorepo to v2.49.0 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 8441653add8..599f628186c 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions val autoValueVersion = "1.11.1" -val errorProneVersion = "2.48.0" +val errorProneVersion = "2.49.0" val jmhVersion = "1.37" // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0 val mockitoVersion = "4.11.0" From 87e554a89cf2dbdfaa5eb1375e9862c3a97701c4 Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Thu, 7 May 2026 13:17:44 -0500 Subject: [PATCH 2/2] Fix build --- .../sdk/metrics/internal/exemplar/ReservoirCellSelector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/exemplar/ReservoirCellSelector.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/exemplar/ReservoirCellSelector.java index ed500088576..b5290c92e22 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/exemplar/ReservoirCellSelector.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/exemplar/ReservoirCellSelector.java @@ -7,6 +7,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.context.Context; +import java.util.function.BiFunction; /** Selects which {@link FixedSizeExemplarReservoir} {@link ReservoirCell} receives measurements. */ interface ReservoirCellSelector { @@ -19,6 +20,6 @@ int reservoirCellIndexFor( int reservoirCellIndexFor( ReservoirCell[] cells, double value, Attributes attributes, Context context); - /** Called when {@link FixedSizeExemplarReservoir#collectAndReset(Attributes)}. */ + /** Called when {@link FixedSizeExemplarReservoir#doCollectAndReset(Attributes, BiFunction)}. */ void reset(); }