Skip to content

[Adaptive Sampling] Ensure sampling rule propagation across AWS accounts #1188

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
merged 1 commit into from
Sep 15, 2025
Merged

[Adaptive Sampling] Ensure sampling rule propagation across AWS accounts #1188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions .github/patches/opentelemetry-java-contrib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ index 1ef8abf5..328e63dd 100644
}
}
diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
index 75977dc0..a605bfdc 100644
index 75977dc0..fae13433 100644
--- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
+++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
@@ -5,42 +5,81 @@
Expand Down Expand Up @@ -1111,7 +1111,7 @@ index 75977dc0..a605bfdc 100644
}

@Override
@@ -74,10 +151,44 @@ final class XrayRulesSampler implements Sampler {
@@ -74,10 +151,43 @@ final class XrayRulesSampler implements Sampler {
SpanKind spanKind,
Attributes attributes,
List<LinkData> parentLinks) {
Expand All @@ -1137,15 +1137,14 @@ index 75977dc0..a605bfdc 100644
+ // If the trace state has a sampling rule reference, propagate it
+ // Otherwise, encode and propagate the matched sampling rule using AwsSamplingResult
+ String ruleToPropagate;
+ boolean isFromUpstream = parentSpanContext.isValid();
+ if (upstreamMatchedRule != null) {
+ ruleToPropagate = hashToRuleMap.getOrDefault(upstreamMatchedRule, applier.getRuleName());
+ } else if (isFromUpstream) {
+ ruleToPropagate = hashToRuleMap.getOrDefault(upstreamMatchedRule, null);
+ } else if (parentSpanContext.isValid()) {
+ ruleToPropagate = null;
+ } else {
+ ruleToPropagate = applier.getRuleName();
+ }
+ String hashedRule = ruleToHashMap.getOrDefault(ruleToPropagate, ruleToPropagate);
+ String hashedRule = ruleToHashMap.getOrDefault(ruleToPropagate, upstreamMatchedRule);
+
+ return AwsSamplingResult.create(
+ result.getDecision(),
Expand All @@ -1158,7 +1157,7 @@ index 75977dc0..a605bfdc 100644
}
}

@@ -96,7 +207,97 @@ final class XrayRulesSampler implements Sampler {
@@ -96,7 +206,97 @@ final class XrayRulesSampler implements Sampler {
return "XrayRulesSampler{" + Arrays.toString(ruleAppliers) + "}";
}

Expand Down Expand Up @@ -1257,7 +1256,7 @@ index 75977dc0..a605bfdc 100644
return Arrays.stream(ruleAppliers)
.map(rule -> rule.snapshot(now))
.filter(Objects::nonNull)
@@ -115,15 +316,16 @@ final class XrayRulesSampler implements Sampler {
@@ -115,15 +315,16 @@ final class XrayRulesSampler implements Sampler {
Map<String, SamplingTargetDocument> ruleTargets,
Set<String> requestedTargetRuleNames,
Date now) {
Expand All @@ -1276,7 +1275,7 @@ index 75977dc0..a605bfdc 100644
}
if (requestedTargetRuleNames.contains(rule.getRuleName())) {
// In practice X-Ray should return a target for any rule we requested but
@@ -135,6 +337,216 @@ final class XrayRulesSampler implements Sampler {
@@ -135,6 +336,216 @@ final class XrayRulesSampler implements Sampler {
return rule;
})
.toArray(SamplingRuleApplier[]::new);
Expand Down
Loading