diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/contexts/LambdaSegmentContext.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/contexts/LambdaSegmentContext.java index 25c99506..bb92a166 100644 --- a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/contexts/LambdaSegmentContext.java +++ b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/contexts/LambdaSegmentContext.java @@ -18,11 +18,11 @@ import com.amazonaws.xray.AWSXRayRecorder; import com.amazonaws.xray.entities.Entity; import com.amazonaws.xray.entities.FacadeSegment; +import com.amazonaws.xray.entities.NoOpSegment; import com.amazonaws.xray.entities.Segment; import com.amazonaws.xray.entities.Subsegment; import com.amazonaws.xray.entities.SubsegmentImpl; import com.amazonaws.xray.entities.TraceHeader; -import com.amazonaws.xray.entities.TraceHeader.SampleDecision; import com.amazonaws.xray.entities.TraceID; import com.amazonaws.xray.exceptions.SubsegmentNotFoundException; import com.amazonaws.xray.listeners.SegmentListener; @@ -35,14 +35,14 @@ public class LambdaSegmentContext implements SegmentContext { private static final Log logger = LogFactory.getLog(LambdaSegmentContext.class); private static final String LAMBDA_TRACE_HEADER_KEY = "_X_AMZN_TRACE_ID"; - + // See: https://github.com/aws/aws-xray-sdk-java/issues/251 private static final String LAMBDA_TRACE_HEADER_PROP = "com.amazonaws.xray.traceHeader"; private static TraceHeader getTraceHeaderFromEnvironment() { String lambdaTraceHeaderKey = System.getenv(LAMBDA_TRACE_HEADER_KEY); - return TraceHeader.fromString(lambdaTraceHeaderKey != null && lambdaTraceHeaderKey.length() > 0 - ? lambdaTraceHeaderKey + return TraceHeader.fromString(lambdaTraceHeaderKey != null && lambdaTraceHeaderKey.length() > 0 + ? lambdaTraceHeaderKey : System.getProperty(LAMBDA_TRACE_HEADER_PROP)); } @@ -50,25 +50,29 @@ private static boolean isInitializing(TraceHeader traceHeader) { return traceHeader.getRootTraceId() == null || traceHeader.getSampled() == null || traceHeader.getParentId() == null; } - private static FacadeSegment newFacadeSegment(AWSXRayRecorder recorder, String name) { - TraceHeader traceHeader = getTraceHeaderFromEnvironment(); - if (isInitializing(traceHeader)) { - logger.warn(LAMBDA_TRACE_HEADER_KEY + " is missing a trace ID, parent ID, or sampling decision. Subsegment " - + name + " discarded."); - return new FacadeSegment(recorder, TraceID.create(recorder), "", SampleDecision.NOT_SAMPLED); - } - return new FacadeSegment(recorder, traceHeader.getRootTraceId(), traceHeader.getParentId(), traceHeader.getSampled()); - } - @Override public Subsegment beginSubsegment(AWSXRayRecorder recorder, String name) { if (logger.isDebugEnabled()) { logger.debug("Beginning subsegment named: " + name); } + TraceHeader traceHeader = LambdaSegmentContext.getTraceHeaderFromEnvironment(); Entity entity = getTraceEntity(); - if (entity == null) { // First subsgment of a subsegment branch. - Segment parentSegment = newFacadeSegment(recorder, name); + if (entity == null) { // First subsegment of a subsegment branch + Segment parentSegment; + if (isInitializing(traceHeader)) { + if (logger.isDebugEnabled()) { + logger.debug("Creating No-Op parent segment"); + } + parentSegment = Segment.noOp(TraceID.create(recorder), recorder); + } else { + parentSegment = new FacadeSegment( + recorder, + traceHeader.getRootTraceId(), + traceHeader.getParentId(), + traceHeader.getSampled() + ); + } boolean isRecording = parentSegment.isRecording(); @@ -145,6 +149,8 @@ public void endSubsegment(AWSXRayRecorder recorder) { current.getCreator().getEmitter().sendSubsegment((Subsegment) current); } clearTraceEntity(); + } else if (parentEntity instanceof NoOpSegment) { + clearTraceEntity(); } else { setTraceEntity(current.getParent()); } diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/NoOpSegment.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/NoOpSegment.java index e406e9ac..d470d2df 100644 --- a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/NoOpSegment.java +++ b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/NoOpSegment.java @@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.checkerframework.checker.nullness.qual.Nullable; -class NoOpSegment implements Segment { +public class NoOpSegment implements Segment { private final TraceID traceId; private final AWSXRayRecorder creator; diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/contexts/LambdaSegmentContextTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/contexts/LambdaSegmentContextTest.java index 5f62747e..2f7a728b 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/contexts/LambdaSegmentContextTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/contexts/LambdaSegmentContextTest.java @@ -22,6 +22,7 @@ import com.amazonaws.xray.AWSXRayRecorderBuilder; import com.amazonaws.xray.emitters.Emitter; import com.amazonaws.xray.entities.FacadeSegment; +import com.amazonaws.xray.entities.NoOpSegment; import com.amazonaws.xray.entities.Subsegment; import com.amazonaws.xray.exceptions.SubsegmentNotFoundException; import com.amazonaws.xray.strategy.LogErrorContextMissingStrategy; @@ -49,6 +50,10 @@ class LambdaSegmentContextTest { private static final String MALFORMED_TRACE_HEADER = ";;Root=1-57ff426a-80c11c39b0c928905eb0828d;;Parent=1234abcd1234abcd;;;Sampled=1;;;"; + private static final String MALFORMED_TRACE_HEADER_2 = ";;root-missing;;Parent=1234abcd1234abcd;;;Sampled=1;;;"; + + private static final String ROOT_LAMBDA_PASSTHROUGH_TRACE_HEADER = + "Root=1-5759e988-bd862e3fe1be46a994272711;Lineage=10:1234abcd:3"; @BeforeEach public void setupAWSXRay() { @@ -63,14 +68,14 @@ public void setupAWSXRay() { } @Test - void testBeginSubsegmentWithNullTraceHeaderEnvironmentVariableResultsInAFacadeSegmentParent() { - testContextResultsInFacadeSegmentParent(); + void testBeginSubsegmentWithNullTraceHeaderEnvironmentVariableResultsInANoOpSegmentParent() { + testContextResultsInNoOpSegmentParent(); } @Test @SetEnvironmentVariable(key = "_X_AMZN_TRACE_ID", value = "a") - void testBeginSubsegmentWithIncompleteTraceHeaderEnvironmentVariableResultsInAFacadeSegmentParent() { - testContextResultsInFacadeSegmentParent(); + void testBeginSubsegmentWithIncompleteTraceHeaderEnvironmentVariableResultsInANoOpSegmentParent() { + testContextResultsInNoOpSegmentParent(); } @Test @@ -85,6 +90,18 @@ void testBeginSubsegmentWithCompleteButMalformedTraceHeaderEnvironmentVariableRe testContextResultsInFacadeSegmentParent(); } + @Test + @SetEnvironmentVariable(key = "_X_AMZN_TRACE_ID", value = MALFORMED_TRACE_HEADER_2) + void testBeginSubsegmentWithIncompleteAndMalformedTraceHeaderEnvironmentVariableResultsInANoOpSegmentParent() { + testContextResultsInNoOpSegmentParent(); + } + + @Test + @SetEnvironmentVariable(key = "_X_AMZN_TRACE_ID", value = ROOT_LAMBDA_PASSTHROUGH_TRACE_HEADER) + void testBeginSubsegmentWithRootLambdaPassthroughTraceHeaderEnvironmentVariableResultsInANoOpSegmentParent() { + testContextResultsInNoOpSegmentParent(); + } + @Test @SetEnvironmentVariable(key = "_X_AMZN_TRACE_ID", value = TRACE_HEADER_2) void testNotSampledSetsParentToSubsegment() { @@ -149,4 +166,12 @@ private static void testContextResultsInFacadeSegmentParent() { mockContext.endSubsegment(AWSXRay.getGlobalRecorder()); assertThat(AWSXRay.getTraceEntity()).isNull(); } + + private static void testContextResultsInNoOpSegmentParent() { + LambdaSegmentContext mockContext = new LambdaSegmentContext(); + assertThat(mockContext.beginSubsegment(AWSXRay.getGlobalRecorder(), "test").getParent()) + .isInstanceOf(NoOpSegment.class); + mockContext.endSubsegment(AWSXRay.getGlobalRecorder()); + assertThat(AWSXRay.getTraceEntity()).isNull(); + } }