undo defaultContextProp changes

Author: AngerM-DD

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

@@ -30,11 +30,9 @@
 import com.uber.cadence.common.MethodRetry;
 import com.uber.cadence.common.RetryOptions;
 import com.uber.cadence.context.ContextPropagator;
-import com.uber.cadence.context.OpenTelemetryContextPropagator;
 import com.uber.cadence.internal.common.OptionsUtils;
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -68,7 +66,6 @@ public static WorkflowOptions merge(
         .setMemo(o.getMemo())
         .setSearchAttributes(o.getSearchAttributes())
         .setContextPropagators(o.getContextPropagators())
-        .setDefaultContextPropagators(o.useDefaultContextPropagators)
         .validateBuildWithDefaults();
   }
 
@@ -94,8 +91,6 @@ public static final class Builder {
 
     private List<ContextPropagator> contextPropagators;
 
-    private Boolean useDefaultContextPropagators;
-
     public Builder() {}
 
     public Builder(WorkflowOptions o) {
@@ -112,7 +107,6 @@ public Builder(WorkflowOptions o) {
       this.memo = o.memo;
       this.searchAttributes = o.searchAttributes;
       this.contextPropagators = o.contextPropagators;
-      this.useDefaultContextPropagators = o.useDefaultContextPropagators;
     }
 
     /**
@@ -220,13 +214,6 @@ public Builder setContextPropagators(List<ContextPropagator> contextPropagators)
       return this;
     }
 
-    /** Specifies that the default context propagators should not be used. */
-    public Builder setDefaultContextPropagators(Boolean useDefaultContextPropagators) {
-      this.useDefaultContextPropagators =
-          (useDefaultContextPropagators == null || useDefaultContextPropagators);
-      return this;
-    }
-
     public WorkflowOptions build() {
       return new WorkflowOptions(
           workflowId,
@@ -238,8 +225,7 @@ public WorkflowOptions build() {
           cronSchedule,
           memo,
           searchAttributes,
-          contextPropagators,
-          useDefaultContextPropagators);
+          contextPropagators);
     }
 
     /**
@@ -275,20 +261,6 @@ public WorkflowOptions validateBuildWithDefaults() {
         cron.validate();
       }
 
-      if (useDefaultContextPropagators == null || useDefaultContextPropagators) {
-        // Add OpenTelemetry propagator if not already present.
-        if (contextPropagators != null) {
-          contextPropagators = new ArrayList(contextPropagators);
-        } else {
-          contextPropagators = new ArrayList<>();
-        }
-
-        OpenTelemetryContextPropagator otelPropagator = new OpenTelemetryContextPropagator();
-        if (!contextPropagators.contains(otelPropagator)) {
-          contextPropagators.add(otelPropagator);
-        }
-      }
-
       return new WorkflowOptions(
           workflowId,
           policy,
@@ -300,8 +272,7 @@ public WorkflowOptions validateBuildWithDefaults() {
           cronSchedule,
           memo,
           searchAttributes,
-          contextPropagators,
-          useDefaultContextPropagators);
+          contextPropagators);
     }
   }
 
@@ -325,8 +296,6 @@ public WorkflowOptions validateBuildWithDefaults() {
 
   private List<ContextPropagator> contextPropagators;
 
-  private Boolean useDefaultContextPropagators;
-
   private WorkflowOptions(
       String workflowId,
       WorkflowIdReusePolicy workflowIdReusePolicy,
@@ -337,8 +306,7 @@ private WorkflowOptions(
       String cronSchedule,
       Map<String, Object> memo,
       Map<String, Object> searchAttributes,
-      List<ContextPropagator> contextPropagators,
-      Boolean useDefaultContextPropagators) {
+      List<ContextPropagator> contextPropagators) {
     this.workflowId = workflowId;
     this.workflowIdReusePolicy = workflowIdReusePolicy;
     this.executionStartToCloseTimeout = executionStartToCloseTimeout;
@@ -349,7 +317,6 @@ private WorkflowOptions(
     this.memo = memo;
     this.searchAttributes = searchAttributes;
     this.contextPropagators = contextPropagators;
-    this.useDefaultContextPropagators = useDefaultContextPropagators;
   }
 
   public String getWorkflowId() {
@@ -406,9 +373,7 @@ public boolean equals(Object o) {
         && Objects.equals(cronSchedule, that.cronSchedule)
         && Objects.equals(memo, that.memo)
         && Objects.equals(searchAttributes, that.searchAttributes)
-        && Objects.equals(contextPropagators, that.contextPropagators)
-        && (useDefaultContextPropagators == null || useDefaultContextPropagators)
-            == (that.useDefaultContextPropagators == null || that.useDefaultContextPropagators);
+        && Objects.equals(contextPropagators, that.contextPropagators);
   }
 
   @Override
@@ -423,8 +388,7 @@ public int hashCode() {
         cronSchedule,
         memo,
         searchAttributes,
-        contextPropagators,
-        useDefaultContextPropagators);
+        contextPropagators);
   }
 
   @Override
@@ -454,8 +418,6 @@ public String toString() {
         + searchAttributes
         + ", contextPropagators='"
         + contextPropagators
-        + ", useDefaultContextPropagators='"
-        + useDefaultContextPropagators
         + '\''
         + '}';
   }