From ea49dbc777ae0ce6fe981641aa111b5f18cd01b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 03:29:56 +0000 Subject: [PATCH 1/4] fix(deps): update errorprone packages to v2.41.0 --- dependencyManagement/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index ea0541ca8..25a68eebb 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -27,8 +27,8 @@ dependencies { api("com.google.auto.service:auto-service-annotations:1.1.1") api("com.google.auto.value:auto-value:1.11.0") api("com.google.auto.value:auto-value-annotations:1.11.0") - api("com.google.errorprone:error_prone_annotations:2.40.0") - api("com.google.errorprone:error_prone_core:2.40.0") + api("com.google.errorprone:error_prone_annotations:2.41.0") + api("com.google.errorprone:error_prone_core:2.41.0") api("io.github.netmikey.logunit:logunit-jul:2.0.0") api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha") api("io.prometheus:simpleclient:0.16.0") From 493cea7a5545a3b46222d489d4a96861da676b23 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 28 Jul 2025 11:51:01 -0700 Subject: [PATCH 2/4] Fixes --- .../consistent/ConsistentRateLimitingSampler.java | 2 +- .../ConsistentReservoirSamplingSpanProcessor.java | 10 +++++----- .../consistent56/ConsistentRateLimitingSampler.java | 2 +- .../mapping/metrics/MetricDataMapper.java | 4 ++-- .../inferredspans/InferredSpansAutoConfig.java | 12 ++++++------ .../inferredspans/internal/SamplingProfiler.java | 12 ++++++------ .../internal/PollingMeterCallbackRegistrar.java | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java index 9c2b93f74..14d6dfee4 100644 --- a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java +++ b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java @@ -74,7 +74,7 @@ private static final class State { private final double effectiveWindowNanos; private final long lastNanoTime; - public State(double effectiveWindowCount, double effectiveWindowNanos, long lastNanoTime) { + State(double effectiveWindowCount, double effectiveWindowNanos, long lastNanoTime) { this.effectiveWindowCount = effectiveWindowCount; this.effectiveWindowNanos = effectiveWindowNanos; this.lastNanoTime = lastNanoTime; diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessor.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessor.java index c522bf1c6..67defd745 100644 --- a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessor.java +++ b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessor.java @@ -55,7 +55,7 @@ private static final class ReadableSpanWithPriority { private final int rval; private final long priority; - public static ReadableSpanWithPriority create( + static ReadableSpanWithPriority create( ReadableSpan readableSpan, RandomGenerator randomGenerator) { String otelTraceStateString = readableSpan.getSpanContext().getTraceState().get(OtelTraceState.TRACE_STATE_KEY); @@ -201,7 +201,7 @@ private static final class Reservoir { private final PriorityQueue queue; private final RandomGenerator randomGenerator; - public Reservoir(int reservoirSize, RandomGenerator randomGenerator) { + Reservoir(int reservoirSize, RandomGenerator randomGenerator) { if (reservoirSize < 1) { throw new IllegalArgumentException(); } @@ -211,7 +211,7 @@ public Reservoir(int reservoirSize, RandomGenerator randomGenerator) { this.randomGenerator = randomGenerator; } - public void add(ReadableSpanWithPriority readableSpanWithPriority) { + void add(ReadableSpanWithPriority readableSpanWithPriority) { if (queue.size() < reservoirSize) { queue.add(readableSpanWithPriority); @@ -232,7 +232,7 @@ public void add(ReadableSpanWithPriority readableSpanWithPriority) { } } - public List getResult() { + List getResult() { if (numberOfDiscardedSpansWithMaxDiscardedRValue == 0) { return queue.stream().map(x -> x.readableSpan.toSpanData()).collect(Collectors.toList()); @@ -294,7 +294,7 @@ public List getResult() { return result; } - public boolean isEmpty() { + boolean isEmpty() { return queue.isEmpty(); } } diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSampler.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSampler.java index b58bee96a..0075c5692 100644 --- a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSampler.java +++ b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSampler.java @@ -104,7 +104,7 @@ private static final class State { private final double effectiveDelegateProbability; private final long lastNanoTime; - public State( + State( double effectiveWindowCount, double effectiveWindowNanos, long lastNanoTime, diff --git a/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapper.java b/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapper.java index 1b9f2bf90..46bf32493 100644 --- a/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapper.java +++ b/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapper.java @@ -766,8 +766,8 @@ private static Attributes protoToAttributes(List source) { } private static final class DataWithType { - public final Data data; - public final MetricDataType type; + final Data data; + final MetricDataType type; private DataWithType(Data data, MetricDataType type) { this.data = data; diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java index 6a4e1ba00..2f43e24ec 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java @@ -90,27 +90,27 @@ private static class PropertiesApplier { private final ConfigProperties properties; - public PropertiesApplier(ConfigProperties properties) { + PropertiesApplier(ConfigProperties properties) { this.properties = properties; } - public void applyBool(String configKey, Consumer funcToApply) { + void applyBool(String configKey, Consumer funcToApply) { applyValue(properties.getBoolean(configKey), funcToApply); } - public void applyInt(String configKey, Consumer funcToApply) { + void applyInt(String configKey, Consumer funcToApply) { applyValue(properties.getInt(configKey), funcToApply); } - public void applyDuration(String configKey, Consumer funcToApply) { + void applyDuration(String configKey, Consumer funcToApply) { applyValue(properties.getDuration(configKey), funcToApply); } - public void applyString(String configKey, Consumer funcToApply) { + void applyString(String configKey, Consumer funcToApply) { applyValue(properties.getString(configKey), funcToApply); } - public void applyWildcards( + void applyWildcards( String configKey, Consumer> funcToApply) { String wildcardListString = properties.getString(configKey); if (wildcardListString != null && !wildcardListString.isEmpty()) { diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java index 23e0dfc99..61e5f75a7 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java @@ -806,7 +806,7 @@ public int compareTo(StackTraceEvent o) { } private static class ActivationEvent { - public static final int SERIALIZED_SIZE = + static final int SERIALIZED_SIZE = Long.SIZE / Byte.SIZE + // timestamp TraceContext.SERIALIZED_LENGTH @@ -826,7 +826,7 @@ private static class ActivationEvent { private long threadId; private boolean activation; - public void activation( + void activation( Span context, long threadId, @Nullable Span previousContext, @@ -835,7 +835,7 @@ public void activation( set(context, threadId, /* activation= */ true, previousContext, nanoTime, clock); } - public void deactivation( + void deactivation( Span context, long threadId, @Nullable Span previousContext, @@ -864,7 +864,7 @@ private void set( this.timestamp = nanoTime; } - public void handle(SamplingProfiler samplingProfiler) { + void handle(SamplingProfiler samplingProfiler) { if (logger.isLoggable(Level.FINE)) { logger.log( Level.FINE, @@ -975,7 +975,7 @@ private void stopProfiling(SamplingProfiler samplingProfiler) { } } - public void serialize(ByteBuffer buf) { + void serialize(ByteBuffer buf) { buf.putLong(timestamp); buf.put(traceContextBuffer); buf.put(previousContextBuffer); @@ -984,7 +984,7 @@ public void serialize(ByteBuffer buf) { buf.put(activation ? (byte) 1 : (byte) 0); } - public void deserialize(ByteBuffer buf) { + void deserialize(ByteBuffer buf) { timestamp = buf.getLong(); buf.get(traceContextBuffer); buf.get(previousContextBuffer); diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/PollingMeterCallbackRegistrar.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/PollingMeterCallbackRegistrar.java index 935a81009..fd422d7fa 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/PollingMeterCallbackRegistrar.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/PollingMeterCallbackRegistrar.java @@ -88,7 +88,7 @@ static Iterable of(Runnable callback) { private final Runnable callback; - public PollingIterable(Runnable callback) { + PollingIterable(Runnable callback) { this.callback = callback; } From d2140247ba5ddb6cc28b8552b6eca904182b01cc Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Mon, 28 Jul 2025 18:52:32 +0000 Subject: [PATCH 3/4] ./gradlew spotlessApply --- .../contrib/inferredspans/InferredSpansAutoConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java index 2f43e24ec..9c8118ec5 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java @@ -110,8 +110,7 @@ void applyString(String configKey, Consumer funcToApply) { applyValue(properties.getString(configKey), funcToApply); } - void applyWildcards( - String configKey, Consumer> funcToApply) { + void applyWildcards(String configKey, Consumer> funcToApply) { String wildcardListString = properties.getString(configKey); if (wildcardListString != null && !wildcardListString.isEmpty()) { List values = From b527a928d7c6b60fa891cf9bf8fc0ca1ff42a144 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 28 Jul 2025 12:17:53 -0700 Subject: [PATCH 4/4] Tests --- ...tentReservoirSamplingSpanProcessorTest.java | 2 +- .../consistent56/ConsistentSamplerTest.java | 18 +++++++++--------- .../inferredspans/internal/CallTreeTest.java | 2 +- .../internal/impl/OpampClientImplTest.java | 2 +- .../service/HttpRequestServiceTest.java | 8 ++++---- .../InterceptableSpanExporterTest.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java index 476a31983..5eaefd482 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java @@ -125,7 +125,7 @@ public CompletableResultCode shutdown() { return CompletableResultCode.ofSuccess(); } - public void reset() { + void reset() { this.countDownLatch = new CountDownLatch(numberOfSpansToWaitFor); } } diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java index a246e248f..1f2ee35f0 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java @@ -37,42 +37,42 @@ private static class Input { private OptionalLong parentThreshold = OptionalLong.empty(); private OptionalLong parentRandomValue = OptionalLong.empty(); - public void setParentSampled(boolean parentSampled) { + void setParentSampled(boolean parentSampled) { this.parentSampled = parentSampled; } - public void setParentThreshold(long parentThreshold) { + void setParentThreshold(long parentThreshold) { assertThat(parentThreshold).isBetween(0L, 0xffffffffffffffL); this.parentThreshold = OptionalLong.of(parentThreshold); } - public void setParentRandomValue(long parentRandomValue) { + void setParentRandomValue(long parentRandomValue) { assertThat(parentRandomValue).isBetween(0L, 0xffffffffffffffL); this.parentRandomValue = OptionalLong.of(parentRandomValue); } - public Context getParentContext() { + Context getParentContext() { return createParentContext( traceId, spanId, parentThreshold, parentRandomValue, parentSampled); } - public static String getTraceId() { + static String getTraceId() { return traceId; } - public static String getName() { + static String getName() { return name; } - public static SpanKind getSpanKind() { + static SpanKind getSpanKind() { return spanKind; } - public static Attributes getAttributes() { + static Attributes getAttributes() { return attributes; } - public static List getParentLinks() { + static List getParentLinks() { return parentLinks; } } diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java index b3d5df33a..cd824fbc0 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java @@ -1052,7 +1052,7 @@ private static class StackTraceEvent { private final List trace; private final long nanoTime; - public StackTraceEvent(List trace, long nanoTime) { + StackTraceEvent(List trace, long nanoTime) { this.trace = trace; this.nanoTime = nanoTime; diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java index ec630dc7e..cdec11d4f 100644 --- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java +++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java @@ -416,7 +416,7 @@ private RecordedRequest initializeClient(ServerToAgent initialResponse) { private static class TestEffectiveConfig extends State.EffectiveConfig { private opamp.proto.EffectiveConfig config; - public TestEffectiveConfig(opamp.proto.EffectiveConfig initialValue) { + TestEffectiveConfig(opamp.proto.EffectiveConfig initialValue) { config = initialValue; } diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java index 9996c4783..c0107673b 100644 --- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java +++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java @@ -352,15 +352,15 @@ public CompletableFuture send(BodyWriter writer, int conten return response; } - public void enqueueResponse(HttpSender.Response response) { + void enqueueResponse(HttpSender.Response response) { enqueueResponseFuture(CompletableFuture.completedFuture(response)); } - public void enqueueResponseFuture(CompletableFuture future) { + void enqueueResponseFuture(CompletableFuture future) { responses.add(future); } - public List getRequests(int size) { + List getRequests(int size) { assertThat(requests).hasSize(size); List immutableRequests = Collections.unmodifiableList(new ArrayList<>(requests)); @@ -369,7 +369,7 @@ public List getRequests(int size) { } private static class RequestParams { - public final int contentLength; + final int contentLength; private RequestParams(int contentLength) { this.contentLength = contentLength; diff --git a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java index 35c3afaaa..a6c177181 100644 --- a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java +++ b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java @@ -82,7 +82,7 @@ void verifySpanFiltering() { private static class ModifiableSpanData extends DelegatingSpanData { private final AttributesBuilder attributes = Attributes.builder(); - protected ModifiableSpanData(SpanData delegate) { + ModifiableSpanData(SpanData delegate) { super(delegate); }