From 1e828617835be58cb28277257eedce7dcb34e427 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:02:57 +0000 Subject: [PATCH 01/50] update release information (#3534) Co-authored-by: github-actions --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4840607c301..70b481190b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ https://github.com/dotnet/dotnet-monitor 8.0.0 - alpha + preview 1 true - daily + release From 538b4d59a1c6660e76186c1a834bda1f2e743ba0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 21:41:05 -0800 Subject: [PATCH 02/50] Update dependencies from https://github.com/dotnet/diagnostics build 20230201.1 (#3539) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 6.0.0-preview.23080.1 -> To Version 7.0.410101 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1726e85a742..716c8447737 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/diagnostics - 615b21dd10832c0faaaa93d5f177e491ce9b3a09 + f99383213ea19741908f5aa3cf0ed400db2e5f0a - + https://github.com/dotnet/diagnostics - 615b21dd10832c0faaaa93d5f177e491ce9b3a09 + f99383213ea19741908f5aa3cf0ed400db2e5f0a https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 70b481190b5..d86d6bc1703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,8 +67,8 @@ 2.0.0-beta4.23073.1 - 6.0.0-preview.23080.1 - 6.0.0-preview.23080.1 + 7.0.410101 + 7.0.410101 8.0.0-preview1.23081.3 From 8ced6f4219aa3c8a6a8c262ca01c6f4331219a5f Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 2 Feb 2023 09:02:42 -0800 Subject: [PATCH 03/50] Use shipped version of dotnet-diagnostics (#3538) --- eng/Versions.props | 2 +- eng/dependabot/nuget.org/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d86d6bc1703..59e00aecf98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - false + true $(MSBuildThisFileDirectory)xunit.runner.json diff --git a/eng/dependabot/nuget.org/Versions.props b/eng/dependabot/nuget.org/Versions.props index 4fcf19c2d37..6d846628d47 100644 --- a/eng/dependabot/nuget.org/Versions.props +++ b/eng/dependabot/nuget.org/Versions.props @@ -2,6 +2,6 @@ - 6.0.351802 + 7.0.410101 From 1c94c83e20576144d3a1dd2aa211bbd1729e3e5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:33:52 -0800 Subject: [PATCH 04/50] [SDM] Reverted duration seconds from 2 to 10 seconds (#3543) (#3545) Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- .../CommonTestTimeouts.cs | 5 +++++ .../LiveMetricsTests.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/CommonTestTimeouts.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/CommonTestTimeouts.cs index 7c1e02e069d..0299cd68b63 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/CommonTestTimeouts.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/CommonTestTimeouts.cs @@ -72,6 +72,11 @@ public static class CommonTestTimeouts /// public static readonly TimeSpan LogsDuration = TimeSpan.FromSeconds(10); + /// + /// Default live metrics collection duration. + /// + public static readonly int LiveMetricsDurationSeconds = 10; + /// /// Default timeout for environment variable manipulation. /// diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs index 9c0e884de6e..a6a54293e0e 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs @@ -45,7 +45,7 @@ public Task TestDefaultMetrics() async (appRunner, apiClient) => { using ResponseStreamHolder holder = await apiClient.CaptureMetricsAsync(await appRunner.ProcessIdTask, - durationSeconds: 2); + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds); var metrics = LiveMetricsTestUtilities.GetAllMetrics(holder.Stream); await LiveMetricsTestUtilities.ValidateMetrics(new[] { EventPipe.MonitoringSourceConfiguration.SystemRuntimeEventSourceName }, @@ -85,7 +85,7 @@ public Task TestCustomMetrics() var counterNames = new[] { "cpu-usage", "working-set" }; using ResponseStreamHolder holder = await apiClient.CaptureMetricsAsync(await appRunner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, @@ -134,7 +134,7 @@ public Task TestCustomMetrics_MetricProviderType(MetricProviderType metricType, var counterNames = new[] { "cpu-usage", "working-set" }; using ResponseStreamHolder holder = await apiClient.CaptureMetricsAsync(await appRunner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, @@ -214,7 +214,7 @@ await ScenarioRunner.SingleTarget( appValidate: async (runner, client) => { using ResponseStreamHolder holder = await client.CaptureMetricsAsync(await runner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, @@ -312,7 +312,7 @@ await ScenarioRunner.SingleTarget( appValidate: async (runner, client) => { using ResponseStreamHolder holder = await client.CaptureMetricsAsync(await runner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, @@ -392,7 +392,7 @@ await ScenarioRunner.SingleTarget( appValidate: async (runner, client) => { using ResponseStreamHolder holder = await client.CaptureMetricsAsync(await runner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, @@ -463,7 +463,7 @@ await ScenarioRunner.SingleTarget( appValidate: async (runner, client) => { using ResponseStreamHolder holder = await client.CaptureMetricsAsync(await runner.ProcessIdTask, - durationSeconds: 2, + durationSeconds: CommonTestTimeouts.LiveMetricsDurationSeconds, metricsConfiguration: new EventMetricsConfiguration { IncludeDefaultProviders = false, From 25ab5239cfe5d5967966f7a76013b6e3476317fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:03:34 -0800 Subject: [PATCH 05/50] Fix quantile issue for summaries (#3546) (#3551) * Fix quantile issue for summaries * Fix unit test * Fixup labels Co-authored-by: Wiktor Kopec --- .../Metrics/MetricsStore.cs | 21 ++++++++++++++----- .../MetricsFormattingTests.cs | 15 +++++++------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs index 00953d8fa05..1ebfdbef892 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Threading; @@ -103,6 +104,12 @@ public void AddMetric(ICounterPayload metric) { metrics.Dequeue(); } + + // CONSIDER We only keep 1 histogram representation per snapshot. Is it meaningful for Prometheus to see previous histograms? These are not timestamped. + if ((metrics.Count > 1) && (metric is PercentilePayload)) + { + metrics.Dequeue(); + } } } @@ -133,7 +140,8 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token) { if (metric is PercentilePayload percentilePayload) { - foreach (Quantile quantile in percentilePayload.Quantiles) + // Summary quantiles must appear from smallest to largest + foreach (Quantile quantile in percentilePayload.Quantiles.OrderBy(q => q.Percentage)) { string metricValue = PrometheusDataModel.GetPrometheusNormalizedValue(metric.Unit, quantile.Value); string metricLabels = GetMetricLabels(metric, quantile.Percentage); @@ -153,14 +161,17 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token) private static string GetMetricLabels(ICounterPayload metric, double? quantile) { string metadata = metric.Metadata; + + char separator = IsMeter(metric) ? '=' : ':'; + var metadataValues = CounterUtilities.GetMetadata(metadata, separator); if (quantile.HasValue) { - metadata = CounterUtilities.AppendPercentile(metadata, quantile.Value); + metadataValues.Add("quantile", quantile.Value.ToString(CultureInfo.InvariantCulture)); } - char separator = IsMeter(metric) ? '=' : ':'; - var keyValuePairs = from pair in CounterUtilities.GetMetadata(metadata, separator) - select pair.Key + "=" + "\"" + pair.Value + "\""; + var keyValuePairs = from pair in metadataValues + select PrometheusDataModel.GetPrometheusNormalizedLabel(pair.Key, pair.Value); + string metricLabels = string.Join(", ", keyValuePairs); return metricLabels; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs index 2a7ddac41fc..22fa08055e2 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs @@ -42,8 +42,7 @@ public async Task HistogramFormat_Test() { List payload = new(); - string tags1 = "Percentile=50"; - payload.Add(new PercentilePayload(MeterName, InstrumentName, "DisplayName", string.Empty, tags1, + payload.Add(new PercentilePayload(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, new Quantile[] { new(0.5, Value1), new(0.95, Value2), new(0.99, Value3) }, Timestamp)); @@ -54,16 +53,16 @@ public async Task HistogramFormat_Test() // should we call this method, or should this also be implicitly testing its behavior by having this hard-coded? string metricName = $"{MeterName.ToLowerInvariant()}_{payload[0].Name}"; - const string percentile_50 = "{Percentile=\"50\"}"; - const string percentile_95 = "{Percentile=\"95\"}"; - const string percentile_99 = "{Percentile=\"99\"}"; + const string quantile_50 = "{quantile=\"0.5\"}"; + const string quantile_95 = "{quantile=\"0.95\"}"; + const string quantile_99 = "{quantile=\"0.99\"}"; Assert.Equal(5, lines.Count); Assert.Equal(FormattableString.Invariant($"# HELP {metricName}{payload[0].Unit} {payload[0].DisplayName}"), lines[0]); Assert.Equal(FormattableString.Invariant($"# TYPE {metricName} summary"), lines[1]); - Assert.Equal(FormattableString.Invariant($"{metricName}{percentile_50} {Value1}"), lines[2]); - Assert.Equal(FormattableString.Invariant($"{metricName}{percentile_95} {Value2}"), lines[3]); - Assert.Equal(FormattableString.Invariant($"{metricName}{percentile_99} {Value3}"), lines[4]); + Assert.Equal(FormattableString.Invariant($"{metricName}{quantile_50} {Value1}"), lines[2]); + Assert.Equal(FormattableString.Invariant($"{metricName}{quantile_95} {Value2}"), lines[3]); + Assert.Equal(FormattableString.Invariant($"{metricName}{quantile_99} {Value3}"), lines[4]); } [Fact] From 906da1bcea970fb9aeb6bea3c59cbf428ab09815 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Fri, 3 Feb 2023 00:04:49 -0800 Subject: [PATCH 06/50] Update dependencies and SDK to 8.0 Preview 1 (#3548) --- eng/Version.Details.xml | 24 ++++++++++++++---------- eng/Versions.props | 8 ++++---- global.json | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 716c8447737..41dc5f6a492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,9 @@ + + https://github.com/dotnet/aspnetcore + 6a9cef3fa2f5c7c2695a2141a8aa098294736d4e + https://github.com/dotnet/diagnostics f99383213ea19741908f5aa3cf0ed400db2e5f0a @@ -14,10 +18,6 @@ - - https://github.com/dotnet/aspnetcore - 6f1752a798a9460b8a039750e30b827578528c90 - https://github.com/dotnet/roslyn-analyzers a25bf5393c439af5da9ef30800b7d554a401d673 @@ -38,21 +38,25 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 + + https://github.com/dotnet/installer + 15858648852962f807df424967152741bbbfcc57 + https://github.com/dotnet/symstore 117c711598f1cc144e0c9d82c4e9f78638e0315d - + https://github.com/dotnet/runtime - 78f5a9839ac7d49a3cfaa6f4015a90b1cc846fa1 + 1b2c4a998d0a03fa99b0bf341cb40fc188e0b3f0 - + https://github.com/dotnet/aspnetcore - 6f1752a798a9460b8a039750e30b827578528c90 + 6a9cef3fa2f5c7c2695a2141a8aa098294736d4e - + https://github.com/dotnet/runtime - 78f5a9839ac7d49a3cfaa6f4015a90b1cc846fa1 + 1b2c4a998d0a03fa99b0bf341cb40fc188e0b3f0 diff --git a/eng/Versions.props b/eng/Versions.props index 59e00aecf98..9efe5ff1604 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23080.3 8.0.0-beta.23080.3 - 8.0.0-alpha.1.23066.6 - 8.0.0-alpha.1.23066.6 + 8.0.0-preview.1.23080.16 + 8.0.0-preview.1.23080.16 2.0.0-beta4.23073.1 @@ -72,8 +72,8 @@ 8.0.0-preview1.23081.3 - 8.0.0-alpha.1.23059.14 - 8.0.0-alpha.1.23059.14 + 8.0.0-preview.1.23081.6 + 8.0.0-preview.1.23081.6 1.0.408101 diff --git a/global.json b/global.json index 4c7c062e944..d78a5defc79 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23061.8", + "dotnet": "8.0.100-preview.1.23102.6", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", From 2fdbd89e9927da866e1e49d076c77aec94381f4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 09:00:44 -0800 Subject: [PATCH 07/50] Bump Microsoft.OpenApi.Readers from 1.5.0 to 1.6.0 in /eng/dependabot (#3532) Bumps [Microsoft.OpenApi.Readers](https://github.com/Microsoft/OpenAPI.NET) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases) - [Commits](https://github.com/Microsoft/OpenAPI.NET/compare/1.5.0...1.6.0) --- updated-dependencies: - dependency-name: Microsoft.OpenApi.Readers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From b1302e700e667ce6a3df6a43a272a1cb84d56f23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 09:36:25 -0800 Subject: [PATCH 08/50] Update dependencies from https://github.com/dotnet/installer build 20230203.1 (#3560) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23102.6 -> To Version 8.0.100-preview.1.23103.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41dc5f6a492..2ab279fe74d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 15858648852962f807df424967152741bbbfcc57 + f1f6336d592aa1a3e72d32a5e51aaf99a0cbfefa https://github.com/dotnet/symstore From 16066cde4d5583fab25243e93c241126fb1284c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Feb 2023 00:37:17 +0000 Subject: [PATCH 09/50] Update dependencies from https://github.com/dotnet/installer build 20230205.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23103.1 -> To Version 8.0.100-preview.1.23105.2 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23081.6 -> To Version 8.0.0-preview.1.23104.3 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab279fe74d..e4a364709b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,25 +38,25 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - f1f6336d592aa1a3e72d32a5e51aaf99a0cbfefa + 5697d1fb136d3bb18d3f25528df64ad79b2bb0c3 https://github.com/dotnet/symstore 117c711598f1cc144e0c9d82c4e9f78638e0315d - + https://github.com/dotnet/runtime - 1b2c4a998d0a03fa99b0bf341cb40fc188e0b3f0 + 6507a44770f6648ca8da6ebbd7fe804ee5f91db4 https://github.com/dotnet/aspnetcore 6a9cef3fa2f5c7c2695a2141a8aa098294736d4e - + https://github.com/dotnet/runtime - 1b2c4a998d0a03fa99b0bf341cb40fc188e0b3f0 + 6507a44770f6648ca8da6ebbd7fe804ee5f91db4 diff --git a/eng/Versions.props b/eng/Versions.props index 9efe5ff1604..fe99ba88203 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,8 +72,8 @@ 8.0.0-preview1.23081.3 - 8.0.0-preview.1.23081.6 - 8.0.0-preview.1.23081.6 + 8.0.0-preview.1.23104.3 + 8.0.0-preview.1.23104.3 1.0.408101 From 60efd0ecd81b86eafce67b0ae76a245aa2123398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Feb 2023 03:45:07 +0000 Subject: [PATCH 10/50] Update dependencies from https://github.com/dotnet/installer build 20230205.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23103.1 -> To Version 8.0.100-preview.1.23105.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23080.16 -> To Version 8.0.0-preview.1.23105.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4a364709b3..479103f067c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 6a9cef3fa2f5c7c2695a2141a8aa098294736d4e + 3b0c734a11d5c9973010281c28ce959e8161baa2 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 5697d1fb136d3bb18d3f25528df64ad79b2bb0c3 + ba47db7f77ae15ccbd237b3c949e2f690a9c5ba0 https://github.com/dotnet/symstore @@ -50,9 +50,9 @@ https://github.com/dotnet/runtime 6507a44770f6648ca8da6ebbd7fe804ee5f91db4 - + https://github.com/dotnet/aspnetcore - 6a9cef3fa2f5c7c2695a2141a8aa098294736d4e + 3b0c734a11d5c9973010281c28ce959e8161baa2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fe99ba88203..46760196f76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23080.3 8.0.0-beta.23080.3 - 8.0.0-preview.1.23080.16 - 8.0.0-preview.1.23080.16 + 8.0.0-preview.1.23105.1 + 8.0.0-preview.1.23105.1 2.0.0-beta4.23073.1 From 28c2a63bfe59ade992c9c09fab92d2292aefbf09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Feb 2023 10:05:45 +0000 Subject: [PATCH 11/50] Update dependencies from https://github.com/dotnet/installer build 20230206.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23103.1 -> To Version 8.0.100-preview.1.23106.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23080.16 -> To Version 8.0.0-preview.1.23105.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 479103f067c..29335eef897 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - ba47db7f77ae15ccbd237b3c949e2f690a9c5ba0 + 0e4c551aeb93858c105e03795d1e632cfa99e72a https://github.com/dotnet/symstore From ab286caa449db07f2ecd189d756892139210e11f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Feb 2023 12:20:34 +0000 Subject: [PATCH 12/50] Update dependencies from https://github.com/dotnet/installer build 20230207.4 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23106.1 -> To Version 8.0.100-preview.1.23107.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29335eef897..14e9d4a03d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 0e4c551aeb93858c105e03795d1e632cfa99e72a + 5a2156073c60d97b3d36d040dd3596a502850265 https://github.com/dotnet/symstore From ba2fbd60efbdd7a1ec2edf7aa4684aa5a2c163c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Feb 2023 20:11:18 +0000 Subject: [PATCH 13/50] Update dependencies from https://github.com/dotnet/installer build 20230207.12 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23106.1 -> To Version 8.0.100-preview.1.23107.12 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23104.3 -> To Version 8.0.0-preview.1.23106.5 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14e9d4a03d3..cecd7f3bfab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,25 +38,25 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 5a2156073c60d97b3d36d040dd3596a502850265 + 8691697fa747d0f952d242854753ecec2ef8e848 https://github.com/dotnet/symstore 117c711598f1cc144e0c9d82c4e9f78638e0315d - + https://github.com/dotnet/runtime - 6507a44770f6648ca8da6ebbd7fe804ee5f91db4 + 9f654effb17265a137695bf38f0a782d274791cd https://github.com/dotnet/aspnetcore 3b0c734a11d5c9973010281c28ce959e8161baa2 - + https://github.com/dotnet/runtime - 6507a44770f6648ca8da6ebbd7fe804ee5f91db4 + 9f654effb17265a137695bf38f0a782d274791cd diff --git a/eng/Versions.props b/eng/Versions.props index 46760196f76..70c2708daa9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,8 +72,8 @@ 8.0.0-preview1.23081.3 - 8.0.0-preview.1.23104.3 - 8.0.0-preview.1.23104.3 + 8.0.0-preview.1.23106.5 + 8.0.0-preview.1.23106.5 1.0.408101 From 53185f3ead59b8f2d03878948f3a84727c10bad9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Feb 2023 23:13:56 +0000 Subject: [PATCH 14/50] Update dependencies from https://github.com/dotnet/installer build 20230207.22 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.12 -> To Version 8.0.100-preview.1.23107.22 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cecd7f3bfab..529fa600d0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 8691697fa747d0f952d242854753ecec2ef8e848 + e3bf513160e0a1c3647f050c29cb82291be80075 https://github.com/dotnet/symstore From 474f87538c2eb67926bea6a84e82326d06f541e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 02:05:36 +0000 Subject: [PATCH 15/50] Update dependencies from https://github.com/dotnet/installer build 20230207.34 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.12 -> To Version 8.0.100-preview.1.23107.34 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23105.1 -> To Version 8.0.0-preview.1.23107.3 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 529fa600d0b..4cf0065c1a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 3b0c734a11d5c9973010281c28ce959e8161baa2 + da9cc7f21fd15df83c6f3c061dd020ddafdd5a41 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - e3bf513160e0a1c3647f050c29cb82291be80075 + 7dd47f6d5a20fe30b965c502306a0f24b4586e56 https://github.com/dotnet/symstore @@ -50,9 +50,9 @@ https://github.com/dotnet/runtime 9f654effb17265a137695bf38f0a782d274791cd - + https://github.com/dotnet/aspnetcore - 3b0c734a11d5c9973010281c28ce959e8161baa2 + da9cc7f21fd15df83c6f3c061dd020ddafdd5a41 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 70c2708daa9..aab4a376f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23080.3 8.0.0-beta.23080.3 - 8.0.0-preview.1.23105.1 - 8.0.0-preview.1.23105.1 + 8.0.0-preview.1.23107.3 + 8.0.0-preview.1.23107.3 2.0.0-beta4.23073.1 From 0ee6be4afde56fe407935b03e7107298f64d526a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 07:41:45 +0000 Subject: [PATCH 16/50] Update dependencies from https://github.com/dotnet/installer build 20230207.49 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.34 -> To Version 8.0.100-preview.1.23107.49 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cf0065c1a2..dfd8e66b39a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 7dd47f6d5a20fe30b965c502306a0f24b4586e56 + 2028c18d561a49155c49c09ea14c50c7e0214888 https://github.com/dotnet/symstore From 2794138a686aaffef3de1c8854b02a7b206f4639 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 15:58:47 +0000 Subject: [PATCH 17/50] Update dependencies from https://github.com/dotnet/installer build 20230208.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.34 -> To Version 8.0.100-preview.1.23108.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfd8e66b39a..9ab0fefaafb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 2028c18d561a49155c49c09ea14c50c7e0214888 + d641c327abf3d572d17284dd5f3e0adbcb158847 https://github.com/dotnet/symstore From 4cd71ebc170522f7a31e011b00cb01f8864b8bb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 19:11:58 +0000 Subject: [PATCH 18/50] Update dependencies from https://github.com/dotnet/installer build 20230208.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.34 -> To Version 8.0.100-preview.1.23108.8 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ab0fefaafb..5e661277552 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - d641c327abf3d572d17284dd5f3e0adbcb158847 + 34f0bde87dec7179e85ddff93f23679c8fee2119 https://github.com/dotnet/symstore From 2b851df22f888a9a87a96881740b06e8dbbbcb8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 21:39:49 +0000 Subject: [PATCH 19/50] Update dependencies from https://github.com/dotnet/installer build 20230208.10 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23107.34 -> To Version 8.0.100-preview.1.23108.10 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e661277552..2e779c3a410 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 34f0bde87dec7179e85ddff93f23679c8fee2119 + 5725657a6bd1c32203c1b978d3bd2ea289eaa981 https://github.com/dotnet/symstore From 1ef11ac6a61bcfa8f8554fd7f5a4a581dc517a93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 03:39:55 +0000 Subject: [PATCH 20/50] Update dependencies from https://github.com/dotnet/installer build 20230208.16 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23108.10 -> To Version 8.0.100-preview.1.23108.16 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e779c3a410..eac1d1c1c37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 5725657a6bd1c32203c1b978d3bd2ea289eaa981 + d837e5d69e9d2999dcaf278fe8e4b1164098cc65 https://github.com/dotnet/symstore From 4db6ced4dee09d55b73aa248eccb38557793ef3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 15:55:01 +0000 Subject: [PATCH 21/50] Update dependencies from https://github.com/dotnet/installer build 20230209.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23108.10 -> To Version 8.0.100-preview.1.23109.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eac1d1c1c37..fcc78c15000 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - d837e5d69e9d2999dcaf278fe8e4b1164098cc65 + d943f0943adb9470575205604ffa434ada5c9ea4 https://github.com/dotnet/symstore From 3839d2c63bda972e4d0057ee99dbbef8c7f5c0cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 18:37:51 +0000 Subject: [PATCH 22/50] Update dependencies from https://github.com/dotnet/installer build 20230209.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23109.3 -> To Version 8.0.100-preview.1.23109.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcc78c15000..ba07152dce8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - d943f0943adb9470575205604ffa434ada5c9ea4 + 75dc4ff7b6319767c9f88d5097d996bccda87364 https://github.com/dotnet/symstore From 21ee34659ca9bf0a2f274472636e6618ebd8e059 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 20:05:16 +0000 Subject: [PATCH 23/50] Update dependencies from https://github.com/dotnet/installer build 20230209.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23109.3 -> To Version 8.0.100-preview.1.23109.8 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba07152dce8..c30fdaefdd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 75dc4ff7b6319767c9f88d5097d996bccda87364 + 078530e54637bf73dcb2bf095b06d65ad3f24821 https://github.com/dotnet/symstore From 3ab34c97395e47b2c205cdd44e7348517a5ba815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 21:36:26 +0000 Subject: [PATCH 24/50] Update dependencies from https://github.com/dotnet/installer build 20230209.10 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23109.3 -> To Version 8.0.100-preview.1.23109.10 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c30fdaefdd2..7f930f023f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 078530e54637bf73dcb2bf095b06d65ad3f24821 + 9987bfc17394db33db313261cd6a8260b54bc703 https://github.com/dotnet/symstore From 810d7aab15366ca73bcc8498cc902edd9c898b50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 16:49:38 +0000 Subject: [PATCH 25/50] Update dependencies from https://github.com/dotnet/installer build 20230210.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23109.3 -> To Version 8.0.100-preview.1.23110.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f930f023f7..a48119072d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 9987bfc17394db33db313261cd6a8260b54bc703 + e463d909a284c0035bb5d63c6682ad020a9fc639 https://github.com/dotnet/symstore From 15d72208e708006de74aadedddd3fe310bd25101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:23:00 -0800 Subject: [PATCH 26/50] [release/8.x] Update dependencies from dotnet/installer (#3646) * Update dependencies from https://github.com/dotnet/installer build 20230210.9 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23110.9 * Update dependencies from https://github.com/dotnet/installer build 20230211.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23111.1 * Update dependencies from https://github.com/dotnet/installer build 20230211.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23111.2 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23106.5 -> To Version 8.0.0-preview.1.23110.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20230212.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23112.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23107.3 -> To Version 8.0.0-preview.1.23111.4 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20230212.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23112.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23107.3 -> To Version 8.0.0-preview.1.23112.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20230212.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23110.2 -> To Version 8.0.100-preview.1.23112.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23107.3 -> To Version 8.0.0-preview.1.23112.2 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a48119072d0..edb86a2f753 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - da9cc7f21fd15df83c6f3c061dd020ddafdd5a41 + 63d1187a01b82719c2891cecc74ee3d51ce892a8 https://github.com/dotnet/diagnostics @@ -38,25 +38,25 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - e463d909a284c0035bb5d63c6682ad020a9fc639 + 938fd76cc676a7add481611e9ef07476d132f0f9 https://github.com/dotnet/symstore 117c711598f1cc144e0c9d82c4e9f78638e0315d - + https://github.com/dotnet/runtime - 9f654effb17265a137695bf38f0a782d274791cd + 7deac7d6da3ce4e96d51d5f61a27ee85b7c42f60 - + https://github.com/dotnet/aspnetcore - da9cc7f21fd15df83c6f3c061dd020ddafdd5a41 + 63d1187a01b82719c2891cecc74ee3d51ce892a8 - + https://github.com/dotnet/runtime - 9f654effb17265a137695bf38f0a782d274791cd + 7deac7d6da3ce4e96d51d5f61a27ee85b7c42f60 diff --git a/eng/Versions.props b/eng/Versions.props index aab4a376f5a..5103fee76c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23080.3 8.0.0-beta.23080.3 - 8.0.0-preview.1.23107.3 - 8.0.0-preview.1.23107.3 + 8.0.0-preview.1.23112.2 + 8.0.0-preview.1.23112.2 2.0.0-beta4.23073.1 @@ -72,8 +72,8 @@ 8.0.0-preview1.23081.3 - 8.0.0-preview.1.23106.5 - 8.0.0-preview.1.23106.5 + 8.0.0-preview.1.23110.8 + 8.0.0-preview.1.23110.8 1.0.408101 From 9d387335319d803508563862a2fcc3b9e77032cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 10:06:19 -0800 Subject: [PATCH 27/50] [release/8.x] Bump Microsoft.NETCore.App.Runtime.win-x64 (#3684) Bumps [Microsoft.NETCore.App.Runtime.win-x64](https://github.com/dotnet/runtime) from 6.0.13 to 6.0.14. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) --- updated-dependencies: - dependency-name: Microsoft.NETCore.App.Runtime.win-x64 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/net6.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net6.0/Versions.props b/eng/dependabot/net6.0/Versions.props index fe38004e387..729b5599891 100644 --- a/eng/dependabot/net6.0/Versions.props +++ b/eng/dependabot/net6.0/Versions.props @@ -1,6 +1,6 @@ - 6.0.13 + 6.0.14 From d1277d6dba0b25f82cf49a04b7307df323f8ee9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 10:07:03 -0800 Subject: [PATCH 28/50] [release/8.x] Bump Microsoft.NETCore.App.Runtime.win-x64 (#3685) Bumps [Microsoft.NETCore.App.Runtime.win-x64](https://github.com/dotnet/runtime) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) --- updated-dependencies: - dependency-name: Microsoft.NETCore.App.Runtime.win-x64 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/net7.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net7.0/Versions.props b/eng/dependabot/net7.0/Versions.props index 39d59f6e02a..cd3e4aa7956 100644 --- a/eng/dependabot/net7.0/Versions.props +++ b/eng/dependabot/net7.0/Versions.props @@ -1,6 +1,6 @@ - 7.0.2 + 7.0.3 From e045891cf1fa84ceb116cc7d469c2cc284a497fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:29:38 -0800 Subject: [PATCH 29/50] Update dependencies from https://github.com/dotnet/installer build 20230215.2 (#3695) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23112.5 -> To Version 8.0.100-preview.1.23115.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edb86a2f753..7588b53c55f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 938fd76cc676a7add481611e9ef07476d132f0f9 + 913e4679b3ea675f3ca06fd3504d05d034c82aa6 https://github.com/dotnet/symstore From 2e90304e694859806f35d6058af655d31496bd35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:35:08 -0800 Subject: [PATCH 30/50] Update dependencies from https://github.com/dotnet/installer build 20230301.10 (#3842) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.1.23115.2 -> To Version 8.0.100-preview.2.23151.10 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.1.23112.2 -> To Version 8.0.0-preview.2.23128.10 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7588b53c55f..c312bbf9b82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 63d1187a01b82719c2891cecc74ee3d51ce892a8 + ca8dbd40ab8e11dd4aff25ceaf39850236d0f21c https://github.com/dotnet/diagnostics @@ -38,25 +38,25 @@ https://github.com/dotnet/arcade 608f3c7aed68dec1314d75601c6f143747e78cc6 - + https://github.com/dotnet/installer - 913e4679b3ea675f3ca06fd3504d05d034c82aa6 + 5ac75f62392159f7fe3cc230d13efc485afc68e4 https://github.com/dotnet/symstore 117c711598f1cc144e0c9d82c4e9f78638e0315d - + https://github.com/dotnet/runtime - 7deac7d6da3ce4e96d51d5f61a27ee85b7c42f60 + 30b879924a47d8660d5f4b14ff581ce40ae076f2 - + https://github.com/dotnet/aspnetcore - 63d1187a01b82719c2891cecc74ee3d51ce892a8 + ca8dbd40ab8e11dd4aff25ceaf39850236d0f21c - + https://github.com/dotnet/runtime - 7deac7d6da3ce4e96d51d5f61a27ee85b7c42f60 + 30b879924a47d8660d5f4b14ff581ce40ae076f2 diff --git a/eng/Versions.props b/eng/Versions.props index 5103fee76c4..8e54f0654a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23080.3 8.0.0-beta.23080.3 - 8.0.0-preview.1.23112.2 - 8.0.0-preview.1.23112.2 + 8.0.0-preview.2.23128.10 + 8.0.0-preview.2.23128.10 2.0.0-beta4.23073.1 @@ -72,8 +72,8 @@ 8.0.0-preview1.23081.3 - 8.0.0-preview.1.23110.8 - 8.0.0-preview.1.23110.8 + 8.0.0-preview.2.23128.3 + 8.0.0-preview.2.23128.3 1.0.408101 From 26c8a135e6132b85975a393d0deb5dc710d57f6c Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Fri, 3 Mar 2023 16:48:26 -0800 Subject: [PATCH 31/50] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b34a01be5b..e9440c59c93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,7 +42,7 @@ https://github.com/dotnet/installer 5ac75f62392159f7fe3cc230d13efc485afc68e4 - + https://github.com/dotnet/symstore 387e5a4d679b30fab748ddca70d088002f0034a8 From fe7de57379f6ccedd42e1ec576d7542e80759f8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 13:44:55 -0800 Subject: [PATCH 32/50] Fixup merge issue with schema splitting (#3848) (#3849) Co-authored-by: Wiktor Kopec --- documentation/openapi.json | 11 ------ documentation/schema.json | 37 ------------------- .../MetricsOptions.cs | 14 ------- .../MetricsOptionsDefaults.cs | 2 - .../OptionsDisplayStrings.Designer.cs | 9 ----- .../Metrics/MetricsSettingsFactory.cs | 5 --- .../Models/EventMetricsConfiguration.cs | 3 -- 7 files changed, 81 deletions(-) diff --git a/documentation/openapi.json b/documentation/openapi.json index 152c63cef33..73bacbf644e 100644 --- a/documentation/openapi.json +++ b/documentation/openapi.json @@ -1522,9 +1522,6 @@ "type": "string" }, "nullable": true - }, - "metricType": { - "$ref": "#/components/schemas/MetricProviderType" } }, "additionalProperties": false @@ -1617,14 +1614,6 @@ }, "additionalProperties": false }, - "MetricProviderType": { - "enum": [ - "EventCounter", - "Meter", - "All" - ], - "type": "string" - }, "OperationError": { "type": "object", "properties": { diff --git a/documentation/schema.json b/documentation/schema.json index ea9268eebee..2ed576a67ad 100644 --- a/documentation/schema.json +++ b/documentation/schema.json @@ -1424,36 +1424,9 @@ "items": { "type": "string" } - }, - "MetricType": { - "description": "The type of metrics this provider consumes", - "default": "All", - "oneOf": [ - { - "type": "null" - }, - { - "$ref": "#/definitions/MetricProviderType" - } - ] } } }, - "MetricProviderType": { - "type": "string", - "description": "", - "x-enumFlags": true, - "x-enumNames": [ - "EventCounter", - "Meter", - "All" - ], - "enum": [ - "EventCounter", - "Meter", - "All" - ] - }, "MeterConfiguration": { "type": "object", "additionalProperties": false, @@ -1816,16 +1789,6 @@ "items": { "type": "string" } - }, - "MetricType": { - "oneOf": [ - { - "type": "null" - }, - { - "$ref": "#/definitions/MetricProviderType" - } - ] } } }, diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs index 42196d82fd1..a3bb75c6246 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs @@ -63,20 +63,6 @@ public class MetricProvider ResourceType = typeof(OptionsDisplayStrings), Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_MetricProvider_CounterNames))] public List CounterNames { get; set; } = new List(0); - - [Display( - ResourceType = typeof(OptionsDisplayStrings), - Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_MetricProvider_MetricType))] - [DefaultValue(MetricsOptionsDefaults.MetricType)] - public MetricProviderType? MetricType { get; set; } - } - - [Flags] - public enum MetricProviderType - { - EventCounter = 0x1, - Meter = 0x2, - All = 0xFF } public class MeterConfiguration diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs index 30edfea8001..a3543e33075 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs @@ -10,7 +10,5 @@ internal static class MetricsOptionsDefaults public const int MetricCount = 3; public const bool IncludeDefaultProviders = true; - - public const MetricProviderType MetricType = MetricProviderType.All; } } diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs index 4abfb165705..d219ccc56d7 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs @@ -1247,15 +1247,6 @@ public static string DisplayAttributeDescription_MetricProvider_CounterNames { } } - /// - /// Looks up a localized string similar to The type of metrics this provider consumes. - /// - public static string DisplayAttributeDescription_MetricProvider_MetricType { - get { - return ResourceManager.GetString("DisplayAttributeDescription_MetricProvider_MetricType", resourceCulture); - } - } - /// /// Looks up a localized string similar to The name of the custom metrics provider.. /// diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs index 0d1833340f3..26fd59f56a5 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs @@ -98,9 +98,6 @@ private static List ConvertCounterGroups(IList ConvertCounterGroups(IList Date: Mon, 6 Mar 2023 00:50:52 +0000 Subject: [PATCH 33/50] Update dependencies from https://github.com/dotnet/installer build 20230303.6 (#3854) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.2.23151.10 -> To Version 8.0.100-preview.2.23153.6 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.2.23128.10 -> To Version 8.0.0-preview.2.23153.2 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9440c59c93..c31dc140fb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - ca8dbd40ab8e11dd4aff25ceaf39850236d0f21c + 5ae8106f83d4d23cd0a2d2474c1b15e4d5dfc9eb https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/installer - 5ac75f62392159f7fe3cc230d13efc485afc68e4 + 39ee054d74d00c456565b82ec8db2b99a799e6f4 https://github.com/dotnet/symstore @@ -50,9 +50,9 @@ https://github.com/dotnet/runtime 30b879924a47d8660d5f4b14ff581ce40ae076f2 - + https://github.com/dotnet/aspnetcore - ca8dbd40ab8e11dd4aff25ceaf39850236d0f21c + 5ae8106f83d4d23cd0a2d2474c1b15e4d5dfc9eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 294f3061c32..fd6309fece2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23152.1 8.0.0-beta.23152.1 - 8.0.0-preview.2.23128.10 - 8.0.0-preview.2.23128.10 + 8.0.0-preview.2.23153.2 + 8.0.0-preview.2.23153.2 2.0.0-beta4.23152.1 From 5763ba13c0f4fbcb1b35a0ba32dff4282d3bcb03 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:46:14 -0800 Subject: [PATCH 34/50] Change call to UseApiKey to match pattern used elsewhere in Tests code (#3865) --- .../AuthenticationTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/AuthenticationTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/AuthenticationTests.cs index 8225163465f..d1304ba082c 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/AuthenticationTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/AuthenticationTests.cs @@ -615,10 +615,13 @@ public async Task RejectsUnauthorizedRequestWithAzureAd() [Fact] public async Task DoesNotStart_With_InvalidAuthenticationOptions() { + const string signingAlgo = "ES256"; await using MonitorCollectRunner toolRunner = new(_outputHelper); + // Configure AzureAD authentication from environment variables toolRunner.ConfigurationFromEnvironment.UseAzureAd(); - toolRunner.ConfigurationFromEnvironment.UseApiKey("ES256", Guid.NewGuid(), out _); + // Configure API Key authentication from environment variables + toolRunner.ConfigurationFromEnvironment.UseApiKey(signingAlgo, Guid.NewGuid(), out _); // Start dotnet-monitor await Assert.ThrowsAsync(toolRunner.StartAsync); From d5e05a8de7588bb7d68d805fd6321bc4f9ec3b89 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:52:33 -0800 Subject: [PATCH 35/50] Publish guardian directory after validation (#3863) --- dotnet-monitor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet-monitor.yml b/dotnet-monitor.yml index b0d9331ac72..e874d647c6d 100644 --- a/dotnet-monitor.yml +++ b/dotnet-monitor.yml @@ -122,6 +122,7 @@ stages: SDLValidationParameters: enable: true continueOnError: true + publishGdn: true params: >- -SourceToolsList @("policheck","credscan") -TsaInstanceURL $(_TsaInstanceURL) From 133957c873202785a8cd6d285c08058fb62656ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:40:53 -0700 Subject: [PATCH 36/50] Update dependencies from https://github.com/dotnet/installer build 20230328.7 (#4108) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.4.23176.5 -> To Version 8.0.100-preview.3.23178.7 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.4.23174.2 -> To Version 8.0.0-preview.3.23177.8 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b978ad5a97f..127bd837bda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + d62be99ba6e73feb46d7b64a6b4ce8610dc9040a https://github.com/dotnet/diagnostics @@ -34,9 +34,9 @@ https://github.com/dotnet/arcade 1177b37e60c7271ab461098aefbdd03edc15b90d - + https://github.com/dotnet/installer - d109cba3ff8ff46fe70be93a40c45002e5770267 + e300b0e1e69aa8823e755845759f05ce9edcf2bd https://github.com/dotnet/arcade @@ -46,17 +46,17 @@ https://github.com/dotnet/symstore e09f81a0b38786cb20f66b589a8b88b6997a62da - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 47bad717bd69883ec8f590ffbbfad63c868cbe55 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + d62be99ba6e73feb46d7b64a6b4ce8610dc9040a - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 47bad717bd69883ec8f590ffbbfad63c868cbe55 diff --git a/eng/Versions.props b/eng/Versions.props index 000719b39e6..07f31bbc33d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23174.1 8.0.0-beta.23174.1 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 + 8.0.0-preview.3.23177.8 + 8.0.0-preview.3.23177.8 2.0.0-beta4.23174.1 @@ -72,8 +72,8 @@ 8.0.0-preview.23174.1 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 + 8.0.0-preview.3.23174.8 + 8.0.0-preview.3.23174.8 1.0.417001 From 516005581bf658e109efaeafa26d13bb626426b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 13:40:33 -0700 Subject: [PATCH 37/50] Use zip for version (#4149) (#4160) Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- .github/workflows/generate-release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml index 71b0053136b..ec139710a3d 100644 --- a/.github/workflows/generate-release-notes.yml +++ b/.github/workflows/generate-release-notes.yml @@ -44,7 +44,7 @@ jobs: if [[ "$TEST_RUN" == "true" ]]; then qualified_release_version="test-$release_version" else - version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor.nupkg.version" + version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor-win-x64.zip.version" qualified_release_version=$(curl -sL $version_url) # Check if the aka.ms url existed if [[ "$qualified_release_version" =~ " Date: Wed, 3 May 2023 15:16:18 -0700 Subject: [PATCH 38/50] Enable workflow identity (#4313) (#4348) * Enable workflow identity * PR Feedback and fix typos Co-authored-by: Wiktor Kopec --- documentation/schema.json | 7 +++ eng/dependabot/Versions.props | 2 +- .../AzureBlobEgressProvider.cs | 56 ++++++++++++------- ...AzureBlobEgressProviderOptions.Validate.cs | 5 +- .../AzureBlobEgressProviderOptions.cs | 5 ++ .../OptionsDisplayStrings.Designer.cs | 10 ++++ .../OptionsDisplayStrings.resx | 5 +- .../AzureBlobStorage/Strings.Designer.cs | 4 +- src/Extensions/AzureBlobStorage/Strings.resx | 11 ++-- .../AzureBlobEgressProviderTests.cs | 31 ++++++++++ 10 files changed, 106 insertions(+), 30 deletions(-) diff --git a/documentation/schema.json b/documentation/schema.json index 63cf7cdbf15..4885e07a327 100644 --- a/documentation/schema.json +++ b/documentation/schema.json @@ -2561,6 +2561,13 @@ ], "description": "Client id of the Managed Identity used for authentication. The identity must have permissions to create containers and write to blob storage." }, + "UseWorkloadIdentityFromEnvironment": { + "type": [ + "boolean", + "null" + ], + "description": "Uses WorkloadIdentity for authentication. The environment variables AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_FEDERATED_TOKEN_FILE, and AZURE_AUTHORITY_HOST are used to authenticate." + }, "ContainerName": { "type": "string", "description": "The name of the container to which the blob will be egressed. If egressing to the root container, use the \"$root\" sentinel value.", diff --git a/eng/dependabot/Versions.props b/eng/dependabot/Versions.props index 529841d3691..91f361af25f 100644 --- a/eng/dependabot/Versions.props +++ b/eng/dependabot/Versions.props @@ -2,7 +2,7 @@ - 1.8.2 + 1.9.0-beta.3 12.16.0 12.14.0 7.0.0 diff --git a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs index baba931d19b..6ab5a6cfaee 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs +++ b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Azure; +using Azure.Core; using Azure.Identity; using Azure.Storage; using Azure.Storage.Blobs; @@ -241,12 +242,12 @@ private static async Task GetQueueClientAsync(AzureBlobEgressProvid serviceClient = new QueueServiceClient(accountUri, credential, clientOptions); } - else if (!string.IsNullOrEmpty(options.ManagedIdentityClientId)) + else if (UseDefaultCredentials(options)) { // Remove Query in case SAS token was specified Uri accountUri = GetQueueAccountUri(options, out _); - DefaultAzureCredential credential = CreateManagedIdentityCredentials(options.ManagedIdentityClientId); + TokenCredential credential = CreateDefaultCredential(options); serviceClient = new QueueServiceClient(accountUri, credential, clientOptions); } @@ -295,12 +296,12 @@ private static async Task GetBlobContainerClientAsync(Azure serviceClient = new BlobServiceClient(accountUri, credential); } - else if (!string.IsNullOrEmpty(options.ManagedIdentityClientId)) + else if (UseDefaultCredentials(options)) { // Remove Query in case SAS token was specified Uri accountUri = GetBlobAccountUri(options, out _); - DefaultAzureCredential credential = CreateManagedIdentityCredentials(options.ManagedIdentityClientId); + TokenCredential credential = CreateDefaultCredential(options); serviceClient = new BlobServiceClient(accountUri, credential); } @@ -375,22 +376,39 @@ private static string WrapMessage(string innerMessage) } } - private static DefaultAzureCredential CreateManagedIdentityCredentials(string clientId) + private static bool UseDefaultCredentials(AzureBlobEgressProviderOptions options) => + !string.IsNullOrEmpty(options.ManagedIdentityClientId) || options.UseWorkloadIdentityFromEnvironment == true; + + private static TokenCredential CreateDefaultCredential(AzureBlobEgressProviderOptions options) { - var credential = new DefaultAzureCredential( - new DefaultAzureCredentialOptions - { - ManagedIdentityClientId = clientId, - ExcludeAzureCliCredential = true, - ExcludeAzurePowerShellCredential = true, - ExcludeEnvironmentCredential = true, - ExcludeInteractiveBrowserCredential = true, - ExcludeSharedTokenCacheCredential = true, - ExcludeVisualStudioCodeCredential = true, - ExcludeVisualStudioCredential = true - }); - - return credential; + DefaultAzureCredentialOptions credOptions = GetDefaultCredentialOptions(); + + if (options.UseWorkloadIdentityFromEnvironment == true) + { + credOptions.ExcludeWorkloadIdentityCredential = false; + } + + if (!string.IsNullOrEmpty(options.ManagedIdentityClientId)) + { + credOptions.ExcludeManagedIdentityCredential = false; + credOptions.ManagedIdentityClientId = options.ManagedIdentityClientId; + } + + return new DefaultAzureCredential(credOptions); } + + private static DefaultAzureCredentialOptions GetDefaultCredentialOptions() => + new DefaultAzureCredentialOptions + { + ExcludeAzureCliCredential = true, + ExcludeManagedIdentityCredential = true, + ExcludeWorkloadIdentityCredential= true, + ExcludeAzurePowerShellCredential = true, + ExcludeEnvironmentCredential = true, + ExcludeInteractiveBrowserCredential = true, + ExcludeSharedTokenCacheCredential = true, + ExcludeVisualStudioCodeCredential = true, + ExcludeVisualStudioCredential = true, + }; } } diff --git a/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.Validate.cs b/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.Validate.cs index 4f7b6260b12..7e76a4fcd02 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.Validate.cs +++ b/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.Validate.cs @@ -17,7 +17,7 @@ IEnumerable IValidatableObject.Validate(ValidationContext vali IList results = new List(); // One of the authentication keys/tokens is required - if (string.IsNullOrEmpty(AccountKey) && string.IsNullOrEmpty(SharedAccessSignature) && string.IsNullOrEmpty(ManagedIdentityClientId)) + if (string.IsNullOrEmpty(AccountKey) && string.IsNullOrEmpty(SharedAccessSignature) && string.IsNullOrEmpty(ManagedIdentityClientId) && !(UseWorkloadIdentityFromEnvironment == true)) { results.Add( new ValidationResult( @@ -25,7 +25,8 @@ IEnumerable IValidatableObject.Validate(ValidationContext vali Strings.ErrorMessage_CredentialsMissing, nameof(AccountKey), nameof(SharedAccessSignature), - nameof(ManagedIdentityClientId)))); + nameof(ManagedIdentityClientId), + nameof(UseWorkloadIdentityFromEnvironment)))); } return results; diff --git a/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs b/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs index d64aeb1dbe4..dcfd74a2fe2 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs +++ b/src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs @@ -41,6 +41,11 @@ internal sealed partial class AzureBlobEgressProviderOptions Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ManagedIdentityClientId))] public string ManagedIdentityClientId { get; set; } + [Display( + ResourceType = typeof(OptionsDisplayStrings), + Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFromEnvironment))] + public bool? UseWorkloadIdentityFromEnvironment { get; set; } + [Display( ResourceType = typeof(OptionsDisplayStrings), Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ContainerName))] diff --git a/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.Designer.cs b/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.Designer.cs index efe3dc0d58b..575abe663c7 100644 --- a/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.Designer.cs +++ b/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.Designer.cs @@ -181,6 +181,16 @@ public static string DisplayAttributeDescription_AzureBlobEgressProviderOptions_ } } + /// + /// Looks up a localized string similar to Uses WorkloadIdentity for authentication. The environment variables AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_FEDERATED_TOKEN_FILE, and AZURE_AUTHORITY_HOST are used to authenticate.. + /// + public static string DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFromEnvironment { + get { + return ResourceManager.GetString("DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFro" + + "mEnvironment", resourceCulture); + } + } + /// /// Looks up a localized string similar to Buffer size used when copying data from an egress callback returning a stream to the egress callback that is provided a stream to which data is written.. /// diff --git a/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.resx b/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.resx index 2cc07089cfd..03ba0fb50e5 100644 --- a/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.resx +++ b/src/Extensions/AzureBlobStorage/OptionsDisplayStrings.resx @@ -172,4 +172,7 @@ Buffer size used when copying data from an egress callback returning a stream to the egress callback that is provided a stream to which data is written. The description provided for the CopyBufferSize parameter on all egress provider options. - \ No newline at end of file + + Uses WorkloadIdentity for authentication. The environment variables AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_FEDERATED_TOKEN_FILE, and AZURE_AUTHORITY_HOST are used to authenticate. + + diff --git a/src/Extensions/AzureBlobStorage/Strings.Designer.cs b/src/Extensions/AzureBlobStorage/Strings.Designer.cs index 2f1486fa054..dfda65d110d 100644 --- a/src/Extensions/AzureBlobStorage/Strings.Designer.cs +++ b/src/Extensions/AzureBlobStorage/Strings.Designer.cs @@ -61,7 +61,7 @@ internal Strings() { } /// - /// Looks up a localized string similar to The {0} field, {1} field, or {2} field is required.. + /// Looks up a localized string similar to The {0} field, {1} field, {2} field, or {3} field is required.. /// internal static string ErrorMessage_CredentialsMissing { get { @@ -88,7 +88,7 @@ internal static string ErrorMessage_EgressAzureFailedGeneric { } /// - /// Looks up a localized string similar to SharedAccessSignature, AccountKey, or ManagedIdentityClientId must be specified.. + /// Looks up a localized string similar to SharedAccessSignature, AccountKey, ManagedIdentityClientId, or UseWorkloadIdentityFromEnvironment must be specified.. /// internal static string ErrorMessage_EgressMissingCredentials { get { diff --git a/src/Extensions/AzureBlobStorage/Strings.resx b/src/Extensions/AzureBlobStorage/Strings.resx index cb3dddb81ff..b5eb639c1f3 100644 --- a/src/Extensions/AzureBlobStorage/Strings.resx +++ b/src/Extensions/AzureBlobStorage/Strings.resx @@ -118,12 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - The {0} field, {1} field, or {2} field is required. + The {0} field, {1} field, {2} field, or {3} field is required. Gets the format string for rejecting validation due to 3 missing fields where at least one is required. 3 Format Parameters: 0. fieldNameOne: The name of the first field that is missing 1. fieldNameTwo: The name of the second field that is missing -2. fieldNameThree: The name of the third field that is missing +2. fieldNameThree: The name of the third field that is missing +3. fieldNameFour: The name of the fourth field that is missing Azure blob egress failed: {0} @@ -136,8 +137,8 @@ Gets a string similar to "Azure blob egress failed.". - SharedAccessSignature, AccountKey, or ManagedIdentityClientId must be specified. - Gets a string similar to "SharedAccessSignature, AccountKey, or ManagedIdentityClientId must be specified.". + SharedAccessSignature, AccountKey, ManagedIdentityClientId, or UseWorkloadIdentityFromEnvironment must be specified. + Gets a string similar to "SharedAccessSignature, AccountKey, ManagedIdentityClientId, or UseWorkflowIdentity must be specified.". Metadata cannot include duplicate keys; please change or remove the key '{key}' @@ -201,4 +202,4 @@ 1 Format Parameter: 1. queueName: The name of the Azure Queue where messages are egressed - \ No newline at end of file + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs index 3f5c4de4c68..ecc99cce7e9 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Azure; +using Azure.Identity; using Azure.Storage.Blobs; using Azure.Storage.Blobs.Models; using Azure.Storage.Queues; @@ -233,6 +234,36 @@ public async Task AzureBlobEgress_DoesNotThrowWhen_QueueDoesNotExistAndUsingRest Assert.Empty(messages); } + [ConditionalFact(Timeout = EgressUnitTestTimeoutMs)] + public void AzureBlobEgress_DefaultCredentials() + { + // These are auth methods we know about. If this test fails, it means a new auth method was added and we need to update the test. + + var expectedAuthExclusions = new HashSet + { + nameof(DefaultAzureCredentialOptions.ExcludeEnvironmentCredential), + nameof(DefaultAzureCredentialOptions.ExcludeWorkloadIdentityCredential), + nameof(DefaultAzureCredentialOptions.ExcludeManagedIdentityCredential), + nameof(DefaultAzureCredentialOptions.ExcludeAzureDeveloperCliCredential), + nameof(DefaultAzureCredentialOptions.ExcludeSharedTokenCacheCredential), + nameof(DefaultAzureCredentialOptions.ExcludeInteractiveBrowserCredential), + nameof(DefaultAzureCredentialOptions.ExcludeAzureCliCredential), + nameof(DefaultAzureCredentialOptions.ExcludeVisualStudioCredential), + nameof(DefaultAzureCredentialOptions.ExcludeVisualStudioCodeCredential), + nameof(DefaultAzureCredentialOptions.ExcludeAzurePowerShellCredential), + }; + + var actualAuthExclusions = typeof(DefaultAzureCredentialOptions).GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance) + .Select(p => p.Name) + .Where(p => p.StartsWith("Exclude")).ToHashSet(); + + IEnumerable unexpectedExclusions = actualAuthExclusions.Except(expectedAuthExclusions); + Assert.True(!unexpectedExclusions.Any(), $"New authentication mechanism was added to {nameof(DefaultAzureCredentialOptions)}. " + + $"Ensure that {nameof(AzureBlobEgressProvider)} initializes its {nameof(DefaultAzureCredentialOptions)} to exclude unexpected authentication types. " + + $"Possible new exclusions: {string.Join(',', unexpectedExclusions)}"); + + } + private async Task WriteToEgressStreamAsync(Stream stream, CancellationToken token) { await using FileStream fs = new(_testUploadFile, FileMode.Open, FileAccess.Read); From 3f0c4a47fd5c5537933a422bfd832f6ebdda321b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 15:50:06 -0700 Subject: [PATCH 39/50] Disable azure developer cli creds (#4347) (#4350) Co-authored-by: Wiktor Kopec --- src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs index 6ab5a6cfaee..64ddb45082d 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs +++ b/src/Extensions/AzureBlobStorage/AzureBlobEgressProvider.cs @@ -401,6 +401,7 @@ private static DefaultAzureCredentialOptions GetDefaultCredentialOptions() => new DefaultAzureCredentialOptions { ExcludeAzureCliCredential = true, + ExcludeAzureDeveloperCliCredential = true, ExcludeManagedIdentityCredential = true, ExcludeWorkloadIdentityCredential= true, ExcludeAzurePowerShellCredential = true, From 80df1dde0cad2b6851b610aa32d93aa362988355 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 12:50:57 -0700 Subject: [PATCH 40/50] Update dependencies from https://github.com/dotnet/installer build 20230505.1 (#4366) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.5.23228.7 -> To Version 8.0.100-preview.4.23255.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.5.23226.1 -> To Version 8.0.0-preview.4.23251.12 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb3641b8e2b..ee7616fa84f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + a704a402e913a9d426b724ecb4679cbed33a2b20 https://github.com/dotnet/diagnostics @@ -34,9 +34,9 @@ https://github.com/dotnet/arcade 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/installer - 0ce891843a4ee251d356cd429c596ba25ee15dc3 + 90d9d6a528c2814d0a7f6413d55ff983214091a4 https://github.com/dotnet/arcade @@ -46,17 +46,17 @@ https://github.com/dotnet/symstore 73d7789803ae347c67783ba151d40caf03823b45 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 8e472c8886c9a02326a5035fc4549717f70ab818 - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + a704a402e913a9d426b724ecb4679cbed33a2b20 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 8e472c8886c9a02326a5035fc4549717f70ab818 diff --git a/eng/Versions.props b/eng/Versions.props index b57211bae6c..772d215a3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23226.4 8.0.0-beta.23226.4 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 + 8.0.0-preview.4.23251.12 + 8.0.0-preview.4.23251.12 2.0.0-beta4.23219.2 @@ -72,8 +72,8 @@ 8.0.0-preview.23251.1 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 + 8.0.0-preview.4.23228.5 + 8.0.0-preview.4.23228.5 1.0.425101 From 8ea1df2b471a6faba30ca16d29740995b89b23ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 16:59:16 -0700 Subject: [PATCH 41/50] [release/8.x] Update dependencies from dotnet/installer (#4390) * Update dependencies from https://github.com/dotnet/installer build 20230509.14 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.4.23255.1 -> To Version 8.0.100-preview.4.23259.14 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.4.23251.12 -> To Version 8.0.0-preview.4.23259.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20230510.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.4.23255.1 -> To Version 8.0.100-preview.4.23260.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.4.23251.12 -> To Version 8.0.0-preview.4.23260.4 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee7616fa84f..261de9c6567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - a704a402e913a9d426b724ecb4679cbed33a2b20 + 898c164a1f537a8210a26eaf388bdc92531f6b09 https://github.com/dotnet/diagnostics @@ -34,9 +34,9 @@ https://github.com/dotnet/arcade 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/installer - 90d9d6a528c2814d0a7f6413d55ff983214091a4 + 2268e7b15cefbc0fe34d3def28448e301cca306b https://github.com/dotnet/arcade @@ -46,17 +46,17 @@ https://github.com/dotnet/symstore 73d7789803ae347c67783ba151d40caf03823b45 - + https://github.com/dotnet/runtime - 8e472c8886c9a02326a5035fc4549717f70ab818 + 84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f - + https://github.com/dotnet/aspnetcore - a704a402e913a9d426b724ecb4679cbed33a2b20 + 898c164a1f537a8210a26eaf388bdc92531f6b09 - + https://github.com/dotnet/runtime - 8e472c8886c9a02326a5035fc4549717f70ab818 + 84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f diff --git a/eng/Versions.props b/eng/Versions.props index 772d215a3d9..8191b0b7176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23226.4 8.0.0-beta.23226.4 - 8.0.0-preview.4.23251.12 - 8.0.0-preview.4.23251.12 + 8.0.0-preview.4.23260.4 + 8.0.0-preview.4.23260.4 2.0.0-beta4.23219.2 @@ -72,8 +72,8 @@ 8.0.0-preview.23251.1 - 8.0.0-preview.4.23228.5 - 8.0.0-preview.4.23228.5 + 8.0.0-preview.4.23259.5 + 8.0.0-preview.4.23259.5 1.0.425101 From 37617638f61674f7ced9b9187a852d488a5c3a83 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Mon, 15 May 2023 09:49:58 -0700 Subject: [PATCH 42/50] Update generate-release-notes.yml (#4418) --- .github/workflows/generate-release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml index cb02b921aba..94a4c5a6fe7 100644 --- a/.github/workflows/generate-release-notes.yml +++ b/.github/workflows/generate-release-notes.yml @@ -44,7 +44,7 @@ jobs: if [[ "$TEST_RUN" == "true" ]]; then qualified_release_version="test-$release_version" else - version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor-win-x64.zip.version" + version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor-base-win-x64.zip.version" qualified_release_version=$(curl -sL $version_url) # Check if the aka.ms url existed if [[ "$qualified_release_version" =~ " Date: Wed, 31 May 2023 13:26:23 -0700 Subject: [PATCH 43/50] Update dependencies from https://github.com/dotnet/installer build 20230531.8 (#4499) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.5.23271.2 -> To Version 8.0.100-preview.5.23281.8 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.5.23268.15 -> To Version 8.0.0-preview.5.23281.1 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18dcd46b623..880642c1500 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 631f523a3828530880270ff9accc925f36d67705 + c9e66ca5d8a6c77ae88f1d4acc387ea2baa57ab2 https://github.com/dotnet/diagnostics @@ -34,9 +34,9 @@ https://github.com/dotnet/arcade 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/installer - a78abfe66f0385c5fccb357513afb258bb7e955b + 2c25873eb1a355a757423e4b009310c24467e4de https://github.com/dotnet/arcade @@ -46,17 +46,17 @@ https://github.com/dotnet/symstore 9b742f12faf1f14b2554be9fd86739efa4ec3874 - + https://github.com/dotnet/runtime - 51d467ad5b52c8bc532e048840e51aa0247d5f88 + bc78804f5d1486bb7313d1661992626640091bf1 - + https://github.com/dotnet/aspnetcore - 631f523a3828530880270ff9accc925f36d67705 + c9e66ca5d8a6c77ae88f1d4acc387ea2baa57ab2 - + https://github.com/dotnet/runtime - 51d467ad5b52c8bc532e048840e51aa0247d5f88 + bc78804f5d1486bb7313d1661992626640091bf1 diff --git a/eng/Versions.props b/eng/Versions.props index 9f08946b115..2a3e2b03e51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23279.4 8.0.0-beta.23279.4 - 8.0.0-preview.5.23268.15 - 8.0.0-preview.5.23268.15 + 8.0.0-preview.5.23281.1 + 8.0.0-preview.5.23281.1 2.0.0-beta4.23269.1 @@ -72,8 +72,8 @@ 8.0.0-preview.23275.7 - 8.0.0-preview.5.23268.13 - 8.0.0-preview.5.23268.13 + 8.0.0-preview.5.23280.8 + 8.0.0-preview.5.23280.8 1.0.427501 From 7fdd40191b4e13a4b4d56c2dfe888de1d96fd170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 12:04:37 -0700 Subject: [PATCH 44/50] Update dependencies from https://github.com/dotnet/installer build 20230603.2 (#4533) Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.5.23281.8 -> To Version 8.0.100-preview.5.23303.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-preview.5.23281.1 -> To Version 8.0.0-preview.5.23302.2 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 880642c1500..3e7956fcb33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - c9e66ca5d8a6c77ae88f1d4acc387ea2baa57ab2 + fe4f0d09305ca73aa19976b4521e5c4e223b080e https://github.com/dotnet/diagnostics @@ -34,9 +34,9 @@ https://github.com/dotnet/arcade 998d84a61e745ac6e0268d37baef10fa0043d06f - + https://github.com/dotnet/installer - 2c25873eb1a355a757423e4b009310c24467e4de + 3fe444af72d2826af5d943db4169590006d4a46f https://github.com/dotnet/arcade @@ -50,9 +50,9 @@ https://github.com/dotnet/runtime bc78804f5d1486bb7313d1661992626640091bf1 - + https://github.com/dotnet/aspnetcore - c9e66ca5d8a6c77ae88f1d4acc387ea2baa57ab2 + fe4f0d09305ca73aa19976b4521e5c4e223b080e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a3e2b03e51..e7ea241f2ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 8.0.0-beta.23279.4 8.0.0-beta.23279.4 - 8.0.0-preview.5.23281.1 - 8.0.0-preview.5.23281.1 + 8.0.0-preview.5.23302.2 + 8.0.0-preview.5.23302.2 2.0.0-beta4.23269.1 From 9e0e3365fcaaeaa2392c90570d24e871332a738e Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Wed, 7 Jun 2023 13:03:03 -0700 Subject: [PATCH 45/50] Stable version file and link (#4553) --- .github/workflows/generate-release-notes.yml | 2 +- eng/Publishing.props | 28 +++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml index 94a4c5a6fe7..1eb39cd484e 100644 --- a/.github/workflows/generate-release-notes.yml +++ b/.github/workflows/generate-release-notes.yml @@ -44,7 +44,7 @@ jobs: if [[ "$TEST_RUN" == "true" ]]; then qualified_release_version="test-$release_version" else - version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor-base-win-x64.zip.version" + version_url="https://aka.ms/dotnet/diagnostics/monitor${major_minor_version}/release/dotnet-monitor.version" qualified_release_version=$(curl -sL $version_url) # Check if the aka.ms url existed if [[ "$qualified_release_version" =~ " - $(PublishDependsOnTargets);CollectPackageArtifactFiles + $(PublishDependsOnTargets);CollectPackageArtifactFiles;CollectVersionArtifactFiles @@ -200,5 +200,31 @@ + + + dotnet-monitor-$(_BuildVersion).version + $(ArtifactsTmpDir)$(VersionFileName) + $(_OriginalVersionPrefix) + $(_BuildVersion) + + + + + + + + + diagnostics/monitor$(_BlobGroupName)/$(VersionFileName) + true + + + + From 5768b7959a9d272f6b242c0d0e62df2f36e2e167 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Wed, 14 Jun 2023 12:14:39 -0700 Subject: [PATCH 46/50] Switched to using AggregatePercentilePayload. --- .../Metrics/JsonCounterLogger.cs | 16 ++++++---- .../Metrics/MetricsStore.cs | 15 ++++----- .../MetricsFormattingTests.cs | 31 ++++++++++++++----- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs index fd4d9ab511f..93a57fa53f7 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs @@ -47,25 +47,29 @@ protected override async Task SerializeAsync(ICounterPayload counter) return; } - if (counter is PercentilePayload percentilePayload) + await Task.Delay(10000); + + Console.Error.WriteLine("JSON"); + + if (counter is AggregatePercentilePayload aggregatePercentilePayload) { - if (!percentilePayload.Quantiles.Any()) + if (!aggregatePercentilePayload.Payloads.Any()) { return; } await _stream.WriteAsync(JsonSequenceRecordSeparator); _bufferWriter.Clear(); - for (int i = 0; i < percentilePayload.Quantiles.Length; i++) + for (int i = 0; i < aggregatePercentilePayload.Payloads.Length; i++) { if (i > 0) { _bufferWriter.Write(JsonSequenceRecordSeparator.Span); } - Quantile quantile = percentilePayload.Quantiles[i]; + Quantile quantile = aggregatePercentilePayload.Payloads[i].Quantile; SerializeCounterValues(counter.Timestamp, - counter.Provider, + "TESTINGINGINGINGINGING", counter.Name, counter.DisplayName, counter.Unit, @@ -73,7 +77,7 @@ protected override async Task SerializeAsync(ICounterPayload counter) CounterUtilities.AppendPercentile(counter.Metadata, quantile.Percentage), quantile.Value); - if (i < percentilePayload.Quantiles.Length - 1) + if (i < aggregatePercentilePayload.Payloads.Length - 1) { _bufferWriter.Write(NewLineSeparator.Span); } diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs index 5d3b01425cd..756c413f605 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs @@ -64,7 +64,7 @@ public MetricsStore(ILogger logger, int maxMetricCount) public void AddMetric(ICounterPayload metric) { - if (metric is PercentilePayload payload && !payload.Quantiles.Any()) + if (metric is AggregatePercentilePayload payload && !payload.Payloads.Any()) { // If histogram data is not generated in the monitored app, we can get Histogram events that do not contain quantiles. // For now, we will ignore these events. @@ -106,7 +106,7 @@ public void AddMetric(ICounterPayload metric) } // CONSIDER We only keep 1 histogram representation per snapshot. Is it meaningful for Prometheus to see previous histograms? These are not timestamped. - if ((metrics.Count > 1) && (metric is PercentilePayload)) + if ((metrics.Count > 1) && (metric is AggregatePercentilePayload)) { metrics.Dequeue(); } @@ -138,13 +138,13 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token) foreach (var metric in metricGroup.Value) { - if (metric is PercentilePayload percentilePayload) + if (metric is AggregatePercentilePayload aggregatePayload) { // Summary quantiles must appear from smallest to largest - foreach (Quantile quantile in percentilePayload.Quantiles.OrderBy(q => q.Percentage)) + foreach (PercentilePayload percentilePayload in aggregatePayload.Payloads.OrderBy(p => p.Quantile.Percentage)) { - string metricValue = PrometheusDataModel.GetPrometheusNormalizedValue(metric.Unit, quantile.Value); - string metricLabels = GetMetricLabels(metric, quantile.Percentage); + string metricValue = PrometheusDataModel.GetPrometheusNormalizedValue(metric.Unit, percentilePayload.Value); + string metricLabels = GetMetricLabels(metric, percentilePayload.Quantile.Percentage); await WriteMetricDetails(writer, metric, metricName, metricValue, metricLabels); } } @@ -202,6 +202,7 @@ private static string GetMetricType(EventType eventType) { // In Prometheus, rates are treated as gauges due to their non-monotonic nature case EventType.Rate: + case EventType.UpDownCounter: case EventType.Gauge: return "gauge"; case EventType.Histogram: @@ -225,7 +226,7 @@ private static async Task WriteMetricDetails( await writer.WriteAsync("{" + metricLabels + "}"); } - string lineSuffix = metric is PercentilePayload ? string.Empty : FormattableString.Invariant($" {new DateTimeOffset(metric.Timestamp).ToUnixTimeMilliseconds()}"); + string lineSuffix = metric is AggregatePercentilePayload ? string.Empty : FormattableString.Invariant($" {new DateTimeOffset(metric.Timestamp).ToUnixTimeMilliseconds()}"); await writer.WriteLineAsync(FormattableString.Invariant($" {metricValue}{lineSuffix}")); } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs index ae4712896c1..d1816075b38 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs @@ -42,15 +42,17 @@ public async Task HistogramFormat_Test() { List payload = new(); - payload.Add(new PercentilePayload(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, - new Quantile[] { new(0.5, Value1), new(0.95, Value2), new(0.99, Value3) }, + PercentilePayload payload1 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value1, new Quantile(0.5, Value1), Timestamp); + PercentilePayload payload2 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value2, new Quantile(0.95, Value2), Timestamp); + PercentilePayload payload3 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value3, new Quantile(0.99, Value3), Timestamp); + + payload.Add(new AggregatePercentilePayload(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, + new PercentilePayload[] { payload1, payload2, payload3 }, Timestamp)); using MemoryStream stream = await GetMetrics(payload); List lines = ReadStream(stream); - // Question - this is manually recreating what PrometheusDataModel.GetPrometheusNormalizedName does to get the metric name; - // should we call this method, or should this also be implicitly testing its behavior by having this hard-coded? string metricName = $"{MeterName.ToLowerInvariant()}_{payload[0].Name}"; const string quantile_50 = "{quantile=\"0.5\"}"; @@ -74,8 +76,6 @@ public async Task GaugeFormat_Test() List lines = ReadStream(stream); - // Question - this is manually recreating what PrometheusDataModel.GetPrometheusNormalizedName does to get the metric name; - // should we call this method, or should this also be implicitly testing its behavior by having this hard-coded? string metricName = $"{MeterName.ToLowerInvariant()}_{payload.Name}"; Assert.Equal(3, lines.Count); @@ -93,8 +93,6 @@ public async Task CounterFormat_Test() List lines = ReadStream(stream); - // Question - this is manually recreating what PrometheusDataModel.GetPrometheusNormalizedName does to get the metric name; - // should we call this method, or should this also be implicitly testing its behavior by having this hard-coded? string metricName = $"{MeterName.ToLowerInvariant()}_{payload.Name}"; Assert.Equal(3, lines.Count); @@ -103,6 +101,23 @@ public async Task CounterFormat_Test() Assert.Equal($"{metricName} {payload.Value} {new DateTimeOffset(payload.Timestamp).ToUnixTimeMilliseconds()}", lines[2]); } + [Fact] + public async Task UpDownCounterFormat_Test() + { + ICounterPayload payload = new UpDownCounterPayload(MeterName, InstrumentName, "DisplayName", "", null, Value1, Timestamp); + + MemoryStream stream = await GetMetrics(new() { payload }); + + List lines = ReadStream(stream); + + string metricName = $"{MeterName.ToLowerInvariant()}_{payload.Name}"; + + Assert.Equal(3, lines.Count); + Assert.Equal(FormattableString.Invariant($"# HELP {metricName}{payload.Unit} {payload.DisplayName}"), lines[0]); + Assert.Equal(FormattableString.Invariant($"# TYPE {metricName} gauge"), lines[1]); + Assert.Equal(FormattableString.Invariant($"{metricName} {payload.Value} {new DateTimeOffset(payload.Timestamp).ToUnixTimeMilliseconds()}"), lines[2]); + } + private async Task GetMetrics(List payloads) { IMetricsStore metricsStore = new MetricsStore(_logger, MetricCount); From 684c3a5364a354a89a1a2fe27b7df4f1199f7913 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Tue, 20 Jun 2023 14:15:46 -0700 Subject: [PATCH 47/50] Changes to AggregatePercentilePayload --- .../Metrics/JsonCounterLogger.cs | 14 +++++--------- .../Metrics/MetricsStore.cs | 8 ++++---- .../MetricsFormattingTests.cs | 6 +----- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs index 93a57fa53f7..7e0eb3b68f5 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs @@ -47,29 +47,25 @@ protected override async Task SerializeAsync(ICounterPayload counter) return; } - await Task.Delay(10000); - - Console.Error.WriteLine("JSON"); - if (counter is AggregatePercentilePayload aggregatePercentilePayload) { - if (!aggregatePercentilePayload.Payloads.Any()) + if (!aggregatePercentilePayload.Quantiles.Any()) { return; } await _stream.WriteAsync(JsonSequenceRecordSeparator); _bufferWriter.Clear(); - for (int i = 0; i < aggregatePercentilePayload.Payloads.Length; i++) + for (int i = 0; i < aggregatePercentilePayload.Quantiles.Length; i++) { if (i > 0) { _bufferWriter.Write(JsonSequenceRecordSeparator.Span); } - Quantile quantile = aggregatePercentilePayload.Payloads[i].Quantile; + Quantile quantile = aggregatePercentilePayload.Quantiles[i]; SerializeCounterValues(counter.Timestamp, - "TESTINGINGINGINGINGING", + counter.Provider, counter.Name, counter.DisplayName, counter.Unit, @@ -77,7 +73,7 @@ protected override async Task SerializeAsync(ICounterPayload counter) CounterUtilities.AppendPercentile(counter.Metadata, quantile.Percentage), quantile.Value); - if (i < aggregatePercentilePayload.Payloads.Length - 1) + if (i < aggregatePercentilePayload.Quantiles.Length - 1) { _bufferWriter.Write(NewLineSeparator.Span); } diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs index 756c413f605..5a3f6b03f5f 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs @@ -64,7 +64,7 @@ public MetricsStore(ILogger logger, int maxMetricCount) public void AddMetric(ICounterPayload metric) { - if (metric is AggregatePercentilePayload payload && !payload.Payloads.Any()) + if (metric is AggregatePercentilePayload payload && !payload.Quantiles.Any()) { // If histogram data is not generated in the monitored app, we can get Histogram events that do not contain quantiles. // For now, we will ignore these events. @@ -141,10 +141,10 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token) if (metric is AggregatePercentilePayload aggregatePayload) { // Summary quantiles must appear from smallest to largest - foreach (PercentilePayload percentilePayload in aggregatePayload.Payloads.OrderBy(p => p.Quantile.Percentage)) + foreach (Quantile quantile in aggregatePayload.Quantiles.OrderBy(q => q.Percentage)) { - string metricValue = PrometheusDataModel.GetPrometheusNormalizedValue(metric.Unit, percentilePayload.Value); - string metricLabels = GetMetricLabels(metric, percentilePayload.Quantile.Percentage); + string metricValue = PrometheusDataModel.GetPrometheusNormalizedValue(metric.Unit, quantile.Value); + string metricLabels = GetMetricLabels(metric, quantile.Percentage); await WriteMetricDetails(writer, metric, metricName, metricValue, metricLabels); } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs index d1816075b38..8f4a85154ed 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs @@ -42,12 +42,8 @@ public async Task HistogramFormat_Test() { List payload = new(); - PercentilePayload payload1 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value1, new Quantile(0.5, Value1), Timestamp); - PercentilePayload payload2 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value2, new Quantile(0.95, Value2), Timestamp); - PercentilePayload payload3 = new(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, Value3, new Quantile(0.99, Value3), Timestamp); - payload.Add(new AggregatePercentilePayload(MeterName, InstrumentName, "DisplayName", string.Empty, string.Empty, - new PercentilePayload[] { payload1, payload2, payload3 }, + new Quantile[] { new Quantile(0.5, Value1), new Quantile(0.95, Value2), new Quantile(0.99, Value3) }, Timestamp)); using MemoryStream stream = await GetMetrics(payload); From ad4af5c1a144d8459a62ab0fc836c486341ebe5d Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Wed, 16 Aug 2023 08:29:40 -0700 Subject: [PATCH 48/50] Bringing in Shared metrics support. --- .../Metrics/MetricsService.cs | 1 + .../CollectionRules/Triggers/EventMeterTriggerFactory.cs | 1 + src/Tools/dotnet-monitor/Metrics/MetricsOperationFactory.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsService.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsService.cs index 72cf7d97805..1d870f62f5e 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsService.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsService.cs @@ -58,6 +58,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) using IDisposable monitorListener = _optionsMonitor.OnChange((_, _) => optionsTokenSource.SafeCancel()); MetricsPipelineSettings counterSettings = MetricsSettingsFactory.CreateSettings(counterOptions, options); + counterSettings.UseSharedSession = pi.EndpointInfo.RuntimeVersion?.Major >= 8; _counterPipeline = new MetricsPipeline(client, counterSettings, loggers: new[] { new MetricsLogger(_store.MetricsStore) }); diff --git a/src/Tools/dotnet-monitor/CollectionRules/Triggers/EventMeterTriggerFactory.cs b/src/Tools/dotnet-monitor/CollectionRules/Triggers/EventMeterTriggerFactory.cs index b492ffed8f7..46502ad63b5 100644 --- a/src/Tools/dotnet-monitor/CollectionRules/Triggers/EventMeterTriggerFactory.cs +++ b/src/Tools/dotnet-monitor/CollectionRules/Triggers/EventMeterTriggerFactory.cs @@ -44,6 +44,7 @@ public ICollectionRuleTrigger Create(IEndpointInfo endpointInfo, Action callback SlidingWindowDuration = options.SlidingWindowDuration.GetValueOrDefault(TimeSpan.Parse(EventMeterOptionsDefaults.SlidingWindowDuration)), MaxHistograms = _counterOptions.CurrentValue.GetMaxHistograms(), MaxTimeSeries = _counterOptions.CurrentValue.GetMaxTimeSeries(), + UseSharedSession = endpointInfo.RuntimeVersion?.Major >= 8 }; return EventPipeTriggerFactory.Create( diff --git a/src/Tools/dotnet-monitor/Metrics/MetricsOperationFactory.cs b/src/Tools/dotnet-monitor/Metrics/MetricsOperationFactory.cs index 2d79c20b460..2a393afae9c 100644 --- a/src/Tools/dotnet-monitor/Metrics/MetricsOperationFactory.cs +++ b/src/Tools/dotnet-monitor/Metrics/MetricsOperationFactory.cs @@ -20,6 +20,7 @@ public MetricsOperationFactory(OperationTrackerService operationTrackerService, public IArtifactOperation Create(IEndpointInfo endpointInfo, MetricsPipelineSettings settings) { + settings.UseSharedSession = endpointInfo.RuntimeVersion?.Major >= 8; return new MetricsOperation(endpointInfo, settings, _operationTrackerService, _logger); } } From 33717bca7c77e9e0fc394e7b7414c64095675eec Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Thu, 7 Sep 2023 15:40:30 -0700 Subject: [PATCH 49/50] Updated live metrics test. --- .../LiveMetricsTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs index 4b9ca161d72..393530c7c49 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs @@ -187,7 +187,9 @@ await ScenarioRunner.SingleTarget( // will fail and will need to be updated. Regex regex = new Regex(@"\bPercentile=(50|95|99)"); - for (int index = 0; index < actualMeterNames.Count; ++index) + int startingIndex = instrumentNamesP1.Length + instrumentNamesP2.Length; // Accounts for empty InstrumentStarted payloads + + for (int index = startingIndex; index < actualMeterNames.Count; ++index) { if (actualInstrumentNames[index] == Constants.HistogramName1) { From 35f27849b8358a43bcaff08f2513c23d05c49475 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Fri, 8 Sep 2023 14:48:29 -0700 Subject: [PATCH 50/50] Fix BlobGroupBuildQuality that didn't merge correctly. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6779c211a1e..90610dc7e2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ - 'daily': sets the blob group release name to 'daily' so a release type does not have to be assigned. - 'release': sets the blob group release name to 'release'. Can be used for prereleases and full releases. --> - release + daily