Distributed Tracing for Entities (Isolated, with updated references to DT.Core packages)

.github/workflows/codeQL.yml

@@ -8,7 +8,7 @@ on:
   push:
     branches: [ "main", "*" ] # TODO: remove development branch after approval
   pull_request:
-    branches: [ "main", "*"] # TODO: remove development branch after approval
+    branches: [ "main", "stevosyan/distributed-tracing-for-entities-isolated", "*"] # TODO: remove development branch after approval
   schedule:
     - cron: '0 0 * * 1' # Weekly Monday run, needed for weekly reports
   workflow_call: # allows to be invoked as part of a larger workflow
@@ -59,10 +59,12 @@ jobs:
         global-json-file: global.json
 
     - name: Restore dependencies
-      run: dotnet restore $solution
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet restore $_.FullName }
 
     - name: Build
-      run: dotnet build $solution #--configuration $config #--no-restore -p:FileVersionRevision=$GITHUB_RUN_NUMBER -p:ContinuousIntegrationBuild=true
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet build $_.FullName } 
 
     # Run CodeQL analysis
     - name: Perform CodeQL Analysis

.github/workflows/validate-build.yml

@@ -10,6 +10,7 @@ on:
     branches:
       - main
       - 'feature/**'
+      - stevosyan/distributed-tracing-for-entities-isolated
     paths-ignore: [ '**.md' ]
 
 env:
@@ -34,16 +35,20 @@ jobs:
         global-json-file: global.json
 
     - name: Restore dependencies
-      run: dotnet restore $env:solution
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet restore $_.FullName }
 
     - name: Build
-      run: dotnet build $env:solution --configuration $env:config --no-restore -p:FileVersionRevision=$env:GITHUB_RUN_NUMBER
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet build  --configuration $env:config --no-restore -p:FileVersionRevision=$env:GITHUB_RUN_NUMBER $_.FullName } 
 
     - name: Test
-      run: dotnet test $env:solution --configuration $env:config --no-build --verbosity normal
-
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet test  --configuration $env:config --no-build --verbosity normal $_.FullName } 
+
     - name: Pack
-      run: dotnet pack $env:solution --configuration $env:config --no-build
+      run: |
+        Get-ChildItem -Path src, test -Recurse -Filter *.csproj | ForEach-Object { dotnet pack  --configuration $env:config --no-build $_.FullName } 
 
     - name: Upload
       uses: actions/upload-artifact@v4

Directory.Packages.props

@@ -28,7 +28,7 @@
 
   <!-- DurableTask Packages -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="3.2.0-test.1" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.2.2" />
   </ItemGroup>
 

eng/targets/Release.props

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.10.0</VersionPrefix>
+    <VersionPrefix>1.11.0-test.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 

eng/templates/build.yml

@@ -41,11 +41,10 @@ jobs:
         - task: DotNetCoreCLI@2
           displayName: Restore
           inputs:
-            command: restore
-            verbosityRestore: Minimal
+            command: custom
+            custom: restore
             projects: $(project)
-            feedsToUse: config
-            nugetConfigPath: nuget.config
+            arguments: '-v m'
 
         # Build source directory
         - task: DotNetCoreCLI@2

nuget.config

@@ -1,7 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear/>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="durabletask" value="https://azfunc.pkgs.visualstudio.com/public/_packaging/durabletask/nuget/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="durabletask">
+      <package pattern="Microsoft.Azure.DurableTask.Core" />
+    </packageSource>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>

src/Client/Grpc/GrpcDurableEntityClient.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Diagnostics;
 using Microsoft.DurableTask.Client.Entities;
 using Microsoft.DurableTask.Entities;
 using Microsoft.Extensions.Logging;
@@ -54,8 +55,16 @@ public override async Task SignalEntityAsync(
             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
         try

src/Client/Grpc/GrpcDurableTaskClient.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System.Diagnostics;
@@ -95,6 +95,7 @@
             Version = version,
             InstanceId = options?.InstanceId ?? Guid.NewGuid().ToString("N"),
             Input = this.DataConverter.Serialize(input),
+            RequestTime = DateTimeOffset.UtcNow.ToTimestamp(),
         };
 
         // Add tags to the collection
@@ -108,7 +109,7 @@
 
         if (Activity.Current?.Id != null || Activity.Current?.TraceStateString != null)
         {
             if (request.ParentTraceContext == null)
             {
                 request.ParentTraceContext = new P.TraceContext();
             }
@@ -126,7 +127,7 @@
 
         DateTimeOffset? startAt = options?.StartAt;
         this.logger.SchedulingOrchestration(
             request.InstanceId,
             orchestratorName,
             sizeInBytes: request.Input != null ? Encoding.UTF8.GetByteCount(request.Input) : 0,
             startAt.GetValueOrDefault(DateTimeOffset.UtcNow));

src/Client/OrchestrationServiceClientShim/ShimDurableEntityClient.cs

@@ -1,8 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Diagnostics;
 using DurableTask.Core;
-using DurableTask.Core.Entities;
+using DurableTask.Core.Entities;
+using DurableTask.Core.Tracing;
 using Microsoft.DurableTask.Client.Entities;
 using Microsoft.DurableTask.Entities;
 
@@ -90,7 +92,10 @@ public override async Task SignalEntityAsync(
             EntityMessageEvent.GetCappedScheduledTime(
                 DateTime.UtcNow,
                 this.options.Entities.MaxSignalDelayTimeOrDefault,
-                scheduledTime?.UtcDateTime));
+                scheduledTime?.UtcDateTime),
+            Activity.Current is { } activity ? new DistributedTraceContext(activity.Id!, activity.TraceStateString) : null,
+            requestTime: DateTimeOffset.UtcNow,
+            createTrace: true);
 
         await this.options.Client!.SendTaskOrchestrationMessageAsync(eventToSend.AsTaskMessage());
     }

