Updates per PR feedback.

Author: philliphoff

src/Shared/Grpc/Tracing/TraceHelper.cs

@@ -46,19 +46,11 @@ class TraceHelper
             }
         }
 
-        if (Activity.Current?.Id != null || Activity.Current?.TraceStateString != null)
+        if (Activity.Current is not null)
         {
             createInstanceRequest.ParentTraceContext ??= new P.TraceContext();
-
-            if (Activity.Current?.Id != null)
-            {
-                createInstanceRequest.ParentTraceContext.TraceParent = Activity.Current?.Id;
-            }
-
-            if (Activity.Current?.TraceStateString != null)
-            {
-                createInstanceRequest.ParentTraceContext.TraceState = Activity.Current?.TraceStateString;
-            }
+            createInstanceRequest.ParentTraceContext.TraceParent = Activity.Current.Id!;
+            createInstanceRequest.ParentTraceContext.TraceState = Activity.Current.TraceStateString;
         }
 
         return newActivity;
@@ -438,12 +430,9 @@ static string CreateSpanName(string spanDescription, string? taskName, string? t
             return null;
         }
 
-        if (createdEvent.ParentTraceContext != null)
+        if (createdEvent.ParentTraceContext != null && ActivityContext.TryParse(createdEvent.ParentTraceContext.TraceParent, createdEvent.ParentTraceContext.TraceState, out ActivityContext parentContext))
         {
-            if (ActivityContext.TryParse(createdEvent.ParentTraceContext.TraceParent, createdEvent.ParentTraceContext?.TraceState, out ActivityContext parentContext))
-            {
-                activity.SetSpanId(parentContext.SpanId.ToString());
-            }
+            activity.SetSpanId(parentContext.SpanId.ToString());
         }
 
         activity.SetTag(Schema.Task.Type, TraceActivityConstants.Orchestration);

src/Worker/Grpc/GrpcDurableTaskWorker.Processor.cs

@@ -377,9 +377,11 @@ async Task OnRunOrchestratorAsync(
                     {
                         case P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCompleted:
                             {
-                                var subOrchestrationEvent = request.PastEvents
-                                    .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCreated)
-                                    .LastOrDefault(x => x.EventId == newEvent.SubOrchestrationInstanceCompleted.TaskScheduledId);
+                                var subOrchestrationEvent =
+                                    request
+                                        .PastEvents
+                                        .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCreated)
+                                        .FirstOrDefault(x => x.EventId == newEvent.SubOrchestrationInstanceCompleted.TaskScheduledId);
 
                                 TraceHelper.EmitTraceActivityForSubOrchestrationCompleted(
                                     request.InstanceId,
@@ -390,9 +392,11 @@ async Task OnRunOrchestratorAsync(
 
                         case P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceFailed:
                             {
-                                var subOrchestrationEvent = request.PastEvents
-                                    .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCreated)
-                                    .LastOrDefault(x => x.EventId == newEvent.SubOrchestrationInstanceFailed.TaskScheduledId);
+                                var subOrchestrationEvent =
+                                    request
+                                        .PastEvents
+                                        .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.SubOrchestrationInstanceCreated)
+                                        .FirstOrDefault(x => x.EventId == newEvent.SubOrchestrationInstanceFailed.TaskScheduledId);
 
                                 TraceHelper.EmitTraceActivityForSubOrchestrationFailed(
                                     request.InstanceId,
@@ -404,14 +408,24 @@ async Task OnRunOrchestratorAsync(
 
                         case P.HistoryEvent.EventTypeOneofCase.TaskCompleted:
                             {
-                                var taskScheduledEvent = request.PastEvents.Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.TaskScheduled).LastOrDefault(x => x.EventId == newEvent.TaskCompleted.TaskScheduledId);
+                                var taskScheduledEvent =
+                                    request
+                                        .PastEvents
+                                        .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.TaskScheduled)
+                                        .LastOrDefault(x => x.EventId == newEvent.TaskCompleted.TaskScheduledId);
+
                                 TraceHelper.EmitTraceActivityForTaskCompleted(request.InstanceId, taskScheduledEvent, taskScheduledEvent?.TaskScheduled);
                                 break;
                             }
 
                         case P.HistoryEvent.EventTypeOneofCase.TaskFailed:
                             {
-                                var taskScheduledEvent = request.PastEvents.Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.TaskScheduled).LastOrDefault(x => x.EventId == newEvent.TaskFailed.TaskScheduledId);
+                                var taskScheduledEvent =
+                                    request
+                                        .PastEvents
+                                        .Where(x => x.EventTypeCase == P.HistoryEvent.EventTypeOneofCase.TaskScheduled)
+                                        .LastOrDefault(x => x.EventId == newEvent.TaskFailed.TaskScheduledId);
+
                                 TraceHelper.EmitTraceActivityForTaskFailed(request.InstanceId, taskScheduledEvent, taskScheduledEvent?.TaskScheduled, newEvent.TaskFailed);
                                 break;
                             }