Remove Moq from Instrumentation.EntityFrameworkCore.Tests (#1479)

open-telemetry · Dec 9, 2023 · 7567a9f · 7567a9f
1 parent 707d9c0
commit 7567a9f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 42 deletions.
diff --git a/...metry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs b/...metry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Moq;
 using OpenTelemetry.Instrumentation.EntityFrameworkCore.Implementation;
 using OpenTelemetry.Trace;
 using Xunit;
@@ -35,9 +35,9 @@ public EntityFrameworkDiagnosticListenerTests()
     [Fact]
     public void EntityFrameworkContextEventsInstrumentedTest()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation().Build();
 
         using (var context = new ItemsContext(this.contextOptions))
@@ -50,20 +50,19 @@ public void EntityFrameworkContextEventsInstrumentedTest()
             Assert.Equal("ItemTwo", items[2].Name);
         }
 
-        Assert.Equal(3, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
+        Assert.Single(exportedItems);
+        var activity = exportedItems[0];
 
         VerifyActivityData(activity);
     }
 
     [Fact]
     public void EntityFrameworkEnrichDisplayNameWithEnrichWithIDbCommand()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         var expectedDisplayName = "Text main";
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation(options =>
             {
                 options.EnrichWithIDbCommand = (activity1, command) =>
@@ -84,19 +83,18 @@ public void EntityFrameworkEnrichDisplayNameWithEnrichWithIDbCommand()
             Assert.Equal("ItemTwo", items[2].Name);
         }
 
-        Assert.Equal(3, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
+        Assert.Single(exportedItems);
+        var activity = exportedItems[0];
 
         VerifyActivityData(activity, altDisplayName: $"{expectedDisplayName}");
     }
 
     [Fact]
     public void EntityFrameworkContextExceptionEventsInstrumentedTest()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation()
             .Build();
 
@@ -112,19 +110,18 @@ public void EntityFrameworkContextExceptionEventsInstrumentedTest()
             }
         }
 
-        Assert.Equal(3, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
+        Assert.Single(exportedItems);
+        var activity = exportedItems[0];
 
         VerifyActivityData(activity, isError: true);
     }
 
     [Fact]
     public void ShouldNotCollectTelemetryWhenFilterEvaluatesToFalseByDbCommand()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation(options =>
             {
                 options.Filter = (_, command) => !command.CommandText.Contains("Item", StringComparison.OrdinalIgnoreCase);
@@ -135,20 +132,15 @@ public void ShouldNotCollectTelemetryWhenFilterEvaluatesToFalseByDbCommand()
             _ = context.Set<Item>().OrderBy(e => e.Name).ToList();
         }
 
-        Assert.Equal(2, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
-
-        Assert.False(activity.IsAllDataRequested);
-        Assert.False(activity.ActivityTraceFlags.HasFlag(ActivityTraceFlags.Recorded));
+        Assert.Empty(exportedItems);
     }
 
     [Fact]
     public void ShouldCollectTelemetryWhenFilterEvaluatesToTrueByDbCommand()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation(options =>
             {
                 options.Filter = (_, command) => command.CommandText.Contains("Item", StringComparison.OrdinalIgnoreCase);
@@ -159,9 +151,8 @@ public void ShouldCollectTelemetryWhenFilterEvaluatesToTrueByDbCommand()
             _ = context.Set<Item>().OrderBy(e => e.Name).ToList();
         }
 
-        Assert.Equal(3, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
+        Assert.Single(exportedItems);
+        var activity = exportedItems[0];
 
         Assert.True(activity.IsAllDataRequested);
         Assert.True(activity.ActivityTraceFlags.HasFlag(ActivityTraceFlags.Recorded));
@@ -189,9 +180,9 @@ public void ShouldCollectTelemetryWhenFilterEvaluatesToTrueByDbCommand()
     [InlineData("Teradata.EntityFrameworkCore")]
     public void ShouldNotCollectTelemetryWhenFilterEvaluatesToFalseByProviderName(string provider)
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation(options =>
             {
                 options.Filter = (providerName, _) => providerName != null && providerName.Equals(provider, StringComparison.OrdinalIgnoreCase);
@@ -202,20 +193,15 @@ public void ShouldNotCollectTelemetryWhenFilterEvaluatesToFalseByProviderName(st
             _ = context.Set<Item>().OrderBy(e => e.Name).ToList();
         }
 
-        Assert.Equal(2, activityProcessor.Invocations.Count);
-
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
-
-        Assert.False(activity.IsAllDataRequested);
-        Assert.False(activity.ActivityTraceFlags.HasFlag(ActivityTraceFlags.Recorded));
+        Assert.Empty(exportedItems);
     }
 
     [Fact]
     public void ShouldCollectTelemetryWhenFilterEvaluatesToTrueByProviderName()
     {
-        var activityProcessor = new Mock<BaseProcessor<Activity>>();
+        var exportedItems = new List<Activity>();
         using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
-            .AddProcessor(activityProcessor.Object)
+            .AddInMemoryExporter(exportedItems)
             .AddEntityFrameworkCoreInstrumentation(options =>
             {
                 options.Filter = (providerName, _) => providerName != null && providerName.Equals("Microsoft.EntityFrameworkCore.Sqlite", StringComparison.OrdinalIgnoreCase);
@@ -226,9 +212,9 @@ public void ShouldCollectTelemetryWhenFilterEvaluatesToTrueByProviderName()
             _ = context.Set<Item>().OrderBy(e => e.Name).ToList();
         }
 
-        Assert.Equal(3, activityProcessor.Invocations.Count);
+        Assert.Single(exportedItems);
+        var activity = exportedItems[0];
 
-        var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];
         Assert.True(activity.IsAllDataRequested);
         Assert.True(activity.ActivityTraceFlags.HasFlag(ActivityTraceFlags.Recorded));
     }

diff --git a/....EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj b/....EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="$(MoqPkgVer)" />
+    <PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryPkgVer)" />
   </ItemGroup>
 
   <ItemGroup>