From 8c604ed0e5bcb1640582ecf22c7d3db53cfac9bb Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 6 May 2024 13:44:36 -0400 Subject: [PATCH] runtime-v2: remove constructor argument --- .../concord/runtime/v2/runner/context/ContextImpl.java | 2 +- .../concord/runtime/v2/runner/vm/TaskSuspendCommand.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/context/ContextImpl.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/context/ContextImpl.java index da16a47293..c57a7de254 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/context/ContextImpl.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/context/ContextImpl.java @@ -215,6 +215,6 @@ public void reentrantSuspend(String eventName, Map taskSta } state.peekFrame(currentThreadId) - .push(new TaskSuspendCommand(correlationId, LogUtils.getContext(), eventName, (TaskCall) step, taskState)); + .push(new TaskSuspendCommand(correlationId, eventName, (TaskCall) step, taskState)); } } diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/TaskSuspendCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/TaskSuspendCommand.java index f1abcd6d83..97f6a4910c 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/TaskSuspendCommand.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/TaskSuspendCommand.java @@ -23,6 +23,7 @@ import com.walmartlabs.concord.runtime.v2.model.TaskCall; import com.walmartlabs.concord.runtime.v2.runner.context.ResumeEventImpl; import com.walmartlabs.concord.runtime.v2.runner.logging.LogContext; +import com.walmartlabs.concord.runtime.v2.runner.logging.LogUtils; import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.*; @@ -35,14 +36,12 @@ public class TaskSuspendCommand implements Command { private static final long serialVersionUID = 1L; private final UUID correlationId; - private final LogContext logContext; private final String eventName; private final TaskCall step; private final Map taskState; - public TaskSuspendCommand(UUID correlationId, LogContext logContext, String eventName, TaskCall step, Map taskState) { + public TaskSuspendCommand(UUID correlationId, String eventName, TaskCall step, Map taskState) { this.correlationId = correlationId; - this.logContext = logContext; this.eventName = eventName; this.step = step; this.taskState = taskState; @@ -53,6 +52,7 @@ public void eval(Runtime runtime, State state, ThreadId threadId) { Frame frame = state.peekFrame(threadId); frame.pop(); + LogContext logContext = LogUtils.getContext(); frame.push(new TaskResumeCommand(correlationId, logContext, step, new ResumeEventImpl(eventName, taskState))); frame.push(new SuspendCommand(eventName)); }