From b9788ae593789498c80d278362da41a9ab4ff8bf Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 1 Aug 2025 16:41:03 +0900 Subject: [PATCH 1/2] Remove redundant assertions from ConsistentSamplerTest --- .../sampler/consistent56/ConsistentSamplerTest.java | 13 ------------- 1 file changed, 13 deletions(-) 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..2f213d119 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 @@ -87,10 +87,6 @@ private static class Output { this.parentContext = parentContext; } - boolean getSampledFlag() { - return SamplingDecision.RECORD_AND_SAMPLE.equals(samplingResult.getDecision()); - } - OptionalLong getThreshold() { Span parentSpan = Span.fromContext(parentContext); OtelTraceState otelTraceState = @@ -163,7 +159,6 @@ void testMinThresholdWithoutParentRandomValue() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); assertThat(output.getThreshold()).hasValue(0); assertThat(output.getRandomValue()).isNotPresent(); - assertThat(output.getSampledFlag()).isTrue(); } @Test @@ -181,7 +176,6 @@ void testMinThresholdWithParentRandomValue() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); assertThat(output.getThreshold()).hasValue(0); assertThat(output.getRandomValue()).hasValue(parentRandomValue); - assertThat(output.getSampledFlag()).isTrue(); } @Test @@ -196,7 +190,6 @@ void testMaxThreshold() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.DROP); assertThat(output.getThreshold()).isEmpty(); assertThat(output.getRandomValue()).isNotPresent(); - assertThat(output.getSampledFlag()).isFalse(); } @Test @@ -216,7 +209,6 @@ void testParentBasedInConsistentMode() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); assertThat(output.getThreshold()).hasValue(parentRandomValue); assertThat(output.getRandomValue()).hasValue(parentRandomValue); - assertThat(output.getSampledFlag()).isTrue(); } @Test @@ -232,7 +224,6 @@ void testParentBasedInLegacyMode() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); assertThat(output.getThreshold()).isNotPresent(); assertThat(output.getRandomValue()).isNotPresent(); - assertThat(output.getSampledFlag()).isTrue(); } @Test @@ -248,7 +239,6 @@ void testHalfThresholdNotSampled() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.DROP); assertThat(output.getThreshold()).isNotPresent(); assertThat(output.getRandomValue()).hasValue(0x7FFFFFFFFFFFFFL); - assertThat(output.getSampledFlag()).isFalse(); } @Test @@ -264,7 +254,6 @@ void testHalfThresholdSampled() { assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); assertThat(output.getThreshold()).hasValue(0x80000000000000L); assertThat(output.getRandomValue()).hasValue(0x80000000000000L); - assertThat(output.getSampledFlag()).isTrue(); } @Test @@ -279,9 +268,7 @@ void testParentViolatingInvariant() { Output output = sample(input, sampler); assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); - assertThat(output.getThreshold()).hasValue(0x0L); assertThat(output.getRandomValue()).hasValue(0x80000000000000L); - assertThat(output.getSampledFlag()).isTrue(); } } From ce9883975569873a33633168a9c499cf27e17471 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 1 Aug 2025 16:50:30 +0900 Subject: [PATCH 2/2] Consistent non-present --- .../contrib/sampler/consistent56/ConsistentSamplerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2f213d119..0f8ae634b 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 @@ -188,7 +188,7 @@ void testMaxThreshold() { Output output = sample(input, sampler); assertThat(output.samplingResult.getDecision()).isEqualTo(SamplingDecision.DROP); - assertThat(output.getThreshold()).isEmpty(); + assertThat(output.getThreshold()).isNotPresent(); assertThat(output.getRandomValue()).isNotPresent(); }