Remove obsolete lambda-activity for now (#94)

Author: jviau

CHANGELOG.md

@@ -5,6 +5,7 @@
 - `TaskOrchestrationContext.CreateReplaySafeLogger` now creates `ILogger` directly (as opposed to wrapping an existing `ILogger`).
 - Durable Functions class-based syntax now resolves `ITaskActivity` instances from `IServiceProvider`, if available there.
 - `DurableTaskClient` methods have been touched up to ensure `CancellationToken` is included, as well as is the last parameter.
+- Removed obsolete/unimplemented local lambda activity calls from `TaskOrchestrationContext`
 
 ## v1.0.0-rc.1
 

src/Abstractions/TaskOrchestrationContext.cs

@@ -118,21 +118,6 @@ public virtual Task CallActivityAsync(TaskName name, object? input = null, TaskO
     /// <inheritdoc cref="CallActivityAsync"/>
     public abstract Task<T> CallActivityAsync<T>(TaskName name, object? input = null, TaskOptions? options = null);
 
-    /// <summary>
-    /// Asynchronously invokes an activity function on the current machine.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Unlike named activities, anonymous activities are triggered in local memory and always run in the same process
-    /// space as the calling orchestrators. If a machine failure occurs before the anonymous activity completes, then
-    /// the previous orchestration execution will be re-run to re-schedule the anonymous activity.
-    /// </para>
-    /// </remarks>
-    /// <inheritdoc cref="CallActivityAsync{T}(TaskName, object?, TaskOptions?)"/>
-    [Obsolete("This method is not yet fully implemented")]
-    public abstract Task<T> CallActivityAsync<T>(
-        Func<object?, T> activityLambda, object? input = null, TaskOptions? options = null);
-
     /// <summary>
     /// Creates a durable timer that expires after the specified delay.
     /// </summary>
@@ -267,9 +252,7 @@ public async Task<T> WaitForExternalEvent<T>(string eventName, TimeSpan timeout)
     /// </typeparam>
     /// <inheritdoc cref="CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)"/>
     public abstract Task<TResult> CallSubOrchestratorAsync<TResult>(
-        TaskName orchestratorName,
-        object? input = null,
-        TaskOptions? options = null);
+        TaskName orchestratorName, object? input = null, TaskOptions? options = null);
 
     /// <summary>
     /// Executes a named sub-orchestrator.
@@ -314,9 +297,7 @@ public abstract Task<TResult> CallSubOrchestratorAsync<TResult>(
     /// <see cref="TaskFailedException.FailureDetails"/> property.
     /// </exception>
     public Task CallSubOrchestratorAsync(
-        TaskName orchestratorName,
-        object? input = null,
-        TaskOptions? options = null)
+        TaskName orchestratorName, object? input = null, TaskOptions? options = null)
     {
         return this.CallSubOrchestratorAsync<object>(orchestratorName, input, options);
     }

src/Worker/Core/Shims/TaskOrchestrationContextWrapper.cs

@@ -16,8 +16,6 @@ sealed partial class TaskOrchestrationContextWrapper : TaskOrchestrationContext
 {
     readonly Dictionary<string, IEventSource> externalEventSources = new(StringComparer.OrdinalIgnoreCase);
     readonly NamedQueue<string> externalEventBuffer = new();
-    readonly Queue<Action> localActivityCalls = new();
-
     readonly OrchestrationContext innerContext;
     readonly OrchestrationInvocationContext invocationContext;
     readonly ILogger logger;
@@ -115,33 +113,6 @@ public override async Task<T> CallActivityAsync<T>(
         }
     }
 
-    /// <inheritdoc/>
-    [Obsolete("This method is not yet fully implemented")]
-    public override Task<T> CallActivityAsync<T>(
-        Func<object?, T> activityLambda, object? input = null, TaskOptions? options = null)
-    {
-        if (options != null)
-        {
-            throw new NotImplementedException($"{nameof(TaskOptions)} are not yet supported.");
-        }
-
-        TaskCompletionSource<T> tcs = new();
-        this.localActivityCalls.Enqueue(() =>
-        {
-            try
-            {
-                T output = activityLambda(input);
-                tcs.SetResult(output);
-            }
-            catch (Exception ex)
-            {
-                tcs.SetException(ex);
-            }
-        });
-
-        return tcs.Task;
-    }
-
     /// <inheritdoc/>
     public override async Task<TResult> CallSubOrchestratorAsync<TResult>(
         TaskName orchestratorName,
@@ -328,20 +299,6 @@ static void SwapByteArrayElements(byte[] byteArray, int left, int right)
         return new Guid(newGuidByteArray);
     }
 
-    /// <summary>
-    /// Invokes all queued local activity calls.
-    /// </summary>
-    internal void ExecuteLocalActivityCalls()
-    {
-        while (this.localActivityCalls.Count > 0)
-        {
-            Action localActivityLambda = this.localActivityCalls.Dequeue();
-
-            // Exceptions are never expected to escape here
-            localActivityLambda.Invoke();
-        }
-    }
-
     /// <summary>
     /// Completes the external event by name, allowing the orchestration to continue if it is waiting on this event.
     /// </summary>

test/Grpc.IntegrationTests/GrpcDurableTaskClientIntegrationTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Diagnostics.CodeAnalysis;
 using FluentAssertions;
 using FluentAssertions.Execution;
 using Microsoft.DurableTask.Client;
@@ -139,7 +140,10 @@ await server.Client.ScheduleNewOrchestrationInstanceAsync(
 
         List<OrchestrationMetadata> left = resumedPages.SelectMany(p => p.Values).ToList();
         List<OrchestrationMetadata> right = pages.Skip(2).SelectMany(p => p.Values).ToList();
-        left.Should().BeEquivalentTo(right, cfg => cfg.Including(x => x.InstanceId).Including(x => x.CreatedAt));
+        left.Should().BeEquivalentTo(
+            right,
+            cfg => cfg.Including(x => x.InstanceId).Including(x => x.CreatedAt)
+                .Using<DateTimeOffset, DateTimeToleranceComparer>());
 
         Page<OrchestrationMetadata> page = await pageable.AsPages(pageSizeHint: 10).FirstAsync();
         page.Values.Should().HaveCount(10);
@@ -165,4 +169,11 @@ static async Task<string> Orchestration(TaskOrchestrationContext context, bool s
             b.AddTasks(tasks => tasks.AddOrchestratorFunc<bool, string>(OrchestrationName, Orchestration));
         });
     }
+
+    class DateTimeToleranceComparer : IEqualityComparer<DateTimeOffset>
+    {
+        public bool Equals(DateTimeOffset x, DateTimeOffset y) => (x - y).Duration() < TimeSpan.FromMilliseconds(100);
+
+        public int GetHashCode([DisallowNull] DateTimeOffset obj) => obj.GetHashCode();
+    }
 }