diff --git a/docs/adr/004-child-context-execution.md b/docs/adr/004-child-context-execution.md
index cadd24751..d570e67bc 100644
--- a/docs/adr/004-child-context-execution.md
+++ b/docs/adr/004-child-context-execution.md
@@ -46,7 +46,7 @@ Inner operation IDs are prefixed with the parent context's operation ID using `-
### Per-context replay state
-A global `executionMode` doesn't work for child contexts — a child may be replaying while the parent is already executing. Each `DurableContext` tracks its own replay state via an `isReplaying` field, initialized by checking `ExecutionManager.hasOperationsForContext(contextId)`.
+A global `executionMode` doesn't work for child contexts — a child may be replaying while the parent is already executing. Each `DurableContext` tracks its own replay state via an `isReplaying` field, initialized by checking `ExecutionManager.hasOperationsForContext(contextId)`. `StepContext` does not track replay state because steps are retried by attempt, not replayed as independent contexts.
### Thread model
diff --git a/docs/design.md b/docs/design.md
index 0960c5e74..eaba54af0 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -519,7 +519,7 @@ SuspendExecutionException # Internal: triggers suspension (not
Terminal states (SUCCEEDED, FAILED, CANCELLED, TIMED_OUT, STOPPED) stay in REPLAY mode since we're just returning cached results.
-This is a one-way transition (REPLAY → EXECUTION, never back). `DurableLogger` checks `isReplaying()` to suppress duplicate logs during replay.
+This is a one-way transition (REPLAY → EXECUTION, never back). `DurableLogger` checks `DurableContext.isReplaying()` to suppress duplicate logs during replay; `StepContext` logs are attempt-based and are never replay-suppressed.
### MDC-Based Context Enrichment
@@ -896,4 +896,3 @@ var result = stepFuture.get();
| 6 | `wait()` returns. `stepFuture.get()` → result already available. | — | — |
If the wait duration hasn't elapsed when the step completes, the execution is suspended. If the step finishes *after* the wait, the step thread keeps the execution alive (prevents suspension) while the wait polls to completion.
-
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java b/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
index 4b4a04081..ce6eb7070 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
@@ -26,6 +26,9 @@ static DurableContext getCurrentContext() {
return (DurableContext) BaseContext.getCurrentContext();
}
+ /** Returns whether this context is currently replaying checkpointed durable operations. */
+ boolean isReplaying();
+
/**
* Executes a durable step with the given name and blocks until it completes.
*
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
index c6c2cbd71..d7df2091c 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
@@ -62,7 +62,4 @@ static BaseContext getCurrentContext() {
/** Gets the context name for this context. Null for root context. */
String getContextName();
-
- /** Returns whether this context is currently in replay mode. */
- boolean isReplaying();
}
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
index 50a0337a6..6379acdf1 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
@@ -17,8 +17,6 @@ public abstract class BaseContextImpl implements BaseContext {
private final String contextName;
private final ThreadType threadType;
- private boolean isReplaying;
-
/**
* Creates a new BaseContext instance.
*
@@ -41,7 +39,6 @@ protected BaseContextImpl(
this.lambdaContext = lambdaContext;
this.contextId = contextId;
this.contextName = contextName;
- this.isReplaying = executionManager.hasOperationsForContext(contextId);
this.threadType = threadType;
}
@@ -99,19 +96,6 @@ public ExecutionManager getExecutionManager() {
return executionManager;
}
- /** Returns whether this context is currently in replay mode. */
- @Override
- public boolean isReplaying() {
- return isReplaying;
- }
-
- /**
- * Transitions this context from replay to execution mode. Called when the first un-cached operation is encountered.
- */
- public void setExecutionMode() {
- this.isReplaying = false;
- }
-
/** Returns a durable logger for this context. */
public DurableLogger getLogger() {
return DurableLogger.INSTANCE;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
index 801ad7c4c..d75e5b8bd 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
@@ -60,6 +60,7 @@ public class DurableContextImpl extends BaseContextImpl implements DurableContex
private final OperationIdGenerator operationIdGenerator;
private final DurableContextImpl parentContext;
private final boolean isVirtual;
+ private boolean isReplaying;
/** Shared initialization — sets all fields. */
private DurableContextImpl(
@@ -74,6 +75,7 @@ private DurableContextImpl(
operationIdGenerator = new OperationIdGenerator(contextId);
this.parentContext = parentContext;
this.isVirtual = isVirtual;
+ this.isReplaying = executionManager.hasOperationsForContext(contextId);
}
/**
@@ -437,6 +439,19 @@ private String nextOperationId() {
return operationIdGenerator.nextOperationId();
}
+ /** Returns whether this context is currently in replay mode. */
+ @Override
+ public boolean isReplaying() {
+ return isReplaying;
+ }
+
+ /**
+ * Transitions this context from replay to execution mode. Called when the first un-cached operation is encountered.
+ */
+ public void setExecutionMode() {
+ this.isReplaying = false;
+ }
+
/**
* Get the parent context ID for its child operations, which always points to a non-virtual context
*
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
index a988d40aa..d2429dd8e 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
@@ -11,8 +11,8 @@
/**
* Context available inside a step operation's user function.
*
- * Provides access to the current retry attempt number and a logger that includes execution metadata. Extends
- * {@link BaseContext} for thread lifecycle management.
+ *
Provides access to the current retry attempt number and a logger that includes execution metadata. Steps are
+ * retried by attempt rather than replayed, so this context does not track replay state.
*/
public class StepContextImpl extends BaseContextImpl implements StepContext {
private final int attempt;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/logging/DurableLogger.java b/sdk/src/main/java/software/amazon/lambda/durable/logging/DurableLogger.java
index e9fc22622..888c4e248 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/logging/DurableLogger.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/logging/DurableLogger.java
@@ -122,12 +122,14 @@ public void error(String message, Throwable t) {
}
private boolean shouldSuppress(BaseContext context) {
- return context.getDurableConfig().getLoggerConfig().suppressReplayLogs() && context.isReplaying();
+ return context instanceof DurableContext durableContext
+ && context.getDurableConfig().getLoggerConfig().suppressReplayLogs()
+ && durableContext.isReplaying();
}
private void log(Runnable logAction) {
var threadLocalContext = BaseContext.getCurrentContext();
- if (threadLocalContext == null || !shouldSuppress(threadLocalContext)) {
+ if (!shouldSuppress(threadLocalContext)) {
logAction.run();
}
}
diff --git a/sdk/src/test/java/software/amazon/lambda/durable/logging/DurableLoggerTest.java b/sdk/src/test/java/software/amazon/lambda/durable/logging/DurableLoggerTest.java
index 6377ccacc..f2ffe85e0 100644
--- a/sdk/src/test/java/software/amazon/lambda/durable/logging/DurableLoggerTest.java
+++ b/sdk/src/test/java/software/amazon/lambda/durable/logging/DurableLoggerTest.java
@@ -114,10 +114,9 @@ void setsExecutionMdcOnFirstLog() {
@Test
void setStepThreadPropertiesSetsMdc() {
var logger = new DurableLogger(new RecordingLogger().delegate());
- var replaying = new AtomicBoolean(false);
BaseContextImpl.setCurrentContext(
- createStepContext(replaying, LoggerConfig.defaults(), REQUEST_ID, "op-1", "validateOrder", 2));
+ createStepContext(LoggerConfig.defaults(), REQUEST_ID, "op-1", "validateOrder", 2));
DurableLogger.attachContext();
try {
logger.info("step log");
@@ -145,6 +144,20 @@ void clearThreadPropertiesRemovesMdc() {
assertNull(MDC.get(DurableLogger.MDC_REQUEST_ID));
}
+ @Test
+ void stepLogsAreNotSuppressed() {
+ var recordingLogger = new RecordingLogger();
+ var logger = new DurableLogger(recordingLogger.delegate());
+
+ withContext(createStepContext(LoggerConfig.defaults(), REQUEST_ID, "op-1", "validateOrder", 2), () -> {
+ logger.info("step logs should always emit");
+ });
+
+ assertEquals(1, recordingLogger.calls().size());
+ assertEquals(
+ "step logs should always emit", recordingLogger.calls().get(0).message());
+ }
+
@Test
void replayModeTransitionAllowsSubsequentLogs() {
var recordingLogger = new RecordingLogger();
@@ -223,12 +236,7 @@ private static DurableContext createDurableContext(
}
private static StepContext createStepContext(
- AtomicBoolean replaying,
- LoggerConfig loggerConfig,
- String requestId,
- String operationId,
- String operationName,
- int attempt) {
+ LoggerConfig loggerConfig, String requestId, String operationId, String operationName, int attempt) {
return (StepContext) Proxy.newProxyInstance(
StepContext.class.getClassLoader(),
new Class[] {StepContext.class},
@@ -239,7 +247,6 @@ private static StepContext createStepContext(
case "getContextId" -> operationId;
case "getContextName" -> operationName;
case "getAttempt" -> attempt;
- case "isReplaying" -> replaying.get();
case "toString" -> "TestStepContext";
case "hashCode" -> System.identityHashCode(proxy);
case "equals" -> proxy == args[0];