Merge branch 'main' into dev/clguiman/sync-startup-hook-feature-branch

.github/linters/check-markdown-links-config.json

@@ -11,6 +11,9 @@
         },
         {
             "pattern": "^https://www\\.dotnetfoundation.org/.*"
+        },
+        {
+            "pattern": "^https://hub\\.docker\\.com/.*"
         }
     ],
     "aliveStatusCodes": [

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

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Check markdown links
-        uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368
+        uses: gaurav-nelson/github-action-markdown-link-check@7d83e59a57f3c201c76eed3d33dff64ec4452d27
         with:
           config-file: .github/linters/check-markdown-links-config.json
           use-quiet-mode: 'yes'

.github/workflows/submit-linter-suggestions.yml

@@ -49,7 +49,7 @@ jobs:
       # The default artifact download action doesn't support cross-workflow
       # artifacts, so use a 3rd party one.
       - name: 'Download linting results'
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
+        uses: dawidd6/action-download-artifact@deb3bb83256a78589fef6a7b942e5f2573ad7c13
         with:
           workflow: ${{env.workflow_name}}
           run_id: ${{github.event.workflow_run.id }}

.github/workflows/submit-to-do-issue.yml

@@ -35,7 +35,7 @@ jobs:
       # The default artifact download action doesn't support cross-workflow
       # artifacts, so use a 3rd party one.
       - name: 'Download linting results'
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
+        uses: dawidd6/action-download-artifact@deb3bb83256a78589fef6a7b942e5f2573ad7c13
         with:
           workflow: ${{env.workflow_name}}
           run_id: ${{github.event.workflow_run.id }}

documentation/api/definitions.md

@@ -54,7 +54,7 @@ Object describing the basic state of a collection rule for the executing instanc
 
 | Name | Type | Description |
 |---|---|---|
-| State | [CollectionRuleState](#collectionrulestate-63) | Indicates what state the collection rule is in for the current process. |
+| State | [CollectionRuleState](#collectionrulestate) | Indicates what state the collection rule is in for the current process. |
 | StateReason | string | Human-readable explanation for the current state of the collection rule. |
 
 ## CollectionRuleDetailedDescription
@@ -65,7 +65,7 @@ Object describing the detailed state of a collection rule for the executing inst
 
 | Name | Type | Description |
 |---|---|---|
-| State | [CollectionRuleState](#collectionrulestate-63) | Indicates what state the collection rule is in for the current process. |
+| State | [CollectionRuleState](#collectionrulestate) | Indicates what state the collection rule is in for the current process. |
 | StateReason | string | Human-readable explanation for the current state of the collection rule. |
 | LifetimeOccurrences | int | The number of times the trigger has executed for a process in its lifetime. |
 | SlidingWindowOccurrences | int | The number of times the trigger has executed within the current sliding window. |

documentation/api/stacks.md

@@ -62,7 +62,7 @@ Allowed schemes:
 ### Sample Request
 
 ```http
-GET /stack?pid=21632 HTTP/1.1
+GET /stacks?pid=21632 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 Accept: application/json
@@ -100,7 +100,7 @@ Location: localhost:52323/operations/67f07e40-5cca-4709-9062-26302c484f18
 ### Sample Request
 
 ```http
-GET /stack?pid=21632 HTTP/1.1
+GET /stacks?pid=21632 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 Accept: text/plain

documentation/configuration/in-process-features-configuration.md

@@ -4,6 +4,10 @@
 
 First Available: 8.0 Preview 7
 
+> [!NOTE]
+> In-process features are only supported when running dotnet-monitor in `Listen` mode. 
+> See [Diagnostic Port](./diagnostic-port-configuration.md) configuration for details.
+
 Some features of `dotnet monitor` require loading libraries into target applications. These libraries ship with `dotnet monitor` and are provisioned to be available to target applications using the `DefaultSharedPath` option in the [storage configuration](./storage-configuration.md) section. The following features require these in-process libraries to be used:
 
 - [Call Stacks](#call-stacks)

eng/Version.Details.xml

@@ -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.24270.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24304.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>35998bc24f3ce093f3cef0cc50e224f9b07847ca</Sha>
+      <Sha>1c854868f031c1fb9cb2e175baaab120a42b42fd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24270.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24304.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>35998bc24f3ce093f3cef0cc50e224f9b07847ca</Sha>
+      <Sha>1c854868f031c1fb9cb2e175baaab120a42b42fd</Sha>
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24209.3">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -22,33 +22,33 @@
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
       <Sha>b4d9a1334d5189172977ba8fddd00bda70161e4a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24266.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24270.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
+      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24266.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24270.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
+      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24266.3">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24270.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
+      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24266.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24270.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
+      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.103-servicing.24114.15">
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>68e8abb1d3e1a240a6e4c29dcd220aae91681676</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24266.3">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24270.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
+      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.527001">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.530401">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>35998bc24f3ce093f3cef0cc50e224f9b07847ca</Sha>
+      <Sha>1c854868f031c1fb9cb2e175baaab120a42b42fd</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>

eng/Versions.props

@@ -48,17 +48,17 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- dotnet/arcade references -->
-    <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24266.3</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24266.3</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24270.4</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24270.4</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24270.4</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
     <MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
     <VSRedistCommonAspNetCoreSharedFrameworkx6480Version>8.0.1-servicing.23580.8</VSRedistCommonAspNetCoreSharedFrameworkx6480Version>
     <!-- dotnet/command-line-api references -->
     <SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24270.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24270.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24304.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24304.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/installer references -->
     <MicrosoftDotnetSdkInternalVersion>8.0.103-servicing.24114.15</MicrosoftDotnetSdkInternalVersion>
     <!-- dotnet/roslyn-analyzers -->
@@ -67,7 +67,7 @@
     <MicrosoftNETCoreAppRuntimewinx64Version>8.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
     <VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.1-servicing.23580.1</VSRedistCommonNetCoreSharedFrameworkx6480Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.527001</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.530401</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>

eng/dependabot/independent/Versions.props

@@ -5,7 +5,7 @@
     <AzureIdentityVersion>1.11.3</AzureIdentityVersion>
     <AzureStorageBlobsVersion>12.20.0</AzureStorageBlobsVersion>
     <AzureStorageQueuesVersion>12.18.0</AzureStorageQueuesVersion>
-    <MicrosoftIdentityWebVersion>2.18.2</MicrosoftIdentityWebVersion>
+    <MicrosoftIdentityWebVersion>2.19.0</MicrosoftIdentityWebVersion>
     <MicrosoftOpenApiReadersVersion>1.6.14</MicrosoftOpenApiReadersVersion>
     <SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>

eng/dependabot/net6.0/Versions.props

@@ -10,6 +10,6 @@
     <!-- Microsoft.Extensions.Logging.Console -->
     <MicrosoftExtensionsLoggingConsole60Version>6.0.0</MicrosoftExtensionsLoggingConsole60Version>
     <!-- Microsoft.NETCore.App -->
-    <MicrosoftNETCoreApp60Version>6.0.30</MicrosoftNETCoreApp60Version>
+    <MicrosoftNETCoreApp60Version>6.0.31</MicrosoftNETCoreApp60Version>
   </PropertyGroup>
 </Project>

eng/dependabot/net7.0/Versions.props

@@ -10,6 +10,6 @@
     <!-- Microsoft.Extensions.Logging.Console -->
     <MicrosoftExtensionsLoggingConsole70Version>7.0.0</MicrosoftExtensionsLoggingConsole70Version>
     <!-- Microsoft.NETCore.App -->
-    <MicrosoftNETCoreApp70Version>7.0.19</MicrosoftNETCoreApp70Version>
+    <MicrosoftNETCoreApp70Version>7.0.20</MicrosoftNETCoreApp70Version>
   </PropertyGroup>
 </Project>

eng/dependabot/net8.0/Versions.props

@@ -10,6 +10,6 @@
     <!-- Microsoft.Extensions.Logging.Console -->
     <MicrosoftExtensionsLoggingConsole80Version>8.0.0</MicrosoftExtensionsLoggingConsole80Version>
     <!-- Microsoft.NETCore.App -->
-    <MicrosoftNETCoreApp80Version>8.0.5</MicrosoftNETCoreApp80Version>
+    <MicrosoftNETCoreApp80Version>8.0.6</MicrosoftNETCoreApp80Version>
   </PropertyGroup>
 </Project>

eng/pipelines/dotnet-monitor-cg.yml

@@ -5,6 +5,7 @@ schedules:
     include:
     - shipped/*
     exclude:
+    - shipped/7.3
     - shipped/7.2
     - shipped/7.1
   always: true

global.json

@@ -26,7 +26,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24266.3"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24270.4"
   }
 }

src/Microsoft.Diagnostics.Monitoring.WebApi/RequestThrottling/RequestLimit.cs

@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Diagnostics.Monitoring.WebApi
+{
+    public sealed record RequestLimit(string Key, int Limit);
+}

src/Microsoft.Diagnostics.Monitoring.WebApi/RequestThrottling/RequestLimitTracker.cs

@@ -27,19 +27,13 @@ private sealed class RequestCount : IDisposable
         private readonly ConcurrentDictionary<string, RequestCount> _requestCounts = new();
         private readonly ILogger<RequestLimitTracker> _logger;
 
-        public RequestLimitTracker(ILogger<RequestLimitTracker> logger)
+        public RequestLimitTracker(ILogger<RequestLimitTracker> logger, IEnumerable<RequestLimit> limits)
         {
-            //CONSIDER Should we have configuration for these?
+            foreach (RequestLimit requestLimit in limits)
+            {
+                _requestLimitTable.Add(requestLimit.Key, requestLimit.Limit);
+            }
 
-            _requestLimitTable.Add(Utilities.ArtifactType_Dump, 1);
-            _requestLimitTable.Add(Utilities.ArtifactType_GCDump, 1);
-            _requestLimitTable.Add(Utilities.ArtifactType_Logs, 3);
-            _requestLimitTable.Add(Utilities.ArtifactType_Trace, 3);
-            _requestLimitTable.Add(Utilities.ArtifactType_Metrics, 3);
-            _requestLimitTable.Add(Utilities.ArtifactType_Stacks, 1);
-            _requestLimitTable.Add(Utilities.ArtifactType_Exceptions, 1);
-            _requestLimitTable.Add(Utilities.ArtifactType_Parameters, 1);
-            _requestLimitTable.Add(Unlimited, int.MaxValue);
 
             _logger = logger;
         }

src/Profilers/MonitorProfiler/Communication/CommandServer.cpp

@@ -13,7 +13,10 @@ CommandServer::CommandServer(const std::shared_ptr<ILogger>& logger, ICorProfile
 {
 }
 
-HRESULT CommandServer::Start(const std::string& path, std::function<HRESULT(const IpcMessage& message)> callback)
+HRESULT CommandServer::Start(
+    const std::string& path,
+    std::function<HRESULT(const IpcMessage& message)> callback,
+    std::function<HRESULT(const IpcMessage& message)> validateMessageCallback)
 {
     if (_shutdown.load())
     {
@@ -31,6 +34,7 @@ HRESULT CommandServer::Start(const std::string& path, std::function<HRESULT(cons
 #endif
 
     _callback = callback;
+    _validateMessageCallback = validateMessageCallback;
 
     IfFailLogRet_(_logger, _server.Bind(path));
     _listeningThread = std::thread(&CommandServer::ListeningThread, this);
@@ -75,25 +79,39 @@ void CommandServer::ListeningThread()
         if (FAILED(hr))
         {
             _logger->Log(LogLevel::Error, _LS("Unexpected error when receiving data: 0x%08x"), hr);
+            // Best-effort shutdown, ignore the result.
+            client->Shutdown();
             continue;
         }
 
+        bool doEnqueueMessage = true;
+        hr = _validateMessageCallback(message);
+        if (FAILED(hr))
+        {
+            _logger->Log(LogLevel::Error, _LS("Failed to validate message: 0x%08x"), hr);
+            doEnqueueMessage = false;
+        }
+
         *reinterpret_cast<HRESULT*>(response.Payload.data()) = hr;
 
         hr = client->Send(response);
         if (FAILED(hr))
         {
             _logger->Log(LogLevel::Error, _LS("Unexpected error when sending data: 0x%08x"), hr);
-            continue;
+            doEnqueueMessage = false;
         }
 
         hr = client->Shutdown();
         if (FAILED(hr))
         {
             _logger->Log(LogLevel::Warning, _LS("Unexpected error during shutdown: 0x%08x"), hr);
+            // Not fatal, keep processing the message
         }
 
-        _clientQueue.Enqueue(message);
+        if (doEnqueueMessage)
+        {
+            _clientQueue.Enqueue(message);
+        }
     }
 }
 

src/Profilers/MonitorProfiler/Communication/CommandServer.h

@@ -19,7 +19,10 @@ class CommandServer final
 {
 public:
     CommandServer(const std::shared_ptr<ILogger>& logger, ICorProfilerInfo12* profilerInfo);
-    HRESULT Start(const std::string& path, std::function<HRESULT (const IpcMessage& message)> callback);
+    HRESULT Start(
+        const std::string& path,
+        std::function<HRESULT (const IpcMessage& message)> callback,
+        std::function<HRESULT (const IpcMessage& message)> validateMessageCallback);
     void Shutdown();
 
 private:
@@ -29,6 +32,8 @@ class CommandServer final
     std::atomic_bool _shutdown;
 
     std::function<HRESULT(const IpcMessage& message)> _callback;
+    std::function<HRESULT(const IpcMessage& message)> _validateMessageCallback;
+
     IpcCommServer _server;
 
     BlockingQueue<IpcMessage> _clientQueue;
@@ -38,4 +43,4 @@ class CommandServer final
     std::thread _clientThread;
 
     ComPtr<ICorProfilerInfo12> _profilerInfo;
-};
+};

src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.cpp

@@ -3,6 +3,14 @@
 
 #include "MessageCallbackManager.h"
 
+bool MessageCallbackManager::IsRegistered(unsigned short commandSet)
+{
+    std::lock_guard<std::mutex> lookupLock(m_lookupMutex);
+
+    std::function<HRESULT (const IpcMessage& message)> existingCallback;
+    return TryGetCallback(commandSet, existingCallback);
+}
+
 bool MessageCallbackManager::TryRegister(unsigned short commandSet, ManagedMessageCallback pCallback)
 {
     return TryRegister(commandSet, [pCallback](const IpcMessage& message)-> HRESULT
@@ -13,7 +21,8 @@ bool MessageCallbackManager::TryRegister(unsigned short commandSet, ManagedMessa
 
 bool MessageCallbackManager::TryRegister(unsigned short commandSet, std::function<HRESULT (const IpcMessage& message)> callback)
 {
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::lock_guard<std::mutex> dispatchLock(m_dispatchMutex);
+    std::lock_guard<std::mutex> lookupLock(m_lookupMutex);
 
     std::function<HRESULT (const IpcMessage& message)> existingCallback;
     if (TryGetCallback(commandSet, existingCallback))
@@ -27,7 +36,7 @@ bool MessageCallbackManager::TryRegister(unsigned short commandSet, std::functio
 
 HRESULT MessageCallbackManager::DispatchMessage(const IpcMessage& message)
 {
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::lock_guard<std::mutex> dispatchLock(m_dispatchMutex);
 
     std::function<HRESULT (const IpcMessage& message)> callback;
     if (!TryGetCallback(message.CommandSet, callback))
@@ -40,7 +49,8 @@ HRESULT MessageCallbackManager::DispatchMessage(const IpcMessage& message)
 
 void MessageCallbackManager::Unregister(unsigned short commandSet)
 {
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::lock_guard<std::mutex> dispatchLock(m_dispatchMutex);
+    std::lock_guard<std::mutex> lookupLock(m_lookupMutex);
 
     m_callbacks.erase(commandSet);
 }