From 0e331a9a0b584fe21cb25622ee2d6b473d18a9e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 May 2024 12:02:47 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/diagnostics build 20240513.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24259.1 -> To Version 8.0.0-preview.24263.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 920dbbd5b59..74de8350c40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 20bc4de28df..eae9459a79b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24259.1 - 8.0.0-preview.24259.1 + 8.0.0-preview.24263.1 + 8.0.0-preview.24263.1 8.0.103-servicing.24114.15 @@ -67,7 +67,7 @@ 8.0.1 8.0.1-servicing.23580.1 - 8.0.0-preview.24259.1 + 8.0.0-preview.24263.1 $(MicrosoftNETCoreApp31Version) From e76863d003186ecb7957cd213f2b1797a1612fda Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Tue, 14 May 2024 09:05:09 -0700 Subject: [PATCH 2/2] Adjust request rundown boolean to rundown keyword --- .../Stacks/EventStacksPipeline.cs | 2 +- .../Utilities/TraceUtilities.cs | 2 +- src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs | 2 +- .../ParameterCapturing/EventParameterCapturingPipeline.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/EventStacksPipeline.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/EventStacksPipeline.cs index 0470d95e643..ec280574838 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/EventStacksPipeline.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/EventStacksPipeline.cs @@ -33,7 +33,7 @@ public EventStacksPipeline(DiagnosticsClient client, EventStacksPipelineSettings protected override MonitoringSourceConfiguration CreateConfiguration() { - return new EventPipeProviderSourceConfiguration(requestRundown: false, bufferSizeInMB: 256, new[] + return new EventPipeProviderSourceConfiguration(rundownKeyword: 0, bufferSizeInMB: 256, new[] { new EventPipeProvider(CallStackEvents.Provider, EventLevel.LogAlways) }); diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Utilities/TraceUtilities.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Utilities/TraceUtilities.cs index 1c166bc3e1c..f43ee1d3467 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Utilities/TraceUtilities.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Utilities/TraceUtilities.cs @@ -73,7 +73,7 @@ public static MonitoringSourceConfiguration GetTraceConfiguration(Models.EventPi return new EventPipeProviderSourceConfiguration( providers: providers.ToArray(), - requestRundown: requestRundown, + rundownKeyword: requestRundown ? EventPipeSession.DefaultRundownKeyword : 0, bufferSizeInMB: bufferSizeInMB); } } diff --git a/src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs b/src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs index 494d13e4866..c98d758d853 100644 --- a/src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs +++ b/src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs @@ -35,7 +35,7 @@ public EventExceptionsPipeline(DiagnosticsClient client, EventExceptionsPipeline protected override MonitoringSourceConfiguration CreateConfiguration() { - return new EventPipeProviderSourceConfiguration(requestRundown: false, bufferSizeInMB: 64, new[] + return new EventPipeProviderSourceConfiguration(rundownKeyword: 0, bufferSizeInMB: 64, new[] { new EventPipeProvider(ExceptionEvents.SourceName, EventLevel.Informational, (long)EventKeywords.All) }); diff --git a/src/Tools/dotnet-monitor/ParameterCapturing/EventParameterCapturingPipeline.cs b/src/Tools/dotnet-monitor/ParameterCapturing/EventParameterCapturingPipeline.cs index e86b1d2a6b3..8d4fc967433 100644 --- a/src/Tools/dotnet-monitor/ParameterCapturing/EventParameterCapturingPipeline.cs +++ b/src/Tools/dotnet-monitor/ParameterCapturing/EventParameterCapturingPipeline.cs @@ -42,7 +42,7 @@ public EventParameterCapturingPipeline(IpcEndpoint endpoint, EventParameterCaptu protected override MonitoringSourceConfiguration CreateConfiguration() { - return new EventPipeProviderSourceConfiguration(requestRundown: false, bufferSizeInMB: 64, new[] + return new EventPipeProviderSourceConfiguration(rundownKeyword: 0, bufferSizeInMB: 64, new[] { new EventPipeProvider(ParameterCapturingEvents.SourceName, EventLevel.Informational, (long)EventKeywords.All) });