Skip to content

Commit 31e2018

Browse files
sync non-code with origin/main (#8010)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 1b9be43 commit 31e2018

File tree

6 files changed

+41
-4
lines changed

6 files changed

+41
-4
lines changed

.github/releases.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"additionalMonthsOfSupportOnNewMinorRelease": 3,
44
"cleanupUnsupportedReleasesAfterMonths": 12
55
},
6-
"preview": [],
6+
"preview": [
7+
"9.1"
8+
],
79
"supported": [
810
"9.0",
911
"8.1",
@@ -58,6 +60,14 @@
5860
"supportedFrameworks": [
5961
"net8.0"
6062
]
63+
},
64+
"9.1": {
65+
"tag": "v9.1.0-preview.1.25155.2",
66+
"minorReleaseDate": "2025-03-11T00:00:00.000Z",
67+
"patchReleaseDate": "2025-03-11T00:00:00.000Z",
68+
"supportedFrameworks": [
69+
"net9.0"
70+
]
6171
}
6272
}
6373
}

documentation/api/definitions.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Object describing a captured method and its parameters.
104104
| `typeName` | string | The method type name. |
105105
| `methodName` | string | The method name. |
106106
| `parameters` | [CapturedParameter](#capturedparameter)[] | Array of captured parameters. |
107+
| `methodToken` | int |(9.1+) TypeDef token for the method. |
108+
| `moduleVersionId` | guid |(9.1+) Unique identifier used to distinguish between two versions of the same module. An empty value: `00000000-0000-0000-0000-000000000000`. |
107109

108110
## CapturedParameter
109111

@@ -141,6 +143,7 @@ Object describing diagnostic/automation information about the executing instance
141143
| RuntimeVersion | string | The version of the dotnet runtime. |
142144
| DiagnosticPortMode | DiagnosticPortConnectionMode | Indicates whether `dotnet monitor` is in `connect` mode or `listen` mode. |
143145
| DiagnosticPortName | string | The name of the named pipe or unix domain socket to use for connecting to the diagnostic server. |
146+
| Capabilities | [MonitorCapability](#monitorcapability)[] |(9.1+) The capabilities provided by `dotnet monitor`. |
144147

145148
## DumpType
146149

@@ -375,6 +378,17 @@ Object describing a metric from the application.
375378
| `counterType` | string | The type of metric. This is typically `Rate` or `Metric`. |
376379
| `value` | double | The value of the metric. |
377380

381+
## MonitorCapability
382+
383+
First Available: 9.1
384+
385+
The name and enablement of a `dotnet monitor` capability.
386+
387+
| Name | Type | Description |
388+
|---|---|---|
389+
| `name`| string | The name of the capability. |
390+
| `enabled` | bool | The enablement status of the capability. |
391+
378392
## OperationError
379393

380394
| Name | Type | Description |

documentation/api/info.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ Content-Type: application/json
4343
"version": "6.0.0",
4444
"runtimeVersion": "6.0.0",
4545
"diagnosticPortMode": "Connect",
46-
"diagnosticPortName": null
46+
"diagnosticPortName": null,
47+
"capabilities": [{"name":"exceptions","enabled":true},{"name":"parameters","enabled":true},{"name":"call_stacks","enabled":true},{"name":"metrics","enabled":true},{"name":"http_egress","enabled":true}]
4748
}
4849
```
4950

documentation/api/parameters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ Accept: application/x-ndjson
111111
HTTP/1.1 200 OK
112112
Content-Type: application/x-ndjson
113113
114-
{"activityId":"00-aeacc84edb640c5dc72477747729a975-42f991d5c79b02d8-00","activityIdFormat":"W3C","threadId":13,"timestamp":"2024-04-18T08:49:54.1957076-04:00","moduleName":"System.Private.CoreLib.dll","typeName":"System.String","methodName":"Concat","parameters":[{"parameterName":"str0","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027localhost\u0027"},{"parameterName":"str1","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027:\u0027"},{"parameterName":"str2","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u00277290\u0027"}]}
115-
{"activityId":"00-aeacc84edb640c5dc72477747729a975-42f991d5c79b02d8-00","activityIdFormat":"W3C","threadId":13,"timestamp":"2024-04-18T08:49:54.196018-04:00","moduleName":"System.Private.CoreLib.dll","typeName":"System.String","methodName":"Concat","parameters":[{"parameterName":"str0","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027\u0027"},{"parameterName":"str1","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027/Account/SignIn\u0027"}]}
114+
{"activityId":"00-aeacc84edb640c5dc72477747729a975-42f991d5c79b02d8-00","activityIdFormat":"W3C","threadId":13,"timestamp":"2024-04-18T08:49:54.1957076-04:00","moduleName":"System.Private.CoreLib.dll","typeName":"System.String","methodName":"Concat","parameters":[{"parameterName":"str0","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027localhost\u0027"},{"parameterName":"str1","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027:\u0027"},{"parameterName":"str2","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u00277290\u0027"}], "methodToken": 100663639, "moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5"}
115+
{"activityId":"00-aeacc84edb640c5dc72477747729a975-42f991d5c79b02d8-00","activityIdFormat":"W3C","threadId":13,"timestamp":"2024-04-18T08:49:54.196018-04:00","moduleName":"System.Private.CoreLib.dll","typeName":"System.String","methodName":"Concat","parameters":[{"parameterName":"str0","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027\u0027"},{"parameterName":"str1","typeName":"System.String","moduleName":"System.Private.CoreLib.dll","value":"\u0027/Account/SignIn\u0027"}], "methodToken": 100663639, "moduleVersionId": "bf769014-c2e2-496a-93b7-76fbbcd04be5"}
116116
```
117117

118118
## Supported Runtimes
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes:
2+
3+
- Updated dependencies
4+
5+
If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn).

documentation/releases.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@
1717
| 6.3 | October 11, 2022 | [6.3.10](https://github.com/dotnet/dotnet-monitor/releases/tag/v6.3.10) | November 12, 2024 | November 12, 2024 | net6.0<br/>netcoreapp3.1 |
1818

1919

20+
## Preview versions
21+
22+
| Version | Release Date | Latest Version | Runtime Frameworks |
23+
| --- | --- | --- | --- |
24+
| 9.1 | March 11, 2025 | [9.1.0 preview 1](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.1.0-preview.1.25155.2) | net9.0 |
25+
26+

0 commit comments

Comments
 (0)