Updates per more PR feedback.

Author: philliphoff

src/Shared/Grpc/Tracing/DiagnosticActivityExtensions.cs

@@ -40,7 +40,9 @@ static class DiagnosticActivityExtensions
     static DiagnosticActivityExtensions()
     {
         BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Instance;
-        SetSpanIdMethod = (typeof(Activity).GetField("_spanId", flags) ?? throw new InvalidOperationException("The field Activity._spanId was not found.")).CreateSetter<Activity, string>();
+        SetSpanIdMethod = (typeof(Activity).GetField("_spanId", flags)
+                          ?? throw new InvalidOperationException("The field Activity._spanId was not found."))
+                            .CreateSetter<Activity, string>();
         SetStatusMethod = CreateSetStatus();
     }
 

src/Shared/Grpc/Tracing/TraceActivityConstants.cs

@@ -7,7 +7,7 @@ namespace Microsoft.DurableTask.Tracing;
 /// <summary>
 /// Constants for trace activity names used in Durable Task Framework.
 /// </summary>
-class TraceActivityConstants
+static class TraceActivityConstants
 {
     /// <summary>
     /// The name of the activity that represents orchestration operations.

src/Shared/Grpc/Tracing/TraceHelper.cs

@@ -14,7 +14,7 @@ namespace Microsoft.DurableTask.Tracing;
 /// <remarks>
 /// Adapted from "https://github.com/Azure/durabletask/blob/main/src/DurableTask.Core/Tracing/TraceHelper.cs".
 /// </remarks>
-class TraceHelper
+static class TraceHelper
 {
     const string Source = "Microsoft.DurableTask";
 
@@ -30,7 +30,10 @@ class TraceHelper
     public static Activity? StartActivityForNewOrchestration(P.CreateInstanceRequest createInstanceRequest)
     {
         Activity? newActivity = ActivityTraceSource.StartActivity(
-            name: CreateSpanName(TraceActivityConstants.CreateOrchestration, createInstanceRequest.Name, createInstanceRequest.Version),
+            name: CreateSpanName(
+                TraceActivityConstants.CreateOrchestration,
+                createInstanceRequest.Name,
+                createInstanceRequest.Version),
             kind: ActivityKind.Producer);
 
         if (newActivity != null)
@@ -44,13 +47,10 @@ class TraceHelper
             {
                 newActivity.SetTag(Schema.Task.Version, createInstanceRequest.Version);
             }
-        }
 
-        if (Activity.Current is not null)
-        {
             createInstanceRequest.ParentTraceContext ??= new P.TraceContext();
-            createInstanceRequest.ParentTraceContext.TraceParent = Activity.Current.Id!;
-            createInstanceRequest.ParentTraceContext.TraceState = Activity.Current.TraceStateString;
+            createInstanceRequest.ParentTraceContext.TraceParent = newActivity.Id!;
+            createInstanceRequest.ParentTraceContext.TraceState = newActivity.TraceStateString;
         }
 
         return newActivity;
@@ -73,7 +73,11 @@ class TraceHelper
             return null;
         }
 
-        if (startEvent.ParentTraceContext is null || !ActivityContext.TryParse(startEvent.ParentTraceContext.TraceParent, startEvent.ParentTraceContext.TraceState, out ActivityContext activityContext))
+        if (startEvent.ParentTraceContext is null
+            || !ActivityContext.TryParse(
+                startEvent.ParentTraceContext.TraceParent,
+                startEvent.ParentTraceContext.TraceState,
+                out ActivityContext activityContext))
         {
             return null;
         }
@@ -120,7 +124,11 @@ class TraceHelper
     public static Activity? StartTraceActivityForTaskExecution(
         P.ActivityRequest request)
     {
-        if (request.ParentTraceContext is null || !ActivityContext.TryParse(request.ParentTraceContext.TraceParent, request.ParentTraceContext.TraceState, out ActivityContext activityContext))
+        if (request.ParentTraceContext is null
+            || !ActivityContext.TryParse(
+                request.ParentTraceContext.TraceParent,
+                request.ParentTraceContext.TraceState,
+                out ActivityContext activityContext))
         {
             return null;
         }
@@ -234,7 +242,8 @@ public static void EmitTraceActivityForSubOrchestrationFailed(
 
         if (failedEvent != null)
         {
-            string statusDescription = failedEvent.FailureDetails.ErrorMessage ?? "Unspecified sub-orchestration failure";
+            string statusDescription = failedEvent.FailureDetails.ErrorMessage
+                                       ?? "Unspecified sub-orchestration failure";
             activity?.SetStatus(ActivityStatusCode.Error, statusDescription);
         }
 
@@ -378,7 +387,10 @@ static string CreateSpanName(string spanDescription, string? taskName, string? t
 
         if (taskScheduledEvent.ParentTraceContext != null)
         {
-            if (ActivityContext.TryParse(taskScheduledEvent.ParentTraceContext.TraceParent, taskScheduledEvent.ParentTraceContext?.TraceState, out ActivityContext parentContext))
+            if (ActivityContext.TryParse(
+                    taskScheduledEvent.ParentTraceContext.TraceParent,
+                    taskScheduledEvent.ParentTraceContext?.TraceState,
+                    out ActivityContext parentContext))
             {
                 newActivity.SetSpanId(parentContext.SpanId.ToString());
             }
@@ -428,7 +440,11 @@ static string CreateSpanName(string spanDescription, string? taskName, string? t
             return null;
         }
 
-        if (createdEvent.ParentTraceContext != null && ActivityContext.TryParse(createdEvent.ParentTraceContext.TraceParent, createdEvent.ParentTraceContext.TraceState, out ActivityContext parentContext))
+        if (createdEvent.ParentTraceContext != null
+            && ActivityContext.TryParse(
+                createdEvent.ParentTraceContext.TraceParent,
+                createdEvent.ParentTraceContext.TraceState,
+                out ActivityContext parentContext))
         {
             activity.SetSpanId(parentContext.SpanId.ToString());
         }

src/Worker/Grpc/GrpcDurableTaskWorker.Processor.cs

@@ -370,7 +370,9 @@ async Task OnRunOrchestratorAsync(
                     .Select(e => e.ExecutionStarted)
                     .FirstOrDefault();
 
-            Activity? traceActivity = TraceHelper.StartTraceActivityForOrchestrationExecution(executionStartedEvent, request.OrchestrationTraceContext);
+            Activity? traceActivity = TraceHelper.StartTraceActivityForOrchestrationExecution(
+                executionStartedEvent,
+                request.OrchestrationTraceContext);
 
             if (executionStartedEvent is not null)
             {
@@ -402,7 +404,9 @@ async Task OnRunOrchestratorAsync(
                     {
                         case P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCompleted:
                             {
-                                var subOrchestrationInstanceCreatedEvent = GetSuborchestrationInstanceCreatedEvent(newEvent.SubOrchestrationInstanceCompleted.TaskScheduledId);
+                                P.HistoryEvent? subOrchestrationInstanceCreatedEvent =
+                                    GetSuborchestrationInstanceCreatedEvent(
+                                        newEvent.SubOrchestrationInstanceCompleted.TaskScheduledId);
 
                                 TraceHelper.EmitTraceActivityForSubOrchestrationCompleted(
                                     request.InstanceId,
@@ -413,7 +417,9 @@ async Task OnRunOrchestratorAsync(
 
                         case P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceFailed:
                             {
-                                var subOrchestrationInstanceCreatedEvent = GetSuborchestrationInstanceCreatedEvent(newEvent.SubOrchestrationInstanceFailed.TaskScheduledId);
+                                P.HistoryEvent? subOrchestrationInstanceCreatedEvent =
+                                    GetSuborchestrationInstanceCreatedEvent(
+                                        newEvent.SubOrchestrationInstanceFailed.TaskScheduledId);
 
                                 TraceHelper.EmitTraceActivityForSubOrchestrationFailed(
                                     request.InstanceId,
@@ -425,23 +431,35 @@ async Task OnRunOrchestratorAsync(
 
                         case P.HistoryEvent.EventTypeOneofCase.TaskCompleted:
                             {
-                                var taskScheduledEvent = GetTaskScheduledEvent(newEvent.TaskCompleted.TaskScheduledId);
+                                P.HistoryEvent? taskScheduledEvent =
+                                    GetTaskScheduledEvent(newEvent.TaskCompleted.TaskScheduledId);
 
-                                TraceHelper.EmitTraceActivityForTaskCompleted(request.InstanceId, taskScheduledEvent, taskScheduledEvent?.TaskScheduled);
+                                TraceHelper.EmitTraceActivityForTaskCompleted(
+                                    request.InstanceId,
+                                    taskScheduledEvent,
+                                    taskScheduledEvent?.TaskScheduled);
                                 break;
                             }
 
                         case P.HistoryEvent.EventTypeOneofCase.TaskFailed:
                             {
-                                var taskScheduledEvent = GetTaskScheduledEvent(newEvent.TaskFailed.TaskScheduledId);
+                                P.HistoryEvent? taskScheduledEvent =
+                                    GetTaskScheduledEvent(newEvent.TaskFailed.TaskScheduledId);
 
-                                TraceHelper.EmitTraceActivityForTaskFailed(request.InstanceId, taskScheduledEvent, taskScheduledEvent?.TaskScheduled, newEvent.TaskFailed);
+                                TraceHelper.EmitTraceActivityForTaskFailed(
+                                    request.InstanceId,
+                                    taskScheduledEvent,
+                                    taskScheduledEvent?.TaskScheduled,
+                                    newEvent.TaskFailed);
                                 break;
                             }
 
                         case P.HistoryEvent.EventTypeOneofCase.TimerFired:
-                            // We immediately publish the activity span for this timer by creating the activity and immediately calling Dispose() on it.
-                            TraceHelper.EmitTraceActivityForTimer(request.InstanceId, executionStartedEvent.Name, newEvent.Timestamp.ToDateTime(), newEvent.TimerFired);
+                            TraceHelper.EmitTraceActivityForTimer(
+                                request.InstanceId,
+                                executionStartedEvent.Name,
+                                newEvent.Timestamp.ToDateTime(),
+                                newEvent.TimerFired);
                             break;
                     }
                 }
@@ -611,16 +629,21 @@ await this.client.AbandonTaskOrchestratorWorkItemAsync(
                 };
             }
 
-            var completeOrchestrationAction = response.Actions.FirstOrDefault(a => a.CompleteOrchestration is not null);
+            var completeOrchestrationAction = response.Actions.FirstOrDefault(
+                a => a.CompleteOrchestration is not null);
 
             if (completeOrchestrationAction is not null)
             {
                 if (completeOrchestrationAction.CompleteOrchestration.OrchestrationStatus == P.OrchestrationStatus.Failed)
                 {
-                    traceActivity?.SetStatus(ActivityStatusCode.Error, completeOrchestrationAction.CompleteOrchestration.Result);
+                    traceActivity?.SetStatus(
+                        ActivityStatusCode.Error,
+                        completeOrchestrationAction.CompleteOrchestration.Result);
                 }
 
-                traceActivity?.SetTag(Schema.Task.Status, completeOrchestrationAction.CompleteOrchestration.OrchestrationStatus.ToString());
+                traceActivity?.SetTag(
+                    Schema.Task.Status,
+                    completeOrchestrationAction.CompleteOrchestration.OrchestrationStatus.ToString());
 
                 traceActivity?.Dispose();
             }