Merge remote-tracking branch 'upstream/master'

Author: sdwr98

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Fri Nov 15 14:14:26 CET 2019
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists

src/main/java/com/uber/cadence/activity/ActivityOptions.java

@@ -21,7 +21,9 @@
 
 import com.uber.cadence.common.MethodRetry;
 import com.uber.cadence.common.RetryOptions;
+import com.uber.cadence.context.ContextPropagator;
 import java.time.Duration;
+import java.util.List;
 import java.util.Objects;
 
 /** Options used to configure how an activity is invoked. */
@@ -55,6 +57,7 @@ public static ActivityOptions merge(ActivityMethod a, MethodRetry r, ActivityOpt
                 ? o.getTaskList()
                 : (a.taskList().isEmpty() ? null : a.taskList()))
         .setRetryOptions(RetryOptions.merge(r, o.getRetryOptions()))
+        .setContextPropagators(o.getContextPropagators())
         .validateAndBuildWithDefaults();
   }
 
@@ -72,6 +75,8 @@ public static final class Builder {
 
     private RetryOptions retryOptions;
 
+    private List<ContextPropagator> contextPropagators;
+
     public Builder() {}
 
     /** Copy Builder fields from the options. */
@@ -85,6 +90,7 @@ public Builder(ActivityOptions options) {
       this.startToCloseTimeout = options.getStartToCloseTimeout();
       this.taskList = options.taskList;
       this.retryOptions = options.retryOptions;
+      this.contextPropagators = options.contextPropagators;
     }
 
     /**
@@ -143,14 +149,21 @@ public Builder setRetryOptions(RetryOptions retryOptions) {
       return this;
     }
 
+    /** ContextPropagators help propagate the context from the workflow to the activities */
+    public Builder setContextPropagators(List<ContextPropagator> contextPropagators) {
+      this.contextPropagators = contextPropagators;
+      return this;
+    }
+
     public ActivityOptions build() {
       return new ActivityOptions(
           heartbeatTimeout,
           scheduleToCloseTimeout,
           scheduleToStartTimeout,
           startToCloseTimeout,
           taskList,
-          retryOptions);
+          retryOptions,
+          contextPropagators);
     }
 
     public ActivityOptions validateAndBuildWithDefaults() {
@@ -187,7 +200,8 @@ public ActivityOptions validateAndBuildWithDefaults() {
           roundUpToSeconds(scheduleToStart),
           roundUpToSeconds(startToClose),
           taskList,
-          ro);
+          ro,
+          contextPropagators);
     }
   }
 
