Rename collectmetrics back to livemetrics

documentation/README.md

@@ -19,7 +19,7 @@ When running a dotnet application, differences in diverse local and production e
     - [`/gcdump`](./api/gcdump.md)
     - [`/trace`](./api/trace.md)
     - [`/metrics`](./api/metrics.md)
-    - [`/collectmetrics`](./api/collectmetrics.md)
+    - [`/livemetrics`](./api/livemetrics.md)
     - [`/logs`](./api/logs.md)
     - [`/info`](./api/info.md)
     - [`/operations`](.api/operations.md)

documentation/api/collectmetrics-custom.md → documentation/api/livemetrics-custom.md

@@ -1,11 +1,11 @@
-# Collectmetrics - Get Custom
+# Livemetrics - Get Custom
 
 Captures metrics for a process, with the ability to specify custom metrics.
 
 ## HTTP Route
 
 ```http
-POST /collectmetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
+POST /livemetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
 ```
 
 > **NOTE:** Process information (IDs, names, environment, etc) may change between invocations of these APIs. Processes may start or stop between API invocations, causing this information to change.
@@ -58,7 +58,7 @@ The expected content type is `application/json`.
 ### Sample Request
 
 ```http
-GET /collectmetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
+GET /livemetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 

documentation/api/collectmetrics-get.md → documentation/api/livemetrics-get.md

@@ -1,4 +1,4 @@
-# Collectmetrics - Get
+# Livemetrics - Get
 
 Captures metrics for a chosen process.
 
@@ -7,7 +7,7 @@ Captures metrics for a chosen process.
 ## HTTP Route
 
 ```http
-GET /collectmetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
+GET /livemetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
 ```
 
 > **NOTE:** Process information (IDs, names, environment, etc) may change between invocations of these APIs. Processes may start or stop between API invocations, causing this information to change.
@@ -54,7 +54,7 @@ Allowed schemes:
 ### Sample Request
 
 ```http
-GET /collectmetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
+GET /livemetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 ```

documentation/api/livemetrics.md

@@ -0,0 +1,6 @@
+# Live Metrics
+
+| Operation | Description |
+|---|---|
+| [Live Metrics](livemetrics-get.md) | Captures metrics using the default metric providers. |
+| [Live Custom Metrics](livemetrics-custom.md) | Captures metrics using custom metric providers. |

documentation/openapi.json

@@ -799,7 +799,7 @@
         }
       }
     },
-    "/collectmetrics": {
+    "/livemetrics": {
       "get": {
         "tags": [
           "Diag"

documentation/releaseNotes/releaseNotes.md

@@ -1,5 +1,5 @@
 Today we are releasing the next official preview of the `dotnet-monitor` tool. This release includes:
 
-- Added a new HTTP route (`/collectmetrics`) to collect metrics on demand. (#68)
+- Added a new HTTP route (`/livemetrics`) to collect metrics on demand. (#68)
 
 \*⚠️ **_indicates a breaking change_**

src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.Metrics.cs

@@ -30,7 +30,7 @@ partial class DiagController
         /// <param name="durationSeconds">The duration of the metrics session (in seconds).</param>
         /// <param name="metricsIntervalSeconds">The reporting interval (in seconds) for event counters.</param>
         /// <param name="egressProvider">The egress provider to which the metrics are saved.</param>
-        [HttpGet("collectmetrics", Name = nameof(CaptureMetrics))]
+        [HttpGet("livemetrics", Name = nameof(CaptureMetrics))]
         [ProducesWithProblemDetails(ContentTypes.ApplicationJsonSequence)]
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status429TooManyRequests)]
         [ProducesResponseType(typeof(void), StatusCodes.Status202Accepted)]
@@ -91,7 +91,7 @@ public Task<ActionResult> CaptureMetrics(
         /// <param name="durationSeconds">The duration of the metrics session (in seconds).</param>
         /// <param name="metricsIntervalSeconds">The reporting interval (in seconds) for event counters.</param>
         /// <param name="egressProvider">The egress provider to which the metrics are saved.</param>
-        [HttpPost("collectmetrics", Name = nameof(CaptureMetricsCustom))]
+        [HttpPost("livemetrics", Name = nameof(CaptureMetricsCustom))]
         [ProducesWithProblemDetails(ContentTypes.ApplicationJsonSequence)]
         [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status429TooManyRequests)]
         [ProducesResponseType(typeof(void), StatusCodes.Status202Accepted)]

src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs

@@ -42,7 +42,7 @@ public partial class DiagController : ControllerBase
         public const string ArtifactType_GCDump = "gcdump";
         public const string ArtifactType_Logs = "logs";
         public const string ArtifactType_Trace = "trace";
-        public const string ArtifactType_Metrics = "collectmetrics";
+        public const string ArtifactType_Metrics = "livemetrics";
 
         private const Models.TraceProfile DefaultTraceProfiles = Models.TraceProfile.Cpu | Models.TraceProfile.Http | Models.TraceProfile.Metrics;
         private static readonly MediaTypeHeaderValue NdJsonHeader = new MediaTypeHeaderValue(ContentTypes.ApplicationNdJson);

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/HttpApi/ApiClient.cs

@@ -353,7 +353,7 @@ public Task<ResponseStreamHolder> CaptureMetricsAsync(int processId, int duratio
 
         private async Task<ResponseStreamHolder> CaptureMetricsAsync(int processId, int durationSeconds, int refreshInterval, HttpMethod method, HttpContent content, CancellationToken token)
         {
-            string uri = FormattableString.Invariant($"/collectmetrics?pid={processId}&durationSeconds={durationSeconds}&metricsIntervalSeconds={refreshInterval}");
+            string uri = FormattableString.Invariant($"/livemetrics?pid={processId}&durationSeconds={durationSeconds}&metricsIntervalSeconds={refreshInterval}");
 
             using HttpRequestMessage request = new(method, uri);
             request.Headers.Add(HeaderNames.Accept, ContentTypes.ApplicationJsonSequence);

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/LiveMetricsTests.cs

@@ -30,12 +30,12 @@
 namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests
 {
     [Collection(DefaultCollectionFixture.Name)]
-    public class CollectMetricsTests
+    public class LiveMetricsTests
     {
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly ITestOutputHelper _outputHelper;
 
-        public CollectMetricsTests(ITestOutputHelper outputHelper, ServiceProviderFixture serviceProviderFixture)
+        public LiveMetricsTests(ITestOutputHelper outputHelper, ServiceProviderFixture serviceProviderFixture)
         {
             _httpClientFactory = serviceProviderFixture.ServiceProvider.GetService<IHttpClientFactory>();
             _outputHelper = outputHelper;