Skip to content

Commit 6903074

Browse files
schmittjosephschmittjoseph
committed
Merge remote-tracking branch 'upstream/main' into dev/joschmit/merge-91
2 parents 5b13a80 + 2ed430e commit 6903074

File tree

93 files changed

+1418
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1418
-499
lines changed

‎.github/workflows/check-markdown-links.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Check markdown links
22-
uses: gaurav-nelson/github-action-markdown-link-check@1b916f2cf6c36510a6059943104e3c42ce6c16bc
22+
uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
2323
with:
2424
config-file: .github/linters/check-markdown-links-config.json
2525
use-quiet-mode: 'yes'

‎Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PackageVersion Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
88
<PackageVersion Include="Azure.Storage.Queues" Version="$(AzureStorageQueuesVersion)" />
99
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerVersion)" />
10+
<PackageVersion Include="Microsoft.AspnetCore.OpenApi" Version="$(MicrosoftAspNetCoreOpenApiVersion)" />
1011
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="$(MicrosoftAspNetCoreAuthenticationNegotiateVersion)" />
1112
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" />
1213
<PackageVersion Include="Microsoft.Diagnostics.Monitoring" Version="$(MicrosoftDiagnosticsMonitoringLibraryVersion)" />
@@ -25,7 +26,6 @@
2526
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
2627
<PackageVersion Include="NJsonSchema" Version="$(NJsonSchemaVersion)" />
2728
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="$(NJsonSchemaVersion)" />
28-
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="$(SwashbuckleAspNetCoreVersion)" />
2929
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
3030
<PackageVersion Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
3131
<PackageVersion Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />

‎documentation/openapi.json

