Skip to content

Fix UnsupportedOperationException when merging ActivityOptions with i… #2749

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
nitishagar wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −1
Open

Fix UnsupportedOperationException when merging ActivityOptions with i… #2749

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
5 changes: 4 additions & 1 deletion temporal-sdk/src/main/java/io/temporal/activity/ActivityOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.temporal.common.context.ContextPropagator;
import io.temporal.failure.CanceledFailure;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;

/** Options used to configure how an activity is invoked. */
Expand Down Expand Up @@ -282,7 +283,9 @@ public Builder mergeActivityOptions(ActivityOptions override) {
if (this.contextPropagators == null) {
this.contextPropagators = override.contextPropagators;
} else if (override.contextPropagators != null) {
this.contextPropagators.addAll(override.contextPropagators);
List<ContextPropagator> merged = new ArrayList<>(this.contextPropagators);
merged.addAll(override.contextPropagators);
this.contextPropagators = merged;
}
if (override.versioningIntent != VersioningIntent.VERSIONING_INTENT_UNSPECIFIED) {
this.versioningIntent = override.versioningIntent;
Expand Down
26 changes: 26 additions & 0 deletions temporal-sdk/src/test/java/io/temporal/activity/ActivityOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.temporal.workflow.shared.TestActivities.TestActivityImpl;
import java.lang.reflect.Method;
import java.time.Duration;
import java.util.Collections;
import java.util.Map;
import org.junit.*;
import org.junit.rules.Timeout;
Expand Down Expand Up @@ -62,6 +63,31 @@ public void testActivityOptionsMerge() {
Assert.assertEquals(methodOps1, merged);
}

@Test
public void testActivityOptionsMergeWithImmutableContextPropagators() {
// Create options with immutable lists using Collections.emptyList()
// This tests the fix for https://github.com/temporalio/sdk-java/issues/2482
ActivityOptions options1 =
ActivityOptions.newBuilder()
.setStartToCloseTimeout(Duration.ofSeconds(1))
.setContextPropagators(Collections.emptyList())
.build();

ActivityOptions options2 =
ActivityOptions.newBuilder()
.setStartToCloseTimeout(Duration.ofSeconds(2))
.setContextPropagators(Collections.emptyList())
.build();

// This should NOT throw UnsupportedOperationException
ActivityOptions merged =
ActivityOptions.newBuilder(options1).mergeActivityOptions(options2).build();

assertNotNull(merged);
assertNotNull(merged.getContextPropagators());
assertEquals(Duration.ofSeconds(2), merged.getStartToCloseTimeout());
}

@Test
public void testActivityOptionsDefaultInstance() {
testEnv.registerActivitiesImplementations(new TestActivityImpl());
Expand Down