Skip to content

Commit e977c2d

Browse files
committed
Set default anomaly condition usage to BOTH
1 parent ec7d175 commit e977c2d

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/patches/opentelemetry-java-contrib.patch

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ index 1ef8abf5..328e63dd 100644
892892
}
893893
}
894894
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
895-
index 75977dc0..75c39807 100644
895+
index 75977dc0..25383077 100644
896896
--- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
897897
+++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
898898
@@ -5,15 +5,24 @@
@@ -1051,7 +1051,7 @@ index 75977dc0..75c39807 100644
10511051
}
10521052
}
10531053

1054-
@@ -96,7 +170,154 @@ final class XrayRulesSampler implements Sampler {
1054+
@@ -96,7 +170,157 @@ final class XrayRulesSampler implements Sampler {
10551055
return "XrayRulesSampler{" + Arrays.toString(ruleAppliers) + "}";
10561056
}
10571057

@@ -1133,6 +1133,9 @@ index 75977dc0..75c39807 100644
11331133
+ shouldCaptureAnomalySpan = true;
11341134
+ break;
11351135
+ }
1136+
+ } else {
1137+
+ shouldBoostSampling = true;
1138+
+ shouldCaptureAnomalySpan = true;
11361139
+ }
11371140
+ }
11381141
+ if (shouldBoostSampling && shouldCaptureAnomalySpan) {
@@ -1207,7 +1210,7 @@ index 75977dc0..75c39807 100644
12071210
return Arrays.stream(ruleAppliers)
12081211
.map(rule -> rule.snapshot(now))
12091212
.filter(Objects::nonNull)
1210-
@@ -115,15 +336,16 @@ final class XrayRulesSampler implements Sampler {
1213+
@@ -115,15 +339,16 @@ final class XrayRulesSampler implements Sampler {
12111214
Map<String, SamplingTargetDocument> ruleTargets,
12121215
Set<String> requestedTargetRuleNames,
12131216
Date now) {
@@ -1226,7 +1229,7 @@ index 75977dc0..75c39807 100644
12261229
}
12271230
if (requestedTargetRuleNames.contains(rule.getRuleName())) {
12281231
// In practice X-Ray should return a target for any rule we requested but
1229-
@@ -135,6 +357,59 @@ final class XrayRulesSampler implements Sampler {
1232+
@@ -135,6 +360,59 @@ final class XrayRulesSampler implements Sampler {
12301233
return rule;
12311234
})
12321235
.toArray(SamplingRuleApplier[]::new);

0 commit comments

Comments
 (0)