Skip to content

Support thread.name attributes in RuleBasedRoutingSampler #1030

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.

Sign up for GitHub

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 10 commits into from
Sep 18, 2023
Merged

Support thread.name attributes in RuleBasedRoutingSampler #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2ac313
Add thread.id and thread.name to attributes in RuleBasedRoutingSampler
heyams Sep 7, 2023
1efd43a
Address Comment
heyams Sep 7, 2023
540ba0c
Add a test
heyams Sep 14, 2023
bb39640
Revert a line
heyams Sep 14, 2023
844421f
Remove hardcode keys
heyams Sep 15, 2023
2b8ac67
Remove thread.id
heyams Sep 18, 2023
f22656e
Update samplers/src/test/java/io/opentelemetry/contrib/sampler/RuleBa…
heyams Sep 18, 2023
86ea150
Merge branch 'main' into heya/thread-attributes-in-sampler
heyams Sep 18, 2023
9e9594c
Fix thread.name import
heyams Sep 18, 2023
85f4a4b
Fix spotless
heyams Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion samplers/src/main/java/io/opentelemetry/contrib/sampler/RuleBasedRoutingSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.contrib.sampler;

import static io.opentelemetry.semconv.SemanticAttributes.THREAD_NAME;
import static java.util.Objects.requireNonNull;

import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -60,7 +61,12 @@ public SamplingResult shouldSample(
return fallback.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);
}
for (SamplingRule samplingRule : rules) {
String attributeValue = attributes.get(samplingRule.attributeKey);
String attributeValue;
if (samplingRule.attributeKey.getKey().equals(THREAD_NAME.getKey())) {
attributeValue = Thread.currentThread().getName();
} else {
attributeValue = attributes.get(samplingRule.attributeKey);
}
if (attributeValue == null) {
continue;
}
Expand Down
11 changes: 11 additions & 0 deletions samplers/src/test/java/io/opentelemetry/contrib/sampler/RuleBasedRoutingSamplerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.contrib.sampler;

import static io.opentelemetry.semconv.SemanticAttributes.THREAD_NAME;
import static io.opentelemetry.semconv.SemanticAttributes.URL_FULL;
import static io.opentelemetry.semconv.SemanticAttributes.URL_PATH;
import static java.util.Collections.emptyList;
Expand Down Expand Up @@ -187,6 +188,16 @@ void customSampler() {
.isEqualTo(SamplingDecision.RECORD_AND_SAMPLE);
}

@Test
void testThreadNameSampler() {
patterns.add(new SamplingRule(THREAD_NAME, "Test.*", Sampler.alwaysOff()));
Attributes attributes = Attributes.of(THREAD_NAME, "Test worker");
RuleBasedRoutingSampler sampler = new RuleBasedRoutingSampler(patterns, SPAN_KIND, delegate);
SamplingResult samplingResult =
sampler.shouldSample(parentContext, traceId, SPAN_NAME, SPAN_KIND, attributes, emptyList());
assertThat(samplingResult.getDecision()).isEqualTo(SamplingDecision.DROP);
}

private SamplingResult shouldSample(Sampler sampler, String url) {
Attributes attributes = Attributes.of(URL_FULL, url);
return sampler.shouldSample(
Expand Down