Skip to content

fix(otel): keep continuation spans within invocation #601

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
zhongkechen merged 1 commit into from
Aug 7, 2026
+12 −12
Merged

fix(otel): keep continuation spans within invocation #601

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions otel-plugin/src/main/java/software/amazon/lambda/durable/otel/InvocationOtelPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,6 @@ public void onOperationEnd(OperationEndInfo info) {
.setAttribute(DURABLE_OPERATION_TYPE, info.type());
addWorkflowLink(spanBuilder);

if (info.startTimestamp() != null) {
spanBuilder.setStartTimestamp(info.startTimestamp());
}

if (info.name() != null) {
spanBuilder.setAttribute(DURABLE_OPERATION_NAME, info.name());
}
Expand Down
20 changes: 12 additions & 8 deletions otel-plugin/src/test/java/software/amazon/lambda/durable/otel/InvocationOtelPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,11 @@ void operationEnd_withoutMatchingStart_createsContinuationSpanWithLink() {
}

@Test
void operationEnd_withoutMatchingStart_usesOperationStartTimestamp() {
void operationEnd_withoutMatchingStart_startsWithinCurrentInvocation() {
plugin.onInvocationStart(new InvocationInfo("req-1", "arn:exec1", true, Instant.now()));

var operationStart = Instant.parse("2026-01-15T08:30:00Z");
var operationEnd = Instant.parse("2026-01-15T09:00:00Z");
var operationStart = Instant.EPOCH;
var operationEnd = operationStart.plusSeconds(60);

// onOperationEnd without a prior onOperationStart — continuation span
plugin.onOperationEnd(new OperationEndInfo(
Expand All @@ -936,15 +936,19 @@ void operationEnd_withoutMatchingStart_usesOperationStartTimestamp() {

plugin.onInvocationEnd(new InvocationEndInfo("req-1", "arn:exec1", true, InvocationStatus.SUCCEEDED, null));

var continuationSpan = spanExporter.getFinishedSpanItems().stream()
var spans = spanExporter.getFinishedSpanItems();
var continuationSpan = spans.stream()
.filter(s -> s.getName().contains("wait"))
.findFirst()
.orElseThrow();
var invocationSpan = spans.stream()
.filter(s -> s.getName().equals("Invocation"))
.findFirst()
.orElseThrow();

assertEquals(
operationStart.toEpochMilli(),
continuationSpan.getStartEpochNanos() / 1_000_000,
"Continuation span should use the operation's startTimestamp");
assertEquals(invocationSpan.getSpanId(), continuationSpan.getParentSpanId());
assertTrue(continuationSpan.getStartEpochNanos() >= invocationSpan.getStartEpochNanos());
assertTrue(continuationSpan.getEndEpochNanos() <= invocationSpan.getEndEpochNanos());
}

@Test
Expand Down