@@ -203,13 +217,16 @@ public ActivityOptions validateAndBuildWithDefaults() {
 
   private final RetryOptions retryOptions;
 
+  private final List<ContextPropagator> contextPropagators;
+
   private ActivityOptions(
       Duration heartbeatTimeout,
       Duration scheduleToCloseTimeout,
       Duration scheduleToStartTimeout,
       Duration startToCloseTimeout,
       String taskList,
-      RetryOptions retryOptions) {
+      RetryOptions retryOptions,
+      List<ContextPropagator> contextPropagators) {
     this.heartbeatTimeout = heartbeatTimeout;
     this.scheduleToCloseTimeout = scheduleToCloseTimeout;
     if (scheduleToCloseTimeout != null) {
@@ -229,6 +246,7 @@ private ActivityOptions(
     }
     this.taskList = taskList;
     this.retryOptions = retryOptions;
+    this.contextPropagators = contextPropagators;
   }
 
   public Duration getHeartbeatTimeout() {
@@ -255,6 +273,10 @@ public RetryOptions getRetryOptions() {
     return retryOptions;
   }
 
+  public List<ContextPropagator> getContextPropagators() {
+    return contextPropagators;
+  }
+
   @Override
   public String toString() {
     return "ActivityOptions{"
@@ -271,6 +293,8 @@ public String toString() {
         + '\''
         + ", retryOptions="
         + retryOptions
+        + ", contextPropagators"
+        + contextPropagators
         + '}';
   }
 
@@ -285,7 +309,8 @@ public boolean equals(Object o) {
         && Objects.equals(scheduleToStartTimeout, that.scheduleToStartTimeout)
         && Objects.equals(startToCloseTimeout, that.startToCloseTimeout)
         && Objects.equals(taskList, that.taskList)
-        && Objects.equals(retryOptions, that.retryOptions);
+        && Objects.equals(retryOptions, that.retryOptions)
+        && Objects.equals(contextPropagators, that.contextPropagators);
   }
 
   @Override
@@ -296,7 +321,8 @@ public int hashCode() {
         scheduleToStartTimeout,
         startToCloseTimeout,
         taskList,
-        retryOptions);
+        retryOptions,
+        contextPropagators);
   }
 
   static Duration mergeDuration(int annotationSeconds, Duration options) {

src/main/java/com/uber/cadence/client/WorkflowOptions.java

@@ -29,9 +29,11 @@
 import com.uber.cadence.common.CronSchedule;
 import com.uber.cadence.common.MethodRetry;
 import com.uber.cadence.common.RetryOptions;
+import com.uber.cadence.context.ContextPropagator;
 import com.uber.cadence.internal.common.OptionsUtils;
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -63,6 +65,7 @@ public static WorkflowOptions merge(
         .setCronSchedule(OptionsUtils.merge(cronAnnotation, o.getCronSchedule(), String.class))
         .setMemo(o.getMemo())
         .setSearchAttributes(o.getSearchAttributes())
+        .setContextPropagators(o.getContextPropagators())
         .validateBuildWithDefaults();
   }
 
@@ -86,6 +89,8 @@ public static final class Builder {
 
     private Map<String, Object> searchAttributes;
 
+    private List<ContextPropagator> contextPropagators;
+
     public Builder() {}
 
     public Builder(WorkflowOptions o) {
@@ -101,6 +106,7 @@ public Builder(WorkflowOptions o) {
       this.cronSchedule = o.cronSchedule;
       this.memo = o.memo;
       this.searchAttributes = o.searchAttributes;
+      this.contextPropagators = o.contextPropagators;
     }
 
     /**
@@ -197,6 +203,12 @@ public Builder setSearchAttributes(Map<String, Object> searchAttributes) {
       return this;
     }
 
+    /** Specifies the list of context propagators to use during this workflow. */
+    public Builder setContextPropagators(List<ContextPropagator> contextPropagators) {
+      this.contextPropagators = contextPropagators;
+      return this;
+    }
+
     public WorkflowOptions build() {
       return new WorkflowOptions(
           workflowId,
@@ -207,7 +219,8 @@ public WorkflowOptions build() {
           retryOptions,
           cronSchedule,
           memo,
-          searchAttributes);
+          searchAttributes,
+          contextPropagators);
     }
 
     /**
@@ -253,7 +266,8 @@ public WorkflowOptions validateBuildWithDefaults() {
           retryOptions,
           cronSchedule,
           memo,
-          searchAttributes);
+          searchAttributes,
+          contextPropagators);
     }
   }
 
@@ -275,6 +289,8 @@ public WorkflowOptions validateBuildWithDefaults() {
 
   private Map<String, Object> searchAttributes;
 
+  private List<ContextPropagator> contextPropagators;
+
   private WorkflowOptions(
       String workflowId,
       WorkflowIdReusePolicy workflowIdReusePolicy,
@@ -284,7 +300,8 @@ private WorkflowOptions(
       RetryOptions retryOptions,
       String cronSchedule,
       Map<String, Object> memo,
-      Map<String, Object> searchAttributes) {
+      Map<String, Object> searchAttributes,
+      List<ContextPropagator> contextPropagators) {
     this.workflowId = workflowId;
     this.workflowIdReusePolicy = workflowIdReusePolicy;
     this.executionStartToCloseTimeout = executionStartToCloseTimeout;
@@ -294,6 +311,7 @@ private WorkflowOptions(
     this.cronSchedule = cronSchedule;
     this.memo = memo;
     this.searchAttributes = searchAttributes;
+    this.contextPropagators = contextPropagators;
   }
 
   public String getWorkflowId() {
@@ -332,6 +350,10 @@ public Map<String, Object> getSearchAttributes() {
     return searchAttributes;
   }
 
+  public List<ContextPropagator> getContextPropagators() {
+    return contextPropagators;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -345,7 +367,8 @@ public boolean equals(Object o) {
         && Objects.equals(retryOptions, that.retryOptions)
         && Objects.equals(cronSchedule, that.cronSchedule)
         && Objects.equals(memo, that.memo)
-        && Objects.equals(searchAttributes, that.searchAttributes);
+        && Objects.equals(searchAttributes, that.searchAttributes)
+        && Objects.equals(contextPropagators, that.contextPropagators);
   }
 
   @Override
@@ -359,7 +382,8 @@ public int hashCode() {
         retryOptions,
         cronSchedule,
         memo,
-        searchAttributes);
+        searchAttributes,
+        contextPropagators);
   }
 
   @Override
@@ -387,6 +411,8 @@ public String toString() {
         + '\''
         + ", searchAttributes='"
         + searchAttributes
+        + ", contextPropagators='"
+        + contextPropagators
         + '\''
         + '}';
   }