Improved the handling of the gRPC channel options.

Signed-off-by: Michiel van Praat <michiel.vanpraat@humandigital.nl>
dapr · Oct 23, 2024 · d9bba92 · d9bba92
1 parent a24b49c
commit d9bba92
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/Dapr.Workflow/DaprWorkflowClientBuilderFactory.cs b/src/Dapr.Workflow/DaprWorkflowClientBuilderFactory.cs
@@ -41,7 +41,7 @@ public DaprWorkflowClientBuilderFactory(IConfiguration configuration, IHttpClien
         _httpClientFactory = httpClientFactory;
         _services = services;
     }
-    
+
     /// <summary>
     /// Responsible for building the client itself.
     /// </summary>
@@ -50,17 +50,25 @@ public void CreateClientBuilder(Action<WorkflowRuntimeOptions> configure)
     {
         _services.AddDurableTaskClient(builder =>
         {
+            WorkflowRuntimeOptions options = new();
+            configure?.Invoke(options);
+
             var apiToken = DaprDefaults.GetDefaultDaprApiToken(_configuration);
             var grpcEndpoint = DaprDefaults.GetDefaultGrpcEndpoint(_configuration);
-            
+
             var httpClient = _httpClientFactory.CreateClient();
 
             if (!string.IsNullOrWhiteSpace(apiToken))
             {
-                httpClient.DefaultRequestHeaders.Add( "Dapr-Api-Token", apiToken);    
+                httpClient.DefaultRequestHeaders.Add("Dapr-Api-Token", apiToken);
             }
 
-            builder.UseGrpc(GrpcChannel.ForAddress(grpcEndpoint, new GrpcChannelOptions { HttpClient = httpClient }));
+            var channelOptions = options.GrpcChannelOptions ?? new GrpcChannelOptions
+            {
+                HttpClient = httpClient
+            };
+
+            builder.UseGrpc(GrpcChannel.ForAddress(grpcEndpoint, channelOptions));
             builder.RegisterDirectly();
         });
 
@@ -81,8 +89,12 @@ public void CreateClientBuilder(Action<WorkflowRuntimeOptions> configure)
                     httpClient.DefaultRequestHeaders.Add("Dapr-Api-Token", apiToken);
                 }
 
-                builder.UseGrpc(
-                    GrpcChannel.ForAddress(grpcEndpoint, new GrpcChannelOptions { HttpClient = httpClient }));
+                var channelOptions = options.GrpcChannelOptions ?? new GrpcChannelOptions
+                {
+                    HttpClient = httpClient
+                };
+
+                builder.UseGrpc(GrpcChannel.ForAddress(grpcEndpoint, channelOptions));
             }
             else
             {