Update test to show Active Tracing span is ignored by default

open-telemetry · Mar 22, 2024 · d6da5b0 · d6da5b0
1 parent 33f9592
commit d6da5b0
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/.../main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java b/.../main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java
@@ -12,8 +12,6 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import io.opentelemetry.api.common.AttributeKey;
-import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
@@ -91,11 +89,15 @@ void handlerTracedWithException() {
                                 equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
   }
 
+  /**
+   * For more details about active tracing see
+   * https://docs.aws.amazon.com/lambda/latest/dg/services-xray.html
+   */
   @Test
   @SetEnvironmentVariable(
       key = "_X_AMZN_TRACE_ID",
       value = "Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=0000000000000456;Sampled=1")
-  void handlerLinksToInfrastructureTrace() {
+  void handlerDoesNotLinkToActiveTracingSpan() {
     String result = handler().handleRequest("hello", context);
     assertThat(result).isEqualTo("world");
 
@@ -106,22 +108,8 @@ void handlerLinksToInfrastructureTrace() {
                     span ->
                         span.hasName("my_function")
                             .hasKind(SpanKind.SERVER)
-                            .hasLinksSatisfying(
-                                links ->
-                                    assertThat(links)
-                                        .singleElement()
-                                        .satisfies(
-                                            link -> {
-                                              assertThat(link.getSpanContext().getTraceId())
-                                                  .isEqualTo("8a3c60f7d188f8fa79d48a391a778fa6");
-                                              assertThat(link.getSpanContext().getSpanId())
-                                                  .isEqualTo("0000000000000456");
-                                              assertThat(link.getAttributes())
-                                                  .isEqualTo(
-                                                      Attributes.of(
-                                                          AttributeKey.stringKey("source"),
-                                                          "x-ray-env"));
-                                            }))
+                            .hasNoParent()
+                            .hasLinks()
                             .hasAttributesSatisfyingExactly(
                                 equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
   }