[Infra] Fix flaky tests (#3369)

Author: martincostello

test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkIntegrationTests.cs

@@ -162,25 +162,26 @@ bool ActivityFilter(string? providerName, IDbCommand command)
         using var scope = SemanticConventionScope.Get(useNewConventions);
 
         var activities = new List<Activity>();
-        using var tracerProvider = Sdk.CreateTracerProviderBuilder()
+        using (Sdk.CreateTracerProviderBuilder()
             .AddInMemoryExporter(activities)
             .AddSqlClientInstrumentation()
             .AddEntityFrameworkCoreInstrumentation(options => options.Filter = ActivityFilter)
-            .Build();
-
-        var optionsBuilder = new DbContextOptionsBuilder<ItemsContext>();
+            .Build())
+        {
+            var optionsBuilder = new DbContextOptionsBuilder<ItemsContext>();
 
-        this.ConfigureProvider(provider, optionsBuilder);
+            this.ConfigureProvider(provider, optionsBuilder);
 
-        await using var context = new ItemsContext(optionsBuilder.Options);
+            await using var context = new ItemsContext(optionsBuilder.Options);
 
-        try
-        {
-            await context.Database.ExecuteSqlRawAsync(commandText);
-        }
-        catch
-        {
-            // Ignore
+            try
+            {
+                await context.Database.ExecuteSqlRawAsync(commandText);
+            }
+            catch
+            {
+                // Ignore
+            }
         }
 
         Assert.NotEmpty(activities);

test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventCountersMetricsTests.cs

@@ -220,7 +220,7 @@ private static double GetActualValue(Metric metric)
                 Thread.Sleep(100);
                 meterProvider.ForceFlush();
                 metric = exportedItems.FirstOrDefault(x => x.Name == expectedInstrumentName);
-                return metric != null;
+                return metric != null && Math.Abs(GetActualValue(metric)) > double.Epsilon;
             },
             10_000);