sync non-code with origin/main (#8025)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

.github/learning-path-sha.txt

@@ -1 +1 @@
-1091b7405ce8707714bc0a8a43d0c6c924d1112d
+414fc673021e3f7723ecb1b8aa24ca55ed59e547

.github/workflows/scan-for-to-do-comments.yml

@@ -27,7 +27,7 @@ jobs:
           COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: issue-todo
           path: issue/

.github/workflows/spellcheck.yml

@@ -17,23 +17,23 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: streetsidesoftware/cspell-action@ef95dc49d631fc2a9e9ea089ae2b2127b7c4588e
+      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
         name: Documentation spellcheck
         if: ${{ !cancelled() }}
         with:
             files: '**/*.md'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@ef95dc49d631fc2a9e9ea089ae2b2127b7c4588e
+      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
         name: Resx spellcheck
         if: ${{ !cancelled() }}
         with:
             files: 'src/**/*.resx'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@ef95dc49d631fc2a9e9ea089ae2b2127b7c4588e
+      - uses: streetsidesoftware/cspell-action@8485bb4b688c68384c2f6db7ad931f5e3e63f21c
         name: Source code spellcheck
         if: ${{ !cancelled() }}
         with:

.github/workflows/sync-branches.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
-        branch: ["release/8.0", "release/8.x", "release/9.x"]
+        branch: ["release/8.x", "release/9.0", "release/9.x"]
     name: 'Sync non-code to ${{ matrix.branch }}'
     runs-on: ubuntu-latest
     permissions:
@@ -52,12 +52,10 @@ jobs:
           auth_token: ${{ secrets.GITHUB_TOKEN }}
 
   sync-code:
-    # Disable code sync
-    if: false
-    #if: github.repository == 'dotnet/dotnet-monitor'
+    if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
-        branch: ["feature/9.x"]
+        branch: ["feature/10.0"]
     name: 'Sync branch with ${{ matrix.branch }}'
     runs-on: ubuntu-latest
     permissions:

documentation/api/definitions.md

@@ -530,6 +530,7 @@ Some properties will have non-null values for processes that are running on .NET
 | `commandLine` | string | The command line of the process (includes process path and arguments) |
 | `operatingSystem` | string | `.NET 5+` The operating system on which the process is running (e.g. `windows`, `linux`, `macos`).<br/>`.NET Core 3.1` A value of `null`. |
 | `processArchitecture` | string | `.NET 5+` The architecture of the process (e.g. `x64`, `x86`).<br/>`.NET Core 3.1` A value of `null`. |
+| `managedEntryPointAssemblyName` | string | `9.1+` The name of the managed entry point assembly. The entry point assembly is typically the assembly that contains the `Program` class for the application. |
 
 The `uid` property is useful for uniquely identifying a process when it is running in an environment where the process ID may not be unique (e.g. multiple containers within a Kubernetes pod will have entrypoint processes with process ID 1).
 

documentation/api/process-get.md

@@ -73,7 +73,8 @@ Content-Type: application/json
     "name": "dotnet",
     "commandLine": "\"C:\\Program Files\\dotnet\\dotnet.exe\" ConsoleApp1.dll",
     "operatingSystem": "Windows",
-    "processArchitecture": "x64"
+    "processArchitecture": "x64",
+    "managedEntryPointAssemblyName": "ConsoleApp1"
 }
 ```
 

documentation/configuration/default-process-configuration.md

@@ -4,7 +4,7 @@ Default process configuration is used to determine which process is used for met
 
 | Name | Type | Description |
 |---|---|---|
-| Key | string | Specifies which criteria to match on the process. Can be `ProcessId`, `ProcessName`, `CommandLine`. |
+| Key | string | Specifies which criteria to match on the process. Can be `ProcessId`, `ProcessName`, `CommandLine`, `ManagedEntryPointAssemblyName`. |
 | Value | string | The value to match against the process. |
 | MatchType | string | The type of match to perform. Can be `Exact` or `Contains` for sub-string matching. Both are case-insensitive.|
 
@@ -16,6 +16,7 @@ Optionally, a shorthand format allows you to omit the `Key` and `Value` terms an
 | ProcessId | string | Specifies that the corresponding value is the expected `ProcessId`. |
 | ProcessName | string | Specifies that the corresponding value is the expected `ProcessName`. |
 | CommandLine | string | Specifies that the corresponding value is the expected `CommandLine`.|
+| ManagedEntryPointAssemblyName | string | Specifies that the corresponding value is the expected `ManagedEntryPointAssemblyName`. |
 
 ## Examples
 
@@ -158,3 +159,73 @@ Optionally, a shorthand format allows you to omit the `Key` and `Value` terms an
     value: "1"
   ```
 </details>
