Fix OTel review comments: typo, IDisposable, deduplicate completed co… (#7510)

Author: Evangelink

src/Platform/Microsoft.Testing.Platform/Services/TestApplicationResult.cs

@@ -12,7 +12,7 @@
 
 namespace Microsoft.Testing.Platform.Services;
 
-internal sealed class TestApplicationResult : ITestApplicationProcessExitCode, IOutputDeviceDataProducer
+internal sealed class TestApplicationResult : ITestApplicationProcessExitCode, IOutputDeviceDataProducer, IDisposable
 {
     private readonly IOutputDevice _outputService;
     private readonly ICommandLineOptions _commandLineOptions;
@@ -171,4 +171,7 @@ public async Task SetTestAdapterTestSessionFailureAsync(string errorMessage, Can
 
     public Statistics GetStatistics()
         => new() { TotalRanTests = _totalRanTests, TotalFailedTests = _failedTestsCount };
+
+    public void Dispose()
+        => _openTelemetryResultHandler?.Dispose();
 }

src/Platform/Microsoft.Testing.Platform/Telemetry/OpenTelemetryResultHandler.cs

@@ -6,7 +6,7 @@
 
 namespace Microsoft.Testing.Platform.Telemetry;
 
-internal sealed class OpenTelemetryResultHandler
+internal sealed class OpenTelemetryResultHandler : IDisposable
 {
     private readonly IPlatformOpenTelemetryService _otelService;
     private readonly IEnvironment _environment;
@@ -16,9 +16,10 @@ internal sealed class OpenTelemetryResultHandler
     private readonly ICounter<int> _totalPassedTests;
     private readonly ICounter<int> _totalFailedTests;
     private readonly ICounter<int> _totalSkippedTests;
-    private readonly ICounter<int> _totalUnknownedTests;
+    private readonly ICounter<int> _totalUnknownTests;
     private readonly IHistogram<double> _totalDuration;
     private readonly Dictionary<TestNodeUid, IPlatformActivity> _testActivities = [];
+    private bool _disposed;
 
     public OpenTelemetryResultHandler(IPlatformOpenTelemetryService otelService, IEnvironment environment)
     {
@@ -30,7 +31,7 @@ public OpenTelemetryResultHandler(IPlatformOpenTelemetryService otelService, IEn
         _totalPassedTests = otelService.CreateCounter<int>("tests.passed");
         _totalFailedTests = otelService.CreateCounter<int>("tests.failed");
         _totalSkippedTests = otelService.CreateCounter<int>("tests.skipped");
-        _totalUnknownedTests = otelService.CreateCounter<int>("tests.unknown");
+        _totalUnknownTests = otelService.CreateCounter<int>("tests.unknown");
         _totalDuration = otelService.CreateHistogram<double>("tests.duration");
     }
 
@@ -40,21 +41,18 @@ internal void NotifyDiscovered()
     internal void NotifyPassed(TestNode testNode, TestNodeStateProperty stateProperty)
     {
         _totalPassedTests.Add(1);
-        _totalCompletedTests.Add(1);
         HandleTestResult(testNode, stateProperty);
     }
 
     internal void NotifyFailed(TestNode testNode, TestNodeStateProperty stateProperty)
     {
         _totalFailedTests.Add(1);
-        _totalCompletedTests.Add(1);
         HandleTestResult(testNode, stateProperty);
     }
 
     internal void NotifySkipped(TestNode testNode, TestNodeStateProperty stateProperty)
     {
         _totalSkippedTests.Add(1);
-        _totalCompletedTests.Add(1);
         HandleTestResult(testNode, stateProperty);
     }
 
@@ -73,7 +71,23 @@ internal void NotifyInProgress(TestNode testNode, TestNodeUid? parentUid)
     }
 
     internal void NotifyUnknown()
-        => _totalUnknownedTests.Add(1);
+        => _totalUnknownTests.Add(1);
+
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+        foreach (IPlatformActivity activity in _testActivities.Values)
+        {
+            activity.Dispose();
+        }
+
+        _testActivities.Clear();
+    }
 
     private static IEnumerable<KeyValuePair<string, object?>> GetTestInitialInfo(TestNode testNode, TestNodeUid? parentUid)
     {
@@ -107,6 +121,8 @@ internal void NotifyUnknown()
 
     private void HandleTestResult(TestNode testNode, TestNodeStateProperty stateProperty)
     {
+        _totalCompletedTests.Add(1);
+
         if (!_testActivities.TryGetValue(testNode.Uid, out IPlatformActivity? activity))
         {
             return;

test/UnitTests/Microsoft.Testing.Platform.UnitTests/Services/TestApplicationResultTests.cs

@@ -12,11 +12,13 @@
 namespace Microsoft.Testing.Platform.UnitTests;
 
 [TestClass]
-public sealed class TestApplicationResultTests
+public sealed class TestApplicationResultTests : IDisposable
 {
     private readonly TestApplicationResult _testApplicationResult
         = new(new Mock<IOutputDevice>().Object, new Mock<ICommandLineOptions>().Object, new Mock<IEnvironment>().Object, new Mock<IStopPoliciesService>().Object, null);
 
+    public void Dispose() => _testApplicationResult.Dispose();
+
     [TestMethod]
     public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_ZeroTestsRan()
     {