Run plugin configures *before* setting the plugins and the defaults.

Author: donald-pinckney

temporal-sdk/src/main/java/io/temporal/client/WorkflowClientInternalImpl.java

@@ -77,10 +77,14 @@ public static WorkflowClient newInstance(
     // Merge propagated plugins with client-specified plugins
     WorkflowClientPlugin[] mergedPlugins = mergePlugins(propagatedPlugins, options.getPlugins());
 
-    // Apply plugin configuration phase (forward order), then validate
+    // Apply plugin configuration phase (forward order) on user-provided options,
+    // so plugins see unmodified state before defaults and plugin merging
     WorkflowClientOptions.Builder builder = WorkflowClientOptions.newBuilder(options);
+    for (WorkflowClientPlugin plugin : mergedPlugins) {
+      plugin.configureWorkflowClient(builder);
+    }
+    // Set merged plugins after configuration, then validate
     builder.setPlugins(mergedPlugins);
-    applyClientPluginConfiguration(builder, mergedPlugins);
     options = builder.validateAndBuildWithDefaults();
     workflowServiceStubs =
         new NamespaceInjectWorkflowServiceStubs(workflowServiceStubs, options.getNamespace());
@@ -788,20 +792,6 @@ public NexusStartWorkflowResponse startNexus(
     }
   }
 
-  /**
-   * Applies workflow client plugin configuration phase. Plugins are called in forward
-   * (registration) order to modify the client options.
-   */
-  private static void applyClientPluginConfiguration(
-      WorkflowClientOptions.Builder builder, WorkflowClientPlugin[] plugins) {
-    if (plugins == null || plugins.length == 0) {
-      return;
-    }
-    for (WorkflowClientPlugin plugin : plugins) {
-      plugin.configureWorkflowClient(builder);
-    }
-  }
-
   /**
    * Extracts WorkflowClientPlugins from service stubs plugins. Only plugins that also implement
    * {@link WorkflowClientPlugin} are included. This enables plugin propagation from service stubs

temporal-sdk/src/main/java/io/temporal/client/schedules/ScheduleClientImpl.java

@@ -57,10 +57,14 @@ public static ScheduleClient newInstance(
     // Merge propagated plugins with schedule client-specified plugins
     ScheduleClientPlugin[] mergedPlugins = mergePlugins(propagatedPlugins, options.getPlugins());
 
-    // Apply plugin configuration phase (forward order)
+    // Apply plugin configuration phase (forward order) on user-provided options,
+    // so plugins see unmodified state before defaults and plugin merging
     ScheduleClientOptions.Builder builder = ScheduleClientOptions.newBuilder(options);
+    for (ScheduleClientPlugin plugin : mergedPlugins) {
+      plugin.configureScheduleClient(builder);
+    }
+    // Set merged plugins after configuration, then build
     builder.setPlugins(mergedPlugins);
-    applyPluginConfiguration(builder, mergedPlugins);
     options = builder.build();
 
     workflowServiceStubs =
@@ -119,16 +123,6 @@ private static ScheduleClientPlugin[] mergePlugins(
     return merged.toArray(new ScheduleClientPlugin[0]);
   }
 
-  private static void applyPluginConfiguration(
-      ScheduleClientOptions.Builder builder, ScheduleClientPlugin[] plugins) {
-    if (plugins == null) {
-      return;
-    }
-    for (ScheduleClientPlugin plugin : plugins) {
-      plugin.configureScheduleClient(builder);
-    }
-  }
-
   private ScheduleClientCallsInterceptor initializeClientInvoker() {
     ScheduleClientCallsInterceptor scheduleClientInvoker =
         new RootScheduleClientInvoker(genericClient, options);

temporal-sdk/src/main/java/io/temporal/worker/WorkerFactory.java

@@ -90,11 +90,18 @@ private WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factor
     // Merge propagated plugins with explicit plugins (propagated first)
     this.plugins = mergePlugins(propagatedPlugins, explicitPlugins);
 
-    // Apply plugin configuration to factory options (forward order)
-    factoryOptions = applyPluginConfiguration(factoryOptions, this.plugins);
-
-    this.factoryOptions =
-        WorkerFactoryOptions.newBuilder(factoryOptions).validateAndBuildWithDefaults();
+    // Apply plugin configuration to factory options (forward order) on user-provided options,
+    // so plugins see unmodified state before defaults and plugin merging
+    WorkerFactoryOptions.Builder factoryOptionsBuilder =
+        factoryOptions == null
+            ? WorkerFactoryOptions.newBuilder()
+            : WorkerFactoryOptions.newBuilder(factoryOptions);
+    for (WorkerPlugin plugin : this.plugins) {
+      plugin.configureWorkerFactory(factoryOptionsBuilder);
+    }
+    // Set merged plugins after configuration, then validate
+    factoryOptionsBuilder.setPlugins(this.plugins.toArray(new WorkerPlugin[0]));
+    this.factoryOptions = factoryOptionsBuilder.validateAndBuildWithDefaults();
 
     this.metricsScope =
         this.workflowClient
@@ -554,29 +561,6 @@ private static List<WorkerPlugin> mergePlugins(
     return Collections.unmodifiableList(merged);
   }
 
-  /**
-   * Applies plugin configuration to worker factory options. Plugins are called in forward
-   * (registration) order. The merged plugins are set on the builder so plugins can see the complete
-   * list if they inspect the builder.
-   */
-  private static WorkerFactoryOptions applyPluginConfiguration(
-      WorkerFactoryOptions options, List<WorkerPlugin> plugins) {
-    WorkerFactoryOptions.Builder builder =
-        options == null
-            ? WorkerFactoryOptions.newBuilder()
-            : WorkerFactoryOptions.newBuilder(options);
-
-    // Set the merged plugins on the builder so plugins see the complete list
-    builder.setPlugins(plugins.toArray(new WorkerPlugin[0]));
-
-    if (plugins != null) {
-      for (WorkerPlugin plugin : plugins) {
-        plugin.configureWorkerFactory(builder);
-      }
-    }
-    return builder.build();
-  }
-
   /**
    * Applies plugin configuration to worker options. Plugins are called in forward (registration)
    * order.