Skip to content

💥 Use ActivitySerializationContext when starting and getting result of Standalone Activity #3063

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

Open
maciejdudko wants to merge 7 commits into
base: main
Choose a base branch
from
+572 −15
Open

💥 Use ActivitySerializationContext when starting and getting result of Standalone Activity #3063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afc5c28
Use ActivitySerializationContext when starting and getting result of …
maciejdudko Sep 10, 2026
edc2379
Fixed NPE
maciejdudko Sep 10, 2026
feab6c5
Merge branch 'main' into saa-serialization-context
maciejdudko Sep 14, 2026
d12cd40
Added tests
maciejdudko Sep 16, 2026
6a94f61
Merge branch 'main' into saa-serialization-context
maciejdudko Sep 16, 2026
d059635
Fixed getResultAsync, added test for local activity
maciejdudko Sep 16, 2026
ef9e2b7
Merge branch 'main' into saa-serialization-context
maciejdudko Sep 17, 2026
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
27 changes: 24 additions & 3 deletions temporal-sdk/src/main/java/io/temporal/internal/client/RootActivityClientInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.temporal.internal.nexus.CurrentNexusOperationContext;
import io.temporal.internal.nexus.InternalNexusOperationContext;
import io.temporal.internal.nexus.NexusOperationMetadata;
import io.temporal.payload.context.ActivitySerializationContext;
import io.temporal.serviceclient.StatusUtils;
import java.lang.reflect.Type;
import java.util.*;
Expand Down Expand Up @@ -61,7 +62,18 @@ public StartActivityOutput startActivity(StartActivityInput input) {
if (Strings.isNullOrEmpty(options.getTaskQueue())) {
throw new IllegalArgumentException("taskQueue must not be null or empty");
}
DataConverter dc = clientOptions.getDataConverter();
DataConverter dc =
clientOptions
.getDataConverter()
.withContext(
new ActivitySerializationContext(
clientOptions.getNamespace(),
null,
null,
input.getActivityType(),
options.getTaskQueue(),
false));

InternalNexusOperationContext nexusContext =
CurrentNexusOperationContext.isNexusContext() ? CurrentNexusOperationContext.get() : null;
NexusOperationMetadata nexusOperationMetadata =
Expand Down Expand Up @@ -201,7 +213,8 @@ public StartActivityOutput startActivity(StartActivityInput input) {
public <R> GetActivityResultOutput<R> getActivityResult(GetActivityResultInput<R> input)
throws TimeoutException {
String namespace = clientOptions.getNamespace();
DataConverter dc = clientOptions.getDataConverter();
DataConverter dc =

@Quinn-With-Two-Ns Quinn-With-Two-Ns Sep 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, technically here we can know the task queue if the handle was created by a start or execute call and we would often know the type if the user created the handle with the typed API

@maciejdudko maciejdudko Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Standalone Activities can have task queue changed after start. Really we should deprecate task queue in serialization context altogether.

@Quinn-With-Two-Ns Quinn-With-Two-Ns Sep 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is some value in task queue since users can have different data converters on different task queues so I wouldn't want to deprecate it IMO, but I can understand not wanting to assume it.

clientOptions.getDataConverter().withContext(resultSerializationContext(input));
Deadline deadline = Deadline.after(input.getTimeout(), input.getTimeoutUnit());

while (true) {
Expand Down Expand Up @@ -276,7 +289,8 @@ public <R> GetActivityResultOutput<R> getActivityResult(GetActivityResultInput<R
@Override
public <R> CompletableFuture<GetActivityResultOutput<R>> getActivityResultAsync(
GetActivityResultInput<R> input) {
DataConverter dc = clientOptions.getDataConverter();
DataConverter dc =
clientOptions.getDataConverter().withContext(resultSerializationContext(input));
Deadline deadline = Deadline.after(input.getTimeout(), input.getTimeoutUnit());
return pollActivityUntilOutcome(input, deadline)
.handle(
Expand Down Expand Up @@ -358,6 +372,13 @@ private <R> GetActivityResultOutput<R> decodeOutcome(
}
}

private ActivitySerializationContext resultSerializationContext(GetActivityResultInput<?> input) {
// Currently, result doesn't have access to activity type and serialization context doesn't hold
// activity ID.
return new ActivitySerializationContext(
clientOptions.getNamespace(), null, null, null, null, false);
}

@Override
public DescribeActivityOutput describeActivity(DescribeActivityInput input) {
DescribeActivityExecutionRequest.Builder req =
Expand Down
26 changes: 14 additions & 12 deletions temporal-sdk/src/main/java/io/temporal/payload/context/ActivitySerializationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,34 @@ public class ActivitySerializationContext implements HasWorkflowSerializationCon
private final @Nonnull String namespace;
private final @Nullable String workflowId;
private final @Nullable String workflowType;
private final @Nonnull String activityType;
private final @Nonnull String activityTaskQueue;
private final @Nullable String activityType;
private final @Nullable String activityTaskQueue;
private final boolean local;

/**
* @param namespace the activity's namespace; must not be {@code null}
* @param workflowId the workflow ID that scheduled the activity, or {@code null} for standalone
* activities (stored as an empty string)
* activities
* @param workflowType the workflow type that scheduled the activity, or {@code null} for
* standalone activities (stored as an empty string)
* @param activityType the activity type name; must not be {@code null}
* @param activityTaskQueue the task queue for this activity; must not be {@code null}
* standalone activities
* @param activityType the activity type name, or {@code null} if unknown. Activity type is
* unknown when getting a Standalone Activity result.
* @param activityTaskQueue the task queue for this activity, or {@code null} if unknown. Task
* queue is unknown when getting a Standalone Activity result.
* @param local {@code true} if this is a local activity
*/
public ActivitySerializationContext(

@Quinn-With-Two-Ns Quinn-With-Two-Ns Sep 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting we don't have activity ID here 🤔

@Nonnull String namespace,
@Nullable String workflowId,
@Nullable String workflowType,
@Nonnull String activityType,
@Nonnull String activityTaskQueue,
@Nullable String activityType,
@Nullable String activityTaskQueue,
boolean local) {
this.namespace = Objects.requireNonNull(namespace);
this.workflowId = workflowId;
this.workflowType = workflowType;
this.activityType = Objects.requireNonNull(activityType);
this.activityTaskQueue = Objects.requireNonNull(activityTaskQueue);
this.activityType = activityType;
this.activityTaskQueue = activityTaskQueue;
this.local = local;
}

Expand Down Expand Up @@ -67,12 +69,12 @@ public String getWorkflowType() {
return workflowType;
}

@Nonnull
@Nullable
public String getActivityType() {
return activityType;
}

@Nonnull
@Nullable
public String getActivityTaskQueue() {
return activityTaskQueue;
}
Expand Down
Loading
Loading