merge v3.x with dev

Azure · May 30, 2024 · 9b7f1af · 9b7f1af
2 parents fe9a128 + d2d4638
commit 9b7f1af
Show file tree

Hide file tree

Showing 57 changed files with 1,380 additions and 1,306 deletions.
diff --git a/nuget.exe b/nuget.exe
diff --git a/release_notes.md b/release_notes.md
@@ -18,6 +18,9 @@
 
 ### Bug Fixes
 
+- Fix support for distributed tracing v2 in dotnet-isolated and Java (https://github.com/Azure/azure-functions-durable-extension/pull/2634)
+- Update Microsoft.DurableTask.\* dependencies to v1.0.5
+
 ### Breaking Changes
 
 ### Dependency Updates
diff --git a/src/DurableFunctions.TypedInterfaces/Example/DurableFunctions.TypedInterfaces.Example.csproj b/src/DurableFunctions.TypedInterfaces/Example/DurableFunctions.TypedInterfaces.Example.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.8.5" />
-    <PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="2.5.2" />
+    <PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" Version="2.0.0-preview.4" />
+    <PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="2.13.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.4.3" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.11" />
   </ItemGroup>

diff --git a/src/WebJobs.Extensions.DurableTask/Auth/AzureCredentialFactory.cs b/src/WebJobs.Extensions.DurableTask/Auth/AzureCredentialFactory.cs
diff --git a/src/WebJobs.Extensions.DurableTask/Auth/ITokenCredentialFactory.cs b/src/WebJobs.Extensions.DurableTask/Auth/ITokenCredentialFactory.cs
diff --git a/src/WebJobs.Extensions.DurableTask/AzureStorageAccountProvider.cs b/src/WebJobs.Extensions.DurableTask/AzureStorageAccountProvider.cs
diff --git a/src/WebJobs.Extensions.DurableTask/AzureStorageDurabilityProvider.cs b/src/WebJobs.Extensions.DurableTask/AzureStorageDurabilityProvider.cs
@@ -10,8 +10,8 @@
 using DurableTask.AzureStorage.Tracking;
 using DurableTask.Core;
 using DurableTask.Core.Entities;
+using Microsoft.Azure.WebJobs.Extensions.DurableTask.Storage;
 using Microsoft.Extensions.Logging;
-using Microsoft.WindowsAzure.Storage;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -30,21 +30,21 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask
     internal class AzureStorageDurabilityProvider : DurabilityProvider
     {
         private readonly AzureStorageOrchestrationService serviceClient;
-        private readonly IStorageAccountProvider storageAccountProvider;
+        private readonly IStorageServiceClientProviderFactory clientProviderFactory;
         private readonly string connectionName;
         private readonly JObject storageOptionsJson;
         private readonly ILogger logger;
 
         public AzureStorageDurabilityProvider(
             AzureStorageOrchestrationService service,
-            IStorageAccountProvider storageAccountProvider,
+            IStorageServiceClientProviderFactory clientProviderFactory,
             string connectionName,
             AzureStorageOptions options,
             ILogger logger)
             : base("Azure Storage", service, service, connectionName)
         {
             this.serviceClient = service;
-            this.storageAccountProvider = storageAccountProvider;
+            this.clientProviderFactory = clientProviderFactory;
             this.connectionName = connectionName;
             this.storageOptionsJson = JObject.FromObject(
                 options,
@@ -226,12 +226,12 @@ internal static OrchestrationInstanceStatusQueryCondition ConvertWebjobsDurableC
 #if !FUNCTIONS_V1
 
         internal DurableTaskMetricsProvider GetMetricsProvider(
-            string functionName,
-            string hubName,
-            CloudStorageAccount storageAccount,
-            ILogger logger)
+           string functionName,
+           string hubName,
+           StorageAccountClientProvider storageAccountClientProvider,
+           ILogger logger)
         {
-            return new DurableTaskMetricsProvider(functionName, hubName, logger, performanceMonitor: null, storageAccount);
+            return new DurableTaskMetricsProvider(functionName, hubName, logger, performanceMonitor: null, storageAccountClientProvider);
         }
 
         /// <inheritdoc/>
@@ -242,13 +242,13 @@ public override bool TryGetScaleMonitor(
             string connectionName,
             out IScaleMonitor scaleMonitor)
         {
-            CloudStorageAccount storageAccount = this.storageAccountProvider.GetStorageAccountDetails(connectionName).ToCloudStorageAccount();
-            DurableTaskMetricsProvider metricsProvider = this.GetMetricsProvider(functionName, hubName, storageAccount, this.logger);
+            StorageAccountClientProvider storageAccountClientProvider = this.clientProviderFactory.GetClientProvider(connectionName);
+            DurableTaskMetricsProvider metricsProvider = this.GetMetricsProvider(functionName, hubName, storageAccountClientProvider, this.logger);
             scaleMonitor = new DurableTaskScaleMonitor(
                 functionId,
                 functionName,
                 hubName,
-                storageAccount,
+                storageAccountClientProvider,
                 this.logger,
                 metricsProvider);
             return true;
@@ -264,8 +264,8 @@ public override bool TryGetTargetScaler(
             out ITargetScaler targetScaler)
         {
             // This is only called by the ScaleController, it doesn't run in the Functions Host process.
-            CloudStorageAccount storageAccount = this.storageAccountProvider.GetStorageAccountDetails(connectionName).ToCloudStorageAccount();
-            DurableTaskMetricsProvider metricsProvider = this.GetMetricsProvider(functionName, hubName, storageAccount, this.logger);
+            StorageAccountClientProvider storageAccountClientProvider = this.clientProviderFactory.GetClientProvider(connectionName);
+            DurableTaskMetricsProvider metricsProvider = this.GetMetricsProvider(functionName, hubName, storageAccountClientProvider, this.logger);
             targetScaler = new DurableTaskTargetScaler(functionId, metricsProvider, this, this.logger);
             return true;
         }