From 5c2ed66d3ae30ffecafe0c94f4e41c81417982e5 Mon Sep 17 00:00:00 2001 From: David Justo Date: Thu, 18 May 2023 15:25:25 -0700 Subject: [PATCH 01/10] add instanceId to descriptor --- .../NetheriteProvider.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/NetheriteProvider.cs b/src/DurableTask.Netherite.AzureFunctions/NetheriteProvider.cs index ae04a3d7..3556ea2d 100644 --- a/src/DurableTask.Netherite.AzureFunctions/NetheriteProvider.cs +++ b/src/DurableTask.Netherite.AzureFunctions/NetheriteProvider.cs @@ -119,7 +119,7 @@ public override bool TryGetScaleMonitor( { if (this.Service.TryGetScalingMonitor(out var monitor)) { - scaleMonitor = new ScaleMonitor(monitor); + scaleMonitor = new ScaleMonitor(monitor, functionId); monitor.InformationTracer($"ScaleMonitor Constructed, Descriptor.Id={scaleMonitor.Descriptor.Id}"); return true; } @@ -159,10 +159,16 @@ class ScaleMonitor : IScaleMonitor readonly DataContractSerializer serializer = new DataContractSerializer(typeof(ScalingMonitor.Metrics)); static Tuple cachedMetrics; - public ScaleMonitor(ScalingMonitor scalingMonitor) + public ScaleMonitor(ScalingMonitor scalingMonitor, string functionId) { this.scalingMonitor = scalingMonitor; - this.descriptor = new ScaleMonitorDescriptor($"DurableTaskTrigger-Netherite-{this.scalingMonitor.TaskHubName}".ToLower()); + var descriptorId = $"DurableTaskTrigger-Netherite-{this.scalingMonitor.TaskHubName}".ToLower(); + +#if NETCOREAPP3_1_OR_GREATER + this.descriptor = new ScaleMonitorDescriptor(descriptorId, functionId); +#else + this.descriptor = new ScaleMonitorDescriptor(descriptorId); +#endif } public ScaleMonitorDescriptor Descriptor => this.descriptor; From ed9f0216584f3c95a4f7c85f1e7b1b322c16aafe Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 15:00:01 -0700 Subject: [PATCH 02/10] add version suffixes --- .../DurableTask.Netherite.AzureFunctions.csproj | 8 ++++---- src/DurableTask.Netherite/DurableTask.Netherite.csproj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index f63aa6fa..9e478f82 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -26,9 +26,9 @@ 1 3 - 4 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - + 5 + $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 + -scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) $(VersionPrefix)$(BuildSuffix) @@ -52,7 +52,7 @@ - + diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index 2399485d..3c042c75 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -26,9 +26,9 @@ 1 3 - 4 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - + 5 + $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 + -scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) $(VersionPrefix)$(BuildSuffix) From 300c0e648ec5790e08b2836a1b3bd4a8a542408f Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 15:12:49 -0700 Subject: [PATCH 03/10] adjust project refs --- .../DurableTask.Netherite.AzureFunctions.Tests.csproj | 2 +- test/PerformanceTests/PerformanceTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj b/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj index a1182e74..25025cde 100644 --- a/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj +++ b/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj @@ -25,7 +25,7 @@ - + diff --git a/test/PerformanceTests/PerformanceTests.csproj b/test/PerformanceTests/PerformanceTests.csproj index 1014772b..e88b6c79 100644 --- a/test/PerformanceTests/PerformanceTests.csproj +++ b/test/PerformanceTests/PerformanceTests.csproj @@ -6,7 +6,7 @@ - + From 682692e5f4942b7818cbd42113e2d08a52d1377e Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 15:33:26 -0700 Subject: [PATCH 04/10] add nuget.config so package can build w/ preview DF Extension --- nuget.config | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nuget.config diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..2446116f --- /dev/null +++ b/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 11ce0ccd5942b2b8a938a0578c1067d3928cad37 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 15:38:29 -0700 Subject: [PATCH 05/10] prevent package downgrade --- test/PerformanceTests/PerformanceTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/PerformanceTests/PerformanceTests.csproj b/test/PerformanceTests/PerformanceTests.csproj index e88b6c79..9ad1e97e 100644 --- a/test/PerformanceTests/PerformanceTests.csproj +++ b/test/PerformanceTests/PerformanceTests.csproj @@ -6,7 +6,7 @@ - + From 046d15413a759163ee8e67d13ce342598a1eff48 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 15:44:50 -0700 Subject: [PATCH 06/10] add nuget.config to restore ste --- azure-pipelines-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index 14b86ea4..81571aeb 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -47,6 +47,7 @@ steps: command: restore verbosityRestore: Minimal projects: 'src/dirs.proj' + nugetConfigPath: 'nuget.config' # Build the filtered solution in release mode, specifying the continuous integration flag. - task: DotNetCoreCLI@2 From af6626d0052fc238aa5a2fd0d402ff2f62c2523d Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 16:13:25 -0700 Subject: [PATCH 07/10] add missing param --- azure-pipelines-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index 81571aeb..023e5f1f 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -47,6 +47,7 @@ steps: command: restore verbosityRestore: Minimal projects: 'src/dirs.proj' + feedsToUse: 'config' nugetConfigPath: 'nuget.config' # Build the filtered solution in release mode, specifying the continuous integration flag. From 197201480b7a9a0326a898c255cf6f887888996f Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 16:36:13 -0700 Subject: [PATCH 08/10] remove extra dash --- .../DurableTask.Netherite.AzureFunctions.csproj | 2 +- src/DurableTask.Netherite/DurableTask.Netherite.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index 9e478f82..838beb41 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -28,7 +28,7 @@ 3 5 $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 - -scv3-preview-1 + scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) $(VersionPrefix)$(BuildSuffix) diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index 3c042c75..c9347a12 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -28,7 +28,7 @@ 3 5 $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 - -scv3-preview-1 + scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) $(VersionPrefix)$(BuildSuffix) From 18e4e68c0e192e0ea877ae2029adec8f0a144beb Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 17:19:07 -0700 Subject: [PATCH 09/10] update version suffix --- .../DurableTask.Netherite.AzureFunctions.csproj | 4 ++-- src/DurableTask.Netherite/DurableTask.Netherite.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index 838beb41..a1b7af1c 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -26,8 +26,8 @@ 1 3 - 5 - $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 + 6 + $(MajorVersion).$(MinorVersion).$(PatchVersion) scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index c9347a12..a050562c 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -26,8 +26,8 @@ 1 3 - 5 - $(MajorVersion).$(MinorVersion).$(PatchVersion)-preview1 + 6 + $(MajorVersion).$(MinorVersion).$(PatchVersion) scv3-preview-1 $(MajorVersion).0.0.0 .$(GITHUB_RUN_NUMBER) From 4f1f7f39bb1342623583d3d2938edd75f1765cbd Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 19 May 2023 17:38:37 -0700 Subject: [PATCH 10/10] increase DF extension dep ver --- .../DurableTask.Netherite.AzureFunctions.csproj | 2 +- test/PerformanceTests/PerformanceTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index a1b7af1c..c9c24314 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -52,7 +52,7 @@ - + diff --git a/test/PerformanceTests/PerformanceTests.csproj b/test/PerformanceTests/PerformanceTests.csproj index 9ad1e97e..3c67236f 100644 --- a/test/PerformanceTests/PerformanceTests.csproj +++ b/test/PerformanceTests/PerformanceTests.csproj @@ -6,7 +6,7 @@ - +