+89-43
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,14 @@
187187
"in": "query",
188188
"description": "The type of dump to capture.",
189189
"schema": {
190-
"$ref": "#/components/schemas/DumpType"
190+
"enum": [
191+
"Full",
192+
"Mini",
193+
"WithHeap",
194+
"Triage"
195+
],
196+
"type": "string",
197+
"default": "WithHeap"
191198
}
192199
},
193200
{
@@ -351,7 +358,15 @@
351358
"in": "query",
352359
"description": "The profiles enabled for the trace session.",
353360
"schema": {
354-
"$ref": "#/components/schemas/TraceProfile"
361+
"enum": [
362+
"Cpu",
363+
"Http",
364+
"Logs",
365+
"Metrics",
366+
"GcCollect"
367+
],
368+
"type": "string",
369+
"default": "Cpu, Http, Metrics, GcCollect"
355370
}
356371
},
357372
{
@@ -705,7 +720,8 @@
705720
"$ref": "#/components/schemas/LogsConfiguration"
706721
}
707722
}
708-
}
723+
},
724+
"required": true
709725
},
710726
"responses": {
711727
"400": {
@@ -1430,7 +1446,8 @@
14301446
"$ref": "#/components/schemas/ExceptionsConfiguration"
14311447
}
14321448
}
1433-
}
1449+
},
1450+
"required": true
14341451
},
14351452
"responses": {
14361453
"400": {
@@ -1672,14 +1689,6 @@
16721689
"CollectionRuleDetailedDescription": {
16731690
"type": "object",
16741691
"properties": {
1675-
"state": {
1676-
"$ref": "#/components/schemas/CollectionRuleState"
1677-
},
1678-
"stateReason": {
1679-
"type": "string",
1680-
"description": "Human-readable explanation for the current state of the collection rule.",
1681-
"nullable": true
1682-
},
16831692
"lifetimeOccurrences": {
16841693
"type": "integer",
16851694
"description": "The number of times the trigger has executed for a process in its lifetime.",
@@ -1715,6 +1724,14 @@
17151724
"format": "time-span",
17161725
"nullable": true,
17171726
"example": "00:00:30"
1727+
},
1728+
"state": {
1729+
"$ref": "#/components/schemas/CollectionRuleState"
1730+
},
1731+
"stateReason": {
1732+
"type": "string",
1733+
"description": "Human-readable explanation for the current state of the collection rule.",
1734+
"nullable": true
17181735
}
17191736
},
17201737
"additionalProperties": false
@@ -1736,6 +1753,9 @@
17361753
"type": "string"
17371754
},
17381755
"DotnetMonitorInfo": {
1756+
"required": [
1757+
"capabilities"
1758+
],
17391759
"type": "object",
17401760
"properties": {
17411761
"version": {
@@ -1755,19 +1775,18 @@
17551775
"type": "string",
17561776
"description": "The name of the named pipe or unix domain socket to use for connecting to the diagnostic server.",
17571777
"nullable": true
1778+
},
1779+
"capabilities": {
1780+
"type": "array",
1781+
"items": {
1782+
"$ref": "#/components/schemas/MonitorCapability"
1783+
},
1784+
"description": "The capabilities provided by dotnet-monitor.",
1785+
"nullable": true
17581786
}
17591787
},
17601788
"additionalProperties": false
17611789
},
1762-
"DumpType": {
1763-
"enum": [
1764-
"Full",
1765-
"Mini",
1766-
"WithHeap",
1767-
"Triage"
1768-
],
1769-
"type": "string"
1770-
},
17711790
"EventLevel": {
17721791
"enum": [
17731792
"LogAlways",
@@ -1974,9 +1993,9 @@
19741993
},
19751994
"MethodDescription": {
19761995
"required": [
1977-
"methodName",
19781996
"moduleName",
1979-
"typeName"
1997+
"typeName",
1998+
"methodName"
19801999
],
19812000
"type": "object",
19822001
"properties": {
@@ -1995,6 +2014,23 @@
19952014
},
19962015
"additionalProperties": false
19972016
},
2017+
"MonitorCapability": {
2018+
"required": [
2019+
"name",
2020+
"enabled"
2021+
],
2022+
"type": "object",
2023+
"properties": {
2024+
"name": {
2025+
"minLength": 1,
2026+
"type": "string"
2027+
},
2028+
"enabled": {
2029+
"type": "boolean"
2030+
}
2031+
},
2032+
"additionalProperties": false
2033+
},
19982034
"OperationError": {
19992035
"type": "object",
20002036
"properties": {
@@ -2007,7 +2043,8 @@
20072043
"nullable": true
20082044
}
20092045
},
2010-
"additionalProperties": false
2046+
"additionalProperties": false,
2047+
"nullable": true
20112048
},
20122049
"OperationProcessInfo": {
20132050
"type": "object",
@@ -2026,7 +2063,8 @@
20262063
}
20272064
},
20282065
"additionalProperties": false,
2029-
"description": "Represents the details of a given process used in an operation."
2066+
"description": "Represents the details of a given process used in an operation.",
2067+
"nullable": true
20302068
},
20312069
"OperationState": {
20322070
"enum": [
@@ -2042,6 +2080,13 @@
20422080
"OperationStatus": {
20432081
"type": "object",
20442082
"properties": {
2083+
"resourceLocation": {
2084+
"type": "string",
2085+
"nullable": true
2086+
},
2087+
"error": {
2088+
"$ref": "#/components/schemas/OperationError"
2089+
},
20452090
"operationId": {
20462091
"type": "string",
20472092
"format": "uuid"
@@ -2070,13 +2115,6 @@
20702115
"type": "string"
20712116
},
20722117
"nullable": true
2073-
},
2074-
"resourceLocation": {
2075-
"type": "string",
2076-
"nullable": true
2077-
},
2078-
"error": {
2079-
"$ref": "#/components/schemas/OperationError"
20802118
}
20812119
},
20822120
"additionalProperties": false,
@@ -2192,20 +2230,14 @@
21922230
"processArchitecture": {
21932231
"type": "string",
21942232
"nullable": true
2233+
},
2234+
"managedEntryPointAssemblyName": {
2235+
"type": "string",
2236+
"nullable": true
21952237
}
21962238
},
21972239
"additionalProperties": false
21982240
},
2199-
"TraceProfile": {
2200-
"enum": [
2201-
"Cpu",
2202-
"Http",
2203-
"Logs",
2204-
"Metrics",
2205-
"GcCollect"
2206-
],
2207-
"type": "string"
2208-
},
22092241
"ValidationProblemDetails": {
22102242
"type": "object",
22112243
"properties": {
@@ -2276,5 +2308,19 @@
22762308
}
22772309
}
22782310
}
2279-
}
2311+
},
2312+
"tags": [
2313+
{
2314+
"name": "Diag"
2315+
},
2316+
{
2317+
"name": "Exceptions"
2318+
},
2319+
{
2320+
"name": "Metrics"
2321+
},
2322+
{
2323+
"name": "Operations"
2324+
}
2325+
]
22802326
}

