Add missing entity/schedule logging

Directory.Packages.props

@@ -65,7 +65,6 @@
   <!-- Testing Frameworks & Analysis Packages -->
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.2" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1"/>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />

samples/ExportHistoryWebApp/ExportHistoryWebApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>

src/Client/Grpc/GrpcDurableEntityClient.cs

@@ -55,18 +55,18 @@
             RequestId = requestId.ToString(),
             Name = operationName,
             Input = this.dataConverter.Serialize(input),
-            ScheduledTime = scheduledTime?.ToTimestamp(),
+            ScheduledTime = scheduledTime?.ToTimestamp(),
             RequestTime = DateTimeOffset.UtcNow.ToTimestamp(),
-        };
-
+        };
+
         if (Activity.Current is { } activity)
         {
             request.ParentTraceContext ??= new P.TraceContext();
             request.ParentTraceContext.TraceParent = activity.Id;
             request.ParentTraceContext.TraceState = activity.TraceStateString;
         }
 
-        // TODO this.logger.LogSomething
+        this.logger.SignalingEntity(id.ToString(), operationName);
         try
         {
             await this.sidecarClient.SignalEntityAsync(request, cancellationToken: cancellation);
@@ -107,6 +107,7 @@
         int emptyEntitiesRemoved = 0;
         int orphanedLocksReleased = 0;
 
+        this.logger.CleaningEntityStorage();
         try
         {
             do
@@ -156,6 +157,7 @@
             IncludeState = includeState,
         };
 
+        this.logger.GettingEntity(id.ToString());
         try
         {
             P.GetEntityResponse response = await this.sidecarClient
@@ -180,6 +182,7 @@
         DateTimeOffset? lastModifiedFrom = filter?.LastModifiedFrom;
         DateTimeOffset? lastModifiedTo = filter?.LastModifiedTo;
 
+        this.logger.QueryingEntities(startsWith, lastModifiedFrom, lastModifiedTo);
         return Pageable.Create(async (continuation, pageSize, cancellation) =>
         {
             pageSize ??= filter?.PageSize;

src/Client/Grpc/Logs.cs

@@ -49,5 +49,17 @@ public static void PurgingInstances(this ILogger logger, PurgeInstancesFilter fi
             string? statuses = filter?.Statuses is null ? null : string.Join("|", filter.Statuses);
             PurgingInstances(logger, filter?.CreatedFrom, filter?.CreatedTo, statuses);
         }
+
+        [LoggerMessage(EventId = 47, Level = LogLevel.Information, Message = "Signaling entity '{instanceId}' with operation '{operationName}'.")]
+        public static partial void SignalingEntity(this ILogger logger, string instanceId, string operationName);
+
+        [LoggerMessage(EventId = 48, Level = LogLevel.Information, Message = "Getting entity '{instanceId}'.")]
+        public static partial void GettingEntity(this ILogger logger, string instanceId);
+
+        [LoggerMessage(EventId = 50, Level = LogLevel.Information, Message = "Querying entities with filter: {{ StartsWith = {startsWith}, LastModifiedFrom = {lastModifiedFrom}, LastModifiedTo = {lastModifiedTo} }}")]
+        public static partial void QueryingEntities(this ILogger logger, string? startsWith, DateTimeOffset? lastModifiedFrom, DateTimeOffset? lastModifiedTo);
+
+        [LoggerMessage(EventId = 52, Level = LogLevel.Information, Message = "Cleaning entity storage.")]
+        public static partial void CleaningEntityStorage(this ILogger logger);
     }
 }

src/InProcessTestHost/Sidecar/Grpc/TaskHubGrpcServer.cs

@@ -902,7 +902,7 @@ async Task SendWorkItemToClientAsync(P.WorkItem workItem)
         {
             outputStream = this.workerToClientStream ??
                 // CA2201: Use specific exception types
-                throw new InvalidOperationException("TODO: No client is connected! Need to wait until a client connects before executing!");
+                throw new InvalidOperationException("No client is connected. Need to wait until a client connects before executing.");
         }
 
         // The gRPC channel can only handle one message at a time, so we need to serialize access to it.

src/ScheduledTasks/Orchestrations/ExecuteScheduleOperationOrchestrator.cs

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 
 using Microsoft.DurableTask.Entities;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DurableTask.ScheduledTasks;
 
-// TODO: logging
 // TODO: May need separate orchs, result is obj now
 
 /// <summary>
@@ -18,7 +18,22 @@ public class ExecuteScheduleOperationOrchestrator : TaskOrchestrator<ScheduleOpe
     /// <inheritdoc/>
     public override async Task<object> RunAsync(TaskOrchestrationContext context, ScheduleOperationRequest input)
     {
-        return await context.Entities.CallEntityAsync<object>(input.EntityId, input.OperationName, input.Input);
+        ILogger logger = context.CreateReplaySafeLogger<ExecuteScheduleOperationOrchestrator>();
+        string scheduleId = input.EntityId.Key;
+
+        logger.ScheduleOperationInfo(scheduleId, input.OperationName, "Executing schedule operation via orchestrator");
+
+        try
+        {
+            object result = await context.Entities.CallEntityAsync<object>(input.EntityId, input.OperationName, input.Input);
+            logger.ScheduleOperationInfo(scheduleId, input.OperationName, "Schedule operation completed successfully");
+            return result;
+        }
+        catch (Exception ex)
+        {
+            logger.ScheduleOperationError(scheduleId, input.OperationName, ex.Message, ex);
+            throw;
+        }
     }
 }
 

test/ScheduledTasks.Tests/Orchestrations/ExecuteScheduleOperationOrchestratorTests.cs

@@ -4,6 +4,8 @@
 using Microsoft.DurableTask.Client;
 using Microsoft.DurableTask.Client.Entities;
 using Microsoft.DurableTask.Entities;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Xunit;
 
@@ -20,6 +22,9 @@ public ExecuteScheduleOperationOrchestratorTests()
         this.mockContext = new Mock<TaskOrchestrationContext>(MockBehavior.Strict);
         this.mockEntityClient = new Mock<TaskOrchestrationEntityFeature>(MockBehavior.Loose);
         this.mockContext.Setup(c => c.Entities).Returns(this.mockEntityClient.Object);
+        this.mockContext
+            .Setup(c => c.CreateReplaySafeLogger<ExecuteScheduleOperationOrchestrator>())
+            .Returns(NullLogger.Instance);
         this.orchestrator = new ExecuteScheduleOperationOrchestrator();
     }