src/Client/OrchestrationServiceClientShim/ShimDurableTaskClient.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using DurableTask.Core;
 using DurableTask.Core.History;
 using DurableTask.Core.Query;
@@ -166,6 +168,16 @@ public override async Task<string> ScheduleNewOrchestrationInstanceAsync(
         };
 
         string? serializedInput = this.DataConverter.Serialize(input);
+
+        var tags = new Dictionary<string, string>();
+        if (options?.Tags != null)
+        {
+            tags = options.Tags.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+        }
+
+        tags[OrchestrationTags.CreateTraceForNewOrchestration] = "true";
+        tags[OrchestrationTags.RequestTime] = DateTimeOffset.UtcNow.ToString(CultureInfo.InvariantCulture);
+
         TaskMessage message = new()
         {
             OrchestrationInstance = instance,
@@ -175,7 +187,8 @@ public override async Task<string> ScheduleNewOrchestrationInstanceAsync(
                 Version = options?.Version ?? string.Empty,
                 OrchestrationInstance = instance,
                 ScheduledStartTime = options?.StartAt?.UtcDateTime,
-                Tags = options?.Tags != null ? options.Tags.ToDictionary(kvp => kvp.Key, kvp => kvp.Value) : null,
+                ParentTraceContext = Activity.Current is { } activity ? new Core.Tracing.DistributedTraceContext(activity.Id!, activity.TraceStateString) : null,
+                Tags = tags,
             },
         };
 

src/Generators/Generators.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

src/Grpc/orchestrator_service.proto

@@ -343,6 +343,7 @@ message CreateInstanceRequest {
     google.protobuf.StringValue executionId = 7;
     map<string, string> tags = 8;
     TraceContext parentTraceContext = 9;
+    google.protobuf.Timestamp requestTime = 10;
 }
 
 message OrchestrationIdReusePolicy {
@@ -490,6 +491,8 @@ message SignalEntityRequest {
     google.protobuf.StringValue input = 3;
     string requestId = 4;
     google.protobuf.Timestamp scheduledTime = 5;
+    TraceContext parentTraceContext = 6;
+    google.protobuf.Timestamp requestTime = 7;
 }
 
 message SignalEntityResponse {
@@ -575,6 +578,7 @@ message OperationRequest {
     string operation = 1;
     string requestId = 2;
     google.protobuf.StringValue input = 3;
+    TraceContext traceContext = 4;
 }
 
 message OperationResult {
@@ -591,10 +595,14 @@ message OperationInfo {
 
 message OperationResultSuccess {
     google.protobuf.StringValue result = 1;
+    google.protobuf.Timestamp startTimeUtc = 2;
+    google.protobuf.Timestamp endTimeUtc = 3;
 }
 
 message OperationResultFailure {
     TaskFailureDetails failureDetails = 1;
+    google.protobuf.Timestamp startTimeUtc = 2;
+    google.protobuf.Timestamp endTimeUtc = 3;
 }
 
 message OperationAction {
@@ -610,6 +618,8 @@ message SendSignalAction {
     string name = 2;
     google.protobuf.StringValue input = 3;
     google.protobuf.Timestamp scheduledTime = 4;
+    google.protobuf.Timestamp requestTime = 5;
+    TraceContext parentTraceContext = 6;
 }
 
 message StartNewOrchestrationAction {
@@ -618,6 +628,8 @@ message StartNewOrchestrationAction {
     google.protobuf.StringValue version = 3;
     google.protobuf.StringValue input = 4;
     google.protobuf.Timestamp scheduledTime = 5;
+    google.protobuf.Timestamp requestTime = 6;
+    TraceContext parentTraceContext = 7;
 }
 
 message AbandonActivityTaskRequest {

src/Grpc/versions.txt

@@ -1,2 +1,2 @@
-# The following files were downloaded from branch main at 2025-04-23 23:27:00 UTC
-https://raw.githubusercontent.com/microsoft/durabletask-protobuf/fbe5bb20835678099fc51a44993ed9b045dee5a6/protos/orchestrator_service.proto
+# The following files were downloaded from branch stevosyan/distributed-tracing-for-entities-isolated at 2025-05-16 04:21:21 UTC
+https://raw.githubusercontent.com/microsoft/durabletask-protobuf/23ed998d1813577d9821e51ea7909063eb677a1b/protos/orchestrator_service.proto