-
Notifications
You must be signed in to change notification settings - Fork 169
add updateable threshold sampler #2137
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
trask
merged 2 commits into
open-telemetry:main
from
jackshirazi:add-updateable-sampler
Aug 22, 2025
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...c/main/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentThresholdSampler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.sampler.consistent56; | ||
|
|
||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.calculateSamplingProbability; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.checkThreshold; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.getInvalidThreshold; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.getMaxThreshold; | ||
|
|
||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.trace.SpanKind; | ||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.sdk.trace.data.LinkData; | ||
| import java.util.List; | ||
|
|
||
| public abstract class ConsistentThresholdSampler extends ConsistentSampler { | ||
|
|
||
| protected abstract long getThreshold(); | ||
|
|
||
| protected static long getThreshold(long threshold) { | ||
| checkThreshold(threshold); | ||
| return threshold; | ||
| } | ||
|
|
||
| protected static String getThresholdDescription(long threshold) { | ||
| String thresholdString; | ||
| if (threshold == getMaxThreshold()) { | ||
| thresholdString = "max"; | ||
| } else { | ||
| thresholdString = | ||
| ConsistentSamplingUtil.appendLast56BitHexEncodedWithoutTrailingZeros( | ||
| new StringBuilder(), threshold) | ||
| .toString(); | ||
| } | ||
|
|
||
| return "ConsistentFixedThresholdSampler{threshold=" | ||
| + thresholdString | ||
| + ", sampling probability=" | ||
| + calculateSamplingProbability(threshold) | ||
| + "}"; | ||
| } | ||
|
|
||
| @Override | ||
| public SamplingIntent getSamplingIntent( | ||
| Context parentContext, | ||
| String name, | ||
| SpanKind spanKind, | ||
| Attributes attributes, | ||
| List<LinkData> parentLinks) { | ||
|
|
||
| return () -> { | ||
| if (getThreshold() == getMaxThreshold()) { | ||
| return getInvalidThreshold(); | ||
| } | ||
| return getThreshold(); | ||
| }; | ||
| } | ||
| } | ||
56 changes: 56 additions & 0 deletions
56
...ava/io/opentelemetry/contrib/sampler/consistent56/ConsistentVariableThresholdSampler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.sampler.consistent56; | ||
|
|
||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.calculateSamplingProbability; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.calculateThreshold; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.checkThreshold; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.getMaxThreshold; | ||
|
|
||
| public class ConsistentVariableThresholdSampler extends ConsistentThresholdSampler { | ||
|
|
||
| private volatile long threshold; | ||
| private volatile String description = ""; | ||
|
|
||
| protected ConsistentVariableThresholdSampler(double samplingProbability) { | ||
| setSamplingProbability(samplingProbability); | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return description; | ||
| } | ||
|
|
||
| @Override | ||
| public long getThreshold() { | ||
| return threshold; | ||
| } | ||
|
|
||
| public void setSamplingProbability(double samplingProbability) { | ||
| long threshold = calculateThreshold(samplingProbability); | ||
| checkThreshold(threshold); | ||
| this.threshold = threshold; | ||
|
|
||
| String thresholdString; | ||
| if (threshold == getMaxThreshold()) { | ||
| thresholdString = "max"; | ||
| } else { | ||
| thresholdString = | ||
| ConsistentSamplingUtil.appendLast56BitHexEncodedWithoutTrailingZeros( | ||
| new StringBuilder(), threshold) | ||
| .toString(); | ||
| } | ||
|
|
||
| // tiny eventual consistency where the description would be out of date with the threshold, | ||
| // but this doesn't really matter | ||
| this.description = | ||
| "ConsistentVariableThresholdSampler{threshold=" | ||
| + thresholdString | ||
| + ", sampling probability=" | ||
| + calculateSamplingProbability(threshold) | ||
| + "}"; | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
...io/opentelemetry/contrib/sampler/consistent56/ConsistentVariableThresholdSamplerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.sampler.consistent56; | ||
|
|
||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.calculateThreshold; | ||
| import static io.opentelemetry.contrib.sampler.consistent56.ConsistentSamplingUtil.getMaxThreshold; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ConsistentVariableThresholdSamplerTest { | ||
|
|
||
| @Test | ||
| void testSetSamplingProbability() { | ||
| double probability = 0.5; | ||
| ConsistentVariableThresholdSampler sampler = | ||
| new ConsistentVariableThresholdSampler(probability); | ||
| testSetSamplingProbability(probability, sampler, /* updateProbability= */ false); | ||
| testSetSamplingProbability(0.25, sampler, /* updateProbability= */ true); | ||
| testSetSamplingProbability(0.0, sampler, /* updateProbability= */ true); | ||
| testSetSamplingProbability(1.0, sampler, /* updateProbability= */ true); | ||
| } | ||
|
|
||
| private static void testSetSamplingProbability( | ||
| double probability, ConsistentVariableThresholdSampler sampler, boolean updateProbability) { | ||
| long threshold = calculateThreshold(probability); | ||
| String thresholdString = | ||
| ConsistentSamplingUtil.appendLast56BitHexEncodedWithoutTrailingZeros( | ||
| new StringBuilder(), threshold) | ||
| .toString(); | ||
| if (threshold == getMaxThreshold()) { | ||
| thresholdString = "max"; | ||
| } | ||
| if (updateProbability) { | ||
| sampler.setSamplingProbability(probability); | ||
| } | ||
| assertThat(sampler.getThreshold()).isEqualTo(threshold); | ||
| assertThat(sampler.getDescription()) | ||
| .isEqualTo( | ||
| "ConsistentVariableThresholdSampler{threshold=" | ||
| + thresholdString | ||
| + ", sampling probability=" | ||
| + probability | ||
| + "}"); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other static methods of ConsistentSamplingUtil are in the "import static", why this is different?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point, thanks! Updated