‎documentation/schema.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,13 @@
594594
"string"
595595
],
596596
"description": "Performs a match based on the contents of the command passed to launch the process on the system; this typically includes the executable path and arguments to the process."
597+
},
598+
"ManagedEntryPointAssemblyName": {
599+
"type": [
600+
"null",
601+
"string"
602+
],
603+
"description": "Performs a match based on the name of the managed entry point assembly of the process."
597604
}
598605
}
599606
},
@@ -603,12 +610,14 @@
603610
"x-enumNames": [
604611
"ProcessId",
605612
"ProcessName",
606-
"CommandLine"
613+
"CommandLine",
614+
"ManagedEntryPointAssemblyName"
607615
],
608616
"enum": [
609617
"ProcessId",
610618
"ProcessName",
611-
"CommandLine"
619+
"CommandLine",
620+
"ManagedEntryPointAssemblyName"
612621
]
613622
},
614623
"ProcessFilterType": {

‎eng/Signing.props

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<FileSignInfo Include="AWSSDK.SecurityToken.dll" CertificateName="3PartySHA2" />
66
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
77
<FileSignInfo Include="Newtonsoft.Json.Bson.dll" CertificateName="3PartySHA2" />
8-
<FileSignInfo Include="Swashbuckle.AspNetCore.Swagger.dll" CertificateName="3PartySHA2" />
9-
<FileSignInfo Include="Swashbuckle.AspNetCore.SwaggerGen.dll" CertificateName="3PartySHA2" />
108
</ItemGroup>
119
<ItemGroup Condition="'$(SignAllBinaries)' != 'true'">
1210
<!--

‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
55
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25154.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</Sha>
9+
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25154.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25155.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</Sha>
13+
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.25153.1">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25170.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
17-
<Sha>b7f0d1c4f0da129f7a115e32b21f0b773e60805b</Sha>
17+
<Sha>931bc0d178882c11daf9e38ae88858691e2df2b9</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
@@ -42,9 +42,9 @@
4242
<Uri>https://github.com/dotnet/arcade</Uri>
4343
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.615401">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>1b1ef2e76ce8c2dc3aa261e8037d3a11e27a39bd</Sha>
47+
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RepositoryUrl>https://github.com/dotnet/dotnet-monitor</RepositoryUrl>
66
<VersionPrefix>9.1.0</VersionPrefix>
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
8+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
99
<!-- Disable final version kind until merged into release branch. -->
1010
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1111
<!--
@@ -55,10 +55,10 @@
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24610.9</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
5757
<!-- dotnet/command-line-api references -->
58-
<SystemCommandLineVersion>2.0.0-beta4.25153.1</SystemCommandLineVersion>
58+
<SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25154.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25154.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
6767
<!-- dotnet/sdk references -->
6868
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.200-rtm.25073.13</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.615401</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
@@ -122,6 +122,7 @@
122122
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions90Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
123123
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole90Version)</MicrosoftExtensionsLoggingConsoleVersion>
124124
<SystemTextJsonVersion>$(SystemTextJson90Version)</SystemTextJsonVersion>
125+
<MicrosoftAspNetCoreOpenApiVersion>$(MicrosoftAspNetCoreApp90Version)</MicrosoftAspNetCoreOpenApiVersion>
125126
</PropertyGroup>
126127
<PropertyGroup Condition="'$(UseMicrosoftDiagnosticsMonitoringShippedVersion)' == 'true'">
127128
<MicrosoftDiagnosticsMonitoringLibraryVersion>$(MicrosoftDiagnosticsMonitoringShippedVersion)</MicrosoftDiagnosticsMonitoringLibraryVersion>

0 commit comments

Comments
 (0)