+
+### Match MyApp.dll Entry Point
+
+<details>
+  <summary>JSON</summary>
+
+  ```json
+  {
+    "DefaultProcess": {
+      "Filters": [{
+        "Key": "ManagedEntryPointAssemblyName",
+        "Value": "MyApp"
+      }]
+    },
+  }
+  ```
+</details>
+
+<details>
+  <summary>Kubernetes ConfigMap</summary>
+
+  ```yaml
+  DefaultProcess__Filters__0__Key: "ManagedEntryPointAssemblyName"
+  DefaultProcess__Filters__0__Value: "MyApp"
+  ```
+</details>
+
+<details>
+  <summary>Kubernetes Environment Variables</summary>
+
+  ```yaml
+  - name: DotnetMonitor_DefaultProcess__Filters__0__Key
+    value: "ManagedEntryPointAssemblyName"
+  - name: DotnetMonitor_DefaultProcess__Filters__0__Value
+    value: "MyApp"
+  ```
+</details>
+
+### Match MyApp.dll Entry Point (Shorthand)
+
+<details>
+  <summary>JSON</summary>
+
+  ```json
+  {
+    "DefaultProcess": {
+      "Filters": [{
+        "ManagedEntryPointAssemblyName": "MyApp"
+      }]
+    },
+  }
+  ```
+</details>
+
+<details>
+  <summary>Kubernetes ConfigMap</summary>
+
+  ```yaml
+  DefaultProcess__Filters__0__ManagedEntryPointAssemblyName: "MyApp"
+  ```
+</details>
+
+<details>
+  <summary>Kubernetes Environment Variables</summary>
+
+  ```yaml
+  - name: DotnetMonitor_DefaultProcess__Filters__0__ManagedEntryPointAssemblyName
+    value: "MyApp"
+  ```
+</details>

documentation/docker-compose.md

@@ -12,65 +12,7 @@ Starting with .NET 8.0, both the sample ASP.NET application and dotnet-monitor r
 
 ## Example Deployment
 
-The following examples demonstrate a deployment of the dotnet-monitor container image monitoring an application container as services.
-
-<details>
-  <summary>.NET Monitor 8+</summary>
-
-```yaml
-# Tell us about your experience using dotnet monitor: https://aka.ms/dotnet-monitor-survey
-services:
-  app:
-    image: mcr.microsoft.com/dotnet/samples:aspnetapp-chiseled
-    ports:
-      - "8080:8080"
-    environment:
-      - DOTNET_DiagnosticPorts=/diag/dotnet-monitor.sock
-    volumes:
-      - diagvol:/diag
-    deploy:
-      resources:
-        limits:
-          cpus: '0.250'
-          memory: 512M
-
-  monitor:
-    image: mcr.microsoft.com/dotnet/monitor:8
-    # DO NOT use the --no-auth argument for deployments in production; this argument is used for demonstration
-    # purposes only in this example. Please continue reading after this example for further details.
-    command: ["collect", "--no-auth"]
-    ports:
-      - "52323:52323"
-      - "52325:52325"
-    environment:
-      - DOTNETMONITOR_DiagnosticPort__ConnectionMode=Listen
-      - DOTNETMONITOR_Storage__DefaultSharedPath=/diag
-      # ALWAYS use the HTTPS form of the URL for deployments in production; the removal of HTTPS is done for
-      # demonstration purposes only in this example. Please continue reading after this example for further details.
-      - DOTNETMONITOR_Urls=http://+:52323
-      # The metrics URL is set in the CMD instruction of the image by default. However, this deployment overrides that with the args setting; manually set the URL to the same value using configuration.
-      - DOTNETMONITOR_Metrics__Endpoints=http://+:52325
-      # The image will output logging in a json format by default, which is great for ingestion by tools such as Azure Monitor Log Analytics.
-      # Switch the logging format to simple for this sample for easier reading.
-      - Logging__Console__FormatterName=simple
-    volumes:
-      - diagvol:/diag
-    deploy:
-      resources:
-        reservations:
-          cpus: '0.050'
-          memory: 50M
-        limits:
-          cpus: '0.250'
-          memory: 256M
-
-volumes:
-  diagvol:
-    driver_opts:
-      type: tmpfs
-      device: tmpfs
-```
-</details>
+The [Docker Compose](../samples/Docker/compose.yaml) example demonstrates a deployment of the .NET Monitor 8 container image monitoring an application container as services.
 
 ## Example Details