Added retry policy to activity info (#511)

Author: maciejdudko

src/Temporalio/Activities/ActivityInfo.cs

@@ -20,6 +20,14 @@ namespace Temporalio.Activities
     /// <param name="HeartbeatTimeout">Heartbeat timeout set by the caller.</param>
     /// <param name="IsLocal">Whether the activity is a local activity or not.</param>
     /// <param name="Priority">The Priority of this activity.</param>
+    /// <param name="RetryPolicy">
+    /// The retry policy of this activity.
+    /// <para>
+    /// Note that the server may have set a different policy than the one provided when scheduling the activity.
+    /// If the value is null, it means the server didn't send information about retry policy (e.g. due to old server
+    /// version), but it may still be defined server-side.
+    /// </para>
+    /// </param>
     /// <param name="ScheduleToCloseTimeout">Schedule to close timeout set by the caller.</param>
     /// <param name="ScheduledTime">When the activity was scheduled.</param>
     /// <param name="StartToCloseTimeout">Start to close timeout set by the caller.</param>
@@ -44,6 +52,7 @@ public record ActivityInfo(
         TimeSpan? HeartbeatTimeout,
         bool IsLocal,
         Temporalio.Common.Priority Priority,
+        Temporalio.Common.RetryPolicy? RetryPolicy,
         TimeSpan? ScheduleToCloseTimeout,
         DateTime ScheduledTime,
         TimeSpan? StartToCloseTimeout,

src/Temporalio/Testing/ActivityEnvironment.cs

@@ -31,6 +31,7 @@ public record ActivityEnvironment
             HeartbeatTimeout: null,
             IsLocal: false,
             Priority: new(),
+            RetryPolicy: new(),
             ScheduleToCloseTimeout: TimeSpan.FromSeconds(1),
             ScheduledTime: new(1970, 1, 1, 1, 1, 1, DateTimeKind.Utc),
             StartToCloseTimeout: TimeSpan.FromSeconds(1),

src/Temporalio/Worker/ActivityWorker.cs

@@ -209,6 +209,7 @@ private void StartActivity(Bridge.Api.ActivityTask.ActivityTask tsk)
                 HeartbeatTimeout: OptionalTimeSpan(start.HeartbeatTimeout),
                 IsLocal: start.IsLocal,
                 Priority: start.Priority is { } p ? new(p) : Priority.Default,
+                RetryPolicy: start.RetryPolicy is { } rp ? RetryPolicy.FromProto(rp) : null,
                 ScheduleToCloseTimeout: OptionalTimeSpan(start.ScheduleToCloseTimeout),
                 ScheduledTime: start.ScheduledTime.ToDateTime(),
                 StartToCloseTimeout: OptionalTimeSpan(start.StartToCloseTimeout),

tests/Temporalio.Tests/KitchenSinkWorkflow.cs

@@ -1,4 +1,5 @@
 using Temporalio.Api.Enums.V1;
+using Temporalio.Common;
 
 namespace Temporalio.Tests;
 
@@ -55,6 +56,16 @@ public class KitchenSinkWorkflow
 
     public Task SomeSignalAsync(string arg) => Task.CompletedTask;
 
+    public static RetryPolicy CreateRetryPolicy(int? maximumAttempts = null, IReadOnlyCollection<string>? nonRetryableErrorTypes = null) =>
+        new()
+        {
+            InitialInterval = TimeSpan.FromMilliseconds(1),
+            BackoffCoefficient = 1.01F,
+            MaximumInterval = TimeSpan.FromMilliseconds(2),
+            MaximumAttempts = maximumAttempts ?? 1,
+            NonRetryableErrorTypes = nonRetryableErrorTypes,
+        };
+
     private async Task<(bool ShouldReturn, object? Value)> HandleActionAsync(
         KSWorkflowParams args, KSAction action)
     {
@@ -144,14 +155,7 @@ action with
             var opts = new ActivityOptions()
             {
                 TaskQueue = action.ExecuteActivity.TaskQueue,
-                RetryPolicy = new()
-                {
-                    InitialInterval = TimeSpan.FromMilliseconds(1),
-                    BackoffCoefficient = 1.01F,
-                    MaximumInterval = TimeSpan.FromMilliseconds(2),
-                    MaximumAttempts = 1,
-                    NonRetryableErrorTypes = action.ExecuteActivity.NonRetryableErrorTypes ?? Array.Empty<string>(),
-                },
+                RetryPolicy = CreateRetryPolicy(action.ExecuteActivity.RetryMaxAttempts, action.ExecuteActivity.NonRetryableErrorTypes),
             };
             if (action.ExecuteActivity.ScheduleToCloseTimeoutMS != null)
             {
@@ -182,10 +186,6 @@ action with
             {
                 opts.ScheduleToCloseTimeout = TimeSpan.FromMinutes(3);
             }
-            if (action.ExecuteActivity.RetryMaxAttempts != null)
-            {
-                opts.RetryPolicy.MaximumAttempts = action.ExecuteActivity.RetryMaxAttempts.Value;
-            }
             // Build cancellation token source for delayed cancelling
             using var cancelSource = CancellationTokenSource.CreateLinkedTokenSource(
                 Workflow.CancellationToken);

tests/Temporalio.Tests/Worker/ActivityWorkerTests.cs

@@ -126,6 +126,7 @@ public async Task ExecuteActivityAsync_CheckInfo_IsAccurate()
         Assert.Equal(1, info.Attempt);
         Assert.InRange(info.CurrentAttemptScheduledTime, beforeNow, afterNow);
         Assert.False(info.IsLocal);
+        Assert.Equal(KitchenSinkWorkflow.CreateRetryPolicy(), info.RetryPolicy);
     }
 
     [Fact]