Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/diagnostics #6613

Merged
merged 2 commits into from
May 14, 2024
+13 −13
Merged

[main] Update dependencies from dotnet/diagnostics #6613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e331a9
Update dependencies from https://github.com/dotnet/diagnostics build …
dotnet-maestro[bot] May 14, 2024
e76863d
Adjust request rundown boolean to rundown keyword
jander-msft May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8e941eb42f819adb116b881195158b3887a70a1c</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24259.1">
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24263.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>a9efc2e9a04c86be5f66995522f63679ced519c7</Sha>
<Sha>363760fa9a030cbd6c8eb73e7352c8728ba62a9a</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24259.1">
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24263.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>a9efc2e9a04c86be5f66995522f63679ced519c7</Sha>
<Sha>363760fa9a030cbd6c8eb73e7352c8728ba62a9a</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24209.3">
<Uri>https://github.com/dotnet/command-line-api</Uri>
Expand Down Expand Up @@ -46,9 +46,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="8.0.0-preview.24259.1">
<Dependency Name="Microsoft.FileFormats" Version="8.0.0-preview.24263.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>a9efc2e9a04c86be5f66995522f63679ced519c7</Sha>
<Sha>363760fa9a030cbd6c8eb73e7352c8728ba62a9a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<!-- dotnet/command-line-api references -->
<SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
<!-- dotnet/diagnostics references -->
<MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24259.1</MicrosoftDiagnosticsMonitoringVersion>
<MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24259.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
<MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24263.1</MicrosoftDiagnosticsMonitoringVersion>
<MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24263.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
<!-- dotnet/installer references -->
<MicrosoftDotnetSdkInternalVersion>8.0.103-servicing.24114.15</MicrosoftDotnetSdkInternalVersion>
<!-- dotnet/roslyn-analyzers -->
Expand All @@ -67,7 +67,7 @@
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.1-servicing.23580.1</VSRedistCommonNetCoreSharedFrameworkx6480Version>
<!-- dotnet/symstore references -->
<MicrosoftFileFormatsVersion>8.0.0-preview.24259.1</MicrosoftFileFormatsVersion>
<MicrosoftFileFormatsVersion>8.0.0-preview.24263.1</MicrosoftFileFormatsVersion>
</PropertyGroup>
<PropertyGroup Label="Runtime Versions">
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Diagnostics.Monitoring.WebApi/Stacks/EventStacksPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Diagnostics.Monitoring.WebApi/Utilities/TraceUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/dotnet-monitor/Exceptions/EventExceptionsPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/dotnet-monitor/ParameterCapturing/EventParameterCapturingPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
Expand Down