Improve tests.

Author: dgarciarubio

TelemetryServices.OpenTelemetry.Tests/OpenTelemetryProviderBuilderExtensions_should.cs

@@ -51,7 +51,7 @@ public void Add_activity_source_by_telemetry_name_type()
             using var activity = telemetry.ActivitySource.StartActivity("TestActivity");
             var recordedActivities = _traceListener.Activities;
             Assert.NotNull(activity);
-            Assert.Contains(recordedActivities, a => a.DisplayName == activity.DisplayName);
+            Assert.Contains(activity, recordedActivities);
         });
     }
 
@@ -64,10 +64,13 @@ public async Task Add_meter_by_telemetry_name_type()
         await _hostBuilder.RunInHost(async host =>
         {
             var telemetry = host.Services.GetRequiredService<ITelemetry<TelemetryName>>();
-            var meter = telemetry.Meter.CreateCounter<int>("TestCounter");
-            meter.Add(1);
+            var counter = telemetry.Meter.CreateCounter<int>("TestCounter");
+            counter.Add(1);
             var recordedMetrics = await _metricListener.WaitForMetrics();
-            Assert.Contains(recordedMetrics, m => m.Name == meter.Name);
+            Assert.Contains(recordedMetrics, m =>
+                m.MeterName == telemetry.Meter.Name &&
+                m.Name == counter.Name
+            );
         });
     }
 

TelemetryServices.OpenTelemetry.Tests/TelemetryServicesBuilderExtensions_should.cs

@@ -46,7 +46,7 @@ public void Add_activity_source_to_open_telemetry_provider()
             using var activity = telemetry.ActivitySource.StartActivity("TestActivity");
             var recordedActivities = _traceListener.Activities;
             Assert.NotNull(activity);
-            Assert.Contains(recordedActivities, a => a.DisplayName == activity.DisplayName);
+            Assert.Contains(activity, recordedActivities);
         });
     }
 
@@ -59,10 +59,13 @@ public async Task Add_meter_to_open_telemetry_provider()
         await _hostBuilder.RunInHost(async host =>
         {
             var telemetry = host.Services.GetRequiredService<ITelemetry<TelemetryName>>();
-            var meter = telemetry.Meter.CreateCounter<int>("TestCounter");
-            meter.Add(1);
+            var counter = telemetry.Meter.CreateCounter<int>("TestCounter");
+            counter.Add(1);
             var recordedMetrics = await _metricListener.WaitForMetrics();
-            Assert.Contains(recordedMetrics, m => m.Name == meter.Name);
+            Assert.Contains(recordedMetrics, m =>
+                m.MeterName == telemetry.Meter.Name &&
+                m.Name == counter.Name
+            );
         });
     }
 

TelemetryServices.OpenTelemetry.Tests/TestDoubles/OpenTelemetryMetricListener.cs

@@ -17,18 +17,18 @@ public OpenTelemetryMetricListener()
     }
 
     public async Task<IEnumerable<Metric>> WaitForMetrics(int timeoutMilliseconds = _exportIntervalMilliseconds * 10)
-    {
-        using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(timeoutMilliseconds));
-        return await WaitForMetrics(cts.Token);
-    }
-
-    public async Task<IEnumerable<Metric>> WaitForMetrics(CancellationToken cancellationToken)
     {
         using var timer = new PeriodicTimer(TimeSpan.FromMilliseconds(_exportIntervalMilliseconds));
-        while (_exporter.Metrics.IsEmpty)
+        using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(timeoutMilliseconds));
+        do
         {
-            await timer.WaitForNextTickAsync(cancellationToken);
+            if (!_exporter.Metrics.IsEmpty)
+            {
+                return _exporter.Metrics;
+            }
+            await timer.WaitForNextTickAsync();
         }
+        while (!cts.Token.IsCancellationRequested);
         return _exporter.Metrics;
     }