Fix more typos

Author: majanjua-amzn

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

@@ -892,7 +892,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..d24148d2 100644
+index 75977dc0..75c39807 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,15 +5,24 @@
@@ -1051,7 +1051,7 @@ index 75977dc0..d24148d2 100644
        }
      }
 
-@@ -96,7 +170,153 @@ final class XrayRulesSampler implements Sampler {
+@@ -96,7 +170,154 @@ final class XrayRulesSampler implements Sampler {
      return "XrayRulesSampler{" + Arrays.toString(ruleAppliers) + "}";
    }
 
@@ -1154,6 +1154,7 @@ index 75977dc0..d24148d2 100644
 +
 +    // Anomaly Capture
 +    if (shouldCaptureAnomalySpan
++        && !span.getSpanContext().isSampled()
 +        && anomalyCaptureRateLimiter != null
 +        && anomalyCaptureRateLimiter.trySpend(1)) {
 +      spanBatcher.accept(span);
@@ -1206,7 +1207,7 @@ index 75977dc0..d24148d2 100644
      return Arrays.stream(ruleAppliers)
          .map(rule -> rule.snapshot(now))
          .filter(Objects::nonNull)
-@@ -115,15 +335,16 @@ final class XrayRulesSampler implements Sampler {
+@@ -115,15 +336,16 @@ final class XrayRulesSampler implements Sampler {
        Map<String, SamplingTargetDocument> ruleTargets,
        Set<String> requestedTargetRuleNames,
        Date now) {
@@ -1225,7 +1226,7 @@ index 75977dc0..d24148d2 100644
                    }
                    if (requestedTargetRuleNames.contains(rule.getRuleName())) {
                      // In practice X-Ray should return a target for any rule we requested but
-@@ -135,6 +356,59 @@ final class XrayRulesSampler implements Sampler {
+@@ -135,6 +357,59 @@ final class XrayRulesSampler implements Sampler {
                    return rule;
                  })
              .toArray(SamplingRuleApplier[]::new);

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java

@@ -165,9 +165,7 @@ void hello() {
     assertThat(response.status().isSuccess()).isTrue();
     assertThat(response.headers())
         .extracting(e -> e.getKey().toString())
-        .contains(
-            "received-x-amzn-trace-id",
-            "received-traceparent");
+        .contains("received-x-amzn-trace-id", "received-traceparent");
 
     var exported = getExported();
     assertThat(exported)