Merge main to release/7.x for Preview 3

Author: jander-msft

Build.cmd

@@ -1,3 +1,3 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\build.ps1""" -restore -build %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -restore %*"
 exit /b %ErrorLevel%

CMakeLists.txt

@@ -0,0 +1,47 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(dotnet-monitor)
+
+include(eng/native/configurepaths.cmake)
+include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
+
+include_directories(
+    src/external/runtime/src/coreclr/pal/prebuilt/inc
+    src/inc
+    )
+
+if(CLR_CMAKE_HOST_UNIX)
+    include_directories(
+        src/external/runtime/src/coreclr/pal/inc/rt
+        src/external/runtime/src/coreclr/pal/inc
+        src/external/runtime/src/coreclr/inc
+        src/inc/pal
+        )
+    add_compile_options(
+        -DPAL_STDCPP_COMPAT
+        )
+    if(NOT CLR_CMAKE_HOST_OSX)
+        add_link_options(
+            --no-undefined
+            )
+    endif(NOT CLR_CMAKE_HOST_OSX)
+endif(CLR_CMAKE_HOST_UNIX)
+
+set(PROFILER_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/src/external/runtime/src/coreclr/pal/prebuilt/idl/corprof_i.cpp
+    )
+
+# Add version files
+if(CLR_CMAKE_HOST_WIN32)
+    set(SOURCES
+        ${SOURCES}
+        ${PROJECT_BINARY_DIR}/NativeVersion.rc
+        )
+else(CLR_CMAKE_HOST_WIN32)
+    set(SOURCES
+        ${SOURCES}
+        ${PROJECT_BINARY_DIR}/version.c
+        )
+endif(CLR_CMAKE_HOST_WIN32)
+
+add_subdirectory(src/MonitorProfiler)

README.md

@@ -6,6 +6,10 @@ This repository contains the source code for dotnet-monitor, a diagnostic tool f
 
 See [Releases](documentation/releases.md) for the release history.
 
+## Docs
+
+[Docs](documentation/README.md) - Learn how to install, configure, and use dotnet-monitor.
+
 ## Building the Repository
 
 See [building instructions](documentation/building.md) in our documentation directory.

build.sh

@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/eng/common/build.sh" --restore -build $@
+"$scriptroot/eng/build.sh" --restore $@

documentation/release-process.md

@@ -5,7 +5,19 @@
 1. Merge from the `main` branch to the appropriate release branch (e.g. `release/5.0`).
 1. In `/eng/Versions.props`, update `dotnet/diagnostics` dependencies to versions from the corresponding release of the `dotnet/diagnostics` repo.
 1. In `/eng/Version.props`, ensure that `<BlobGroupBuildQuality>` is set appropriately. See the documentation next to this setting for the appropriate values. In release branches, its value should either be `prerelease` or `release`. This setting, in combination with the version settings, determine for which 'channel' the aks.ms links are created.
-4. Complete at least one successful build.
+1. Complete at least one successful build.
+1. Bump the version number in the `main` branch. [Example Pull Request](https://github.com/dotnet/dotnet-monitor/pull/1560). 
+
+## Additional steps when creating a new release branch
+
+1. When creating a new release branch (such as `release/8.x`) there are additional steps that need to be taken.
+1. Follow [these steps](https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#setting-up-your-darc-client) to install darc.
+1. Be sure to call [darc authenticate](https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#authenticate). You will need to create the requested tokens.
+1. You will need to add the branch to a channel. E.g.
+`darc add-default-channel --channel ".NET Core Tooling Release" --branch release/8.x --repo https://github.com/dotnet/dotnet-monitor`
+
+- It can be helpful to create test release branches (e.g. release/test/8.x). Note these branches will trigger warnings because they are considered unprotected release branches and should be deleted as soon as possible.
+- If you created a build from a newly created release branch without a channel, you will get the message 'target build already exists on all channels'. To use this build you need to add it to a channel: `darc add-build-to-channel --id <Build BAR ID> --channel "General Testing"`.
 
 ## Build Release Branch
 
@@ -29,12 +41,25 @@ The `channel` value is used by the `dotnet-docker` repository to consume the cor
 
 The `dotnet-docker` repository runs an update process each day that detects the latest version of a given `dotnet-monitor` channel. During the stabilization/testing/release period for a release of `dotnet-monitor`, the update process should be changed to pick up builds for the release branch.
 
-The `monitorChannel` pipeline variable of the [dotnet-docker-update-dependencies](https://dev.azure.com/dnceng/internal/_build?definitionId=470) pipeline instructs the update process of which channel to use in order to update the `nightly` branch. Normally, its value is `6.0/daily` to pull the latest daily build. However, during the stabilization and release of dotnet-monitor, it should be set to the prerelease channel (e.g. `6.0/preview.8`, `6.0/rc.1`) or release channel (e.g. `6.0/release`) value.
+The following variables for [dotnet-docker-update-dependencies](https://dev.azure.com/dnceng/internal/_build?definitionId=470) need to be updated for release:
+* `monitorXMinorVersion`: Make sure these are set to the correct values.
+* `monitorXQuality`: Normally this is daily, but should be set to release.
+* `monitorXStableBranding`: Normally this is false, but should be set to true when the package version is stable e.g. `dotnet-monitor.8.0.0.nupkg` (does not have a prerelease label on it such as `-preview.X` or `-rtm.X`.
+* `update-monitor-enabled`: Make sure this is true.
+* `update-dotnet-enabled`: When doing an ad-hoc run, make sure to **disable** this.
 
 ### Revert Pipeline Variable After Release
 
 After the release has been completed, this pipeline variable should be changed to the appropriate daily channel (e.g. `6.0/daily`).
 
+### Updating dependencies
+
+If necessary, update dependencies in the release branch. Most commonly this means picking up a new version of diagnostics packages.
+
+1. For new branches only, you need to setup a subscription using darc: `darc add-subscription --channel ".NET Core Tooling Release" --source-repo https://github.com/dotnet/diagnostics --target-repo https://github.com/dotnet/dotnet-monitor --target-branch release/8.x --update-frequency None --standard-automerge`
+1. Use `darc get-subscriptions --target-repo monitor` to see existing subscriptions.
+1. Use `darc trigger-subscriptions` to trigger an update. This will create a pull request that will update the Versions.details.xml file.
+
 ### Image Update Process
 
 The `dotnet-docker` repository typically updates the `nightly` branch with newer versions each morning by creating a pull request that targets the `nightly` branch with the new version information which needs to be approved by the `dotnet-docker` team. Upon completion, the `nightly` branch build will automatically run and create the new nightly images.
@@ -58,9 +83,15 @@ The nightly image is `mcr.microsoft.com/dotnet/nightly/monitor`. The tag list is
 
 The remainder of the release will automatically push NuGet packages to nuget.org, [tag](https://github.com/dotnet/dotnet-monitor/tags) the commit from the build with the release version, and add a new [GitHub release](https://github.com/dotnet/dotnet-monitor/releases).
 
+## Release to Storage Accounts
+
+1. Approximately 3 days before Docker image release, execute a dry-run of the [dotnet-monitor-release](https://dev.azure.com/dnceng/internal/_build?definitionId=1103) pipeline (`IsDryRun` should be checked; uncheck `IsTestRun`; under `Resources`, select the `dotnet monitor` build from which assets will be published). This will validate that the nupkg files can be published to the `dotnetcli` storage account and checksums can be published to the `dotnetclichecksums` storage account.
+1. The day before Docker image release, execute run of the [dotnet-monitor-release](https://dev.azure.com/dnceng/internal/_build?definitionId=1103) pipeline (uncheck `IsDryRun`; uncheck `IsTestRun`; under `Resources`, select the `dotnet monitor` build from which assets will be published). This will publish the nupkg files to the `dotnetcli` storage account and the checksums to the `dotnetclichecksums` storage account.
+
 ## Release Docker Images
 
 1. Contact `dotnet-docker` team with final version that should be released. This version should be latest version in the `nightly` branch.
+1. Docker image build from main branch requires assets to be published to `dotnetcli` and `dotnetclichecksums` storage accounts. See [Release to Storage Accounts](#Release-to-Storage-Accounts).
 1. The `dotnet-docker` team will merge from `nightly` branch to `main` branch and wait for `dotnet-monitor` team approval. Typically, these changes are completed the day before the release date.
 1. The `dotnet-docker` team will start the build ahead of the release and wait for the all-clear from `dotnet-monitor` team before publishing the images.
 

documentation/releaseNotes/releaseNotes.md

@@ -1,6 +1,4 @@
 Today we are releasing the next official preview of the `dotnet monitor` tool. This release includes:
 
-- Allow for pushing a message to a queue when writing to Azure egress (#163)
-- Allow for simplified process filter configuration (#636)
-- Allow `config show` command to list configuration sources (#277)
-
+- Add experience survey link (#1601)
+- Docker: Add CBL-Mariner 2.0 amd64 image

documentation/releaseNotes/releaseNotes.template.md

@@ -1,4 +1,4 @@
-Today we are releasing the next preview of the `dotnet monitor` tool. This release includes:
+Today we are releasing the next official preview of the `dotnet monitor` tool. This release includes:
 
 - ⚠️ [Here is a breaking change we did and it's work item] (#737)
 - [Here is a new feature we added and it's work item] (#737)

documentation/releaseNotes/releaseNotes.v7.0.0-preview.2.22154.3.md

@@ -0,0 +1,8 @@
+Today we are releasing the next official preview of the `dotnet monitor` tool. This release includes:
+
+- Allow for pushing a message to a queue when writing to Azure egress (#163)
+- Allow for simplified process filter configuration (#636)
+- Allow `config show` command to list configuration sources (#277)
+- ⚠️ Docker: Tool arguments moved to CMD instruction (#1279)
+
+\*⚠️ **_indicates a breaking change_**

documentation/releases.md

@@ -11,4 +11,4 @@
 
 | Version  | Latest Version | Release Date | Runtime Frameworks |
 |---|---|---|---|
-| 7.0 | [7.0.0 Preview 1](https://github.com/dotnet/dotnet-monitor/blob/main/documentation/releaseNotes/releaseNotes.v7.0.0-preview.1.22109.7.md) | February 17, 2022 | .NET 6 (with major roll forward)<br/>.NET 7 |
+| 7.0 | [7.0.0 Preview 2](https://github.com/dotnet/dotnet-monitor/blob/main/documentation/releaseNotes/releaseNotes.v7.0.0-preview.2.22154.3.md) | March 15th, 2022 | .NET 6 (with major roll forward)<br/>.NET 7 |

documentation/schema.json

@@ -775,7 +775,9 @@
           ],
           "description": "The number of times the action list may be executed before being throttled.",
           "format": "int32",
-          "default": 5
+          "default": 5,
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         },
         "ActionCountSlidingWindowDuration": {
           "type": [
@@ -1014,7 +1016,9 @@
             "null"
           ],
           "description": "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.",
-          "format": "int32"
+          "format": "int32",
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         }
       }
     },
@@ -1044,7 +1048,9 @@
           ],
           "description": "Amount of data points to store per metric.",
           "format": "int32",
-          "default": 3
+          "default": 3,
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         },
         "IncludeDefaultProviders": {
           "type": [
@@ -1509,7 +1515,9 @@
         "RequestCount": {
           "type": "integer",
           "description": "The threshold of the number of requests that start within the sliding window of time.",
-          "format": "int32"
+          "format": "int32",
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         },
         "SlidingWindowDuration": {
           "type": [
@@ -1552,7 +1560,9 @@
         "RequestCount": {
           "type": "integer",
           "description": "The threshold of the number of slow requests that start within the sliding window of time.",
-          "format": "int32"
+          "format": "int32",
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         },
         "RequestDuration": {
           "type": [
@@ -1614,7 +1624,9 @@
         "ResponseCount": {
           "type": "integer",
           "description": "The threshold number of responses with matching status codes.",
-          "format": "int32"
+          "format": "int32",
+          "maximum": 2147483647.0,
+          "minimum": 1.0
         },
         "SlidingWindowDuration": {
           "type": [