Merge branch 'stevosyan/distributed-tracing-for-entities-isolated' into stevosyan/distributed-tracing-for-entities-isolated-with-dtcore-nuget

Author: Sophia Tevosyan

Directory.Packages.props

@@ -10,13 +10,13 @@
   <!-- Microsoft.Extensions.* Packages -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.2" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net48'" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net48'" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'"/>
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.1" />
   </ItemGroup>
 

eng/ci/code-mirror.yml

@@ -5,6 +5,7 @@ trigger:
     # Keep this set limited as appropriate (don't mirror individual user branches).
     - main
     - vabachu/release-testing
+    - stevosyan/distributed-tracing-for-entities-isolated-with-dtcore-nuget
 
 resources:
   repositories:

eng/ci/official-build.yml

@@ -13,6 +13,7 @@ trigger:
         include:
             - main
             - vabachu/release-testing
+            - stevosyan/distributed-tracing-for-entities-isolated-with-dtcore-nuget
 
 # CI only, does not trigger on PRs.
 pr: none

src/Abstractions/TaskOptions.cs

@@ -94,7 +94,7 @@ public SubOrchestrationOptions(TaskOptions options, string? instanceId = null)
     /// <summary>
     /// Gets the version to associate with the sub-orchestration instance.
     /// </summary>
-    public TaskVersion Version { get; init; } = default!;
+    public TaskVersion? Version { get; init; }
 }
 
 /// <summary>

src/Client/Grpc/GrpcDurableTaskClient.cs

@@ -79,7 +79,7 @@ public override async Task<string> ScheduleNewOrchestrationInstanceAsync(
         Check.NotEntity(this.options.EnableEntitySupport, options?.InstanceId);
 
         // We're explicitly OK with an empty version from the options as that had to be explicitly set. It should take precedence over the default.
-        string version = string.Empty;
+        string? version = null;
         if (options?.Version is { } v)
         {
             version = v;

src/Worker/Core/Shims/TaskOrchestrationContextWrapper.cs

@@ -179,9 +179,8 @@ public override async Task<TResult> CallSubOrchestratorAsync<TResult>(
         static string? GetInstanceId(TaskOptions? options)
             => options is SubOrchestrationOptions derived ? derived.InstanceId : null;
         string instanceId = GetInstanceId(options) ?? this.NewGuid().ToString("N");
-        string defaultVersion = this.invocationContext.Options?.Versioning?.DefaultVersion ?? string.Empty;
-        string version = options is SubOrchestrationOptions subOptions ? subOptions.Version : defaultVersion;
-
+        string defaultVersion = this.GetDefaultVersion();
+        string version = options is SubOrchestrationOptions { Version: { } v } ? v.Version : defaultVersion;
         Check.NotEntity(this.invocationContext.Options.EnableEntitySupport, instanceId);
 
         // if this orchestration uses entities, first validate that the suborchestration call is allowed in the current context
@@ -482,4 +481,22 @@ async Task<T> InvokeWithCustomRetryHandler<T>(
             }
         }
     }
+
+    // The default version can come from two different places depending on the context of the invocation.
+    string GetDefaultVersion()
+    {
+        // Preferred choice.
+        if (this.invocationContext.Options.Versioning?.DefaultVersion is { } v)
+        {
+            return v;
+        }
+
+        // Secondary choice.
+        if (this.Properties.TryGetValue("defaultVersion", out var propVersion) && propVersion is string v2)
+        {
+            return v2;
+        }
+
+        return string.Empty;
+    }
 }