Use WebApplicationFactory

open-telemetry · Dec 7, 2023 · a76e470 · a76e470
1 parent a3c6d65
commit a76e470
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
@@ -19,9 +19,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-#if NET7_0_OR_GREATER
-using Microsoft.AspNetCore.Http.Features;
-#endif
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
@@ -1038,39 +1035,37 @@ public async Task DiagnosticSourceExceptionCallBackIsNotReceivedForExceptionsHan
         Assert.Equal(2, numberOfSubscribedEvents);
     }
 
-#if NET7_0_OR_GREATER
+#if NET6_0_OR_GREATER
     [Fact]
-    public async Task NoSiblingActivityCreatedWhenIdFormatIsW3CWithTraceFlagsNone()
+    public async Task NoSiblingActivityCreatedWhenTraceFlagsNone()
     {
         this.tracerProvider = Sdk.CreateTracerProviderBuilder()
             .SetSampler(new AlwaysOnSampler())
             .AddAspNetCoreInstrumentation()
             .Build();
 
-        var builder = WebApplication.CreateBuilder();
-        builder.WebHost.UseUrls("http://*:0");
-        var app = builder.Build();
-
-        app.MapGet("/values", (HttpContext context) =>
-        {
-            var activity = context.Features.GetRequiredFeature<IHttpActivityFeature>().Activity;
-            var equal = Activity.Current.Id == activity.Id;
-
-            return Results.Ok(equal);
-        });
-
-        _ = app.RunAsync();
+        using var testFactory = this.factory
+            .WithWebHostBuilder(builder =>
+            {
+                builder.ConfigureTestServices(services =>
+                {
+                    this.tracerProvider = Sdk.CreateTracerProviderBuilder()
+                    .AddAspNetCoreInstrumentation()
+                    .Build();
+                });
 
-        var url = app.Urls.ToArray()[0];
-        var portNumber = url.Substring(url.LastIndexOf(':') + 1);
+                builder.ConfigureLogging(loggingBuilder => loggingBuilder.ClearProviders());
+            });
+        using var client = testFactory.CreateClient();
+        var request = new HttpRequestMessage(HttpMethod.Get, "/api/GetActivityEquality");
+        var traceId = ActivityTraceId.CreateRandom();
+        var spanId = ActivitySpanId.CreateRandom();
+        request.Headers.Add("traceparent", $"00-{traceId}-{spanId}-00");
 
-        using var client = new HttpClient();
-        var req = new HttpRequestMessage(HttpMethod.Get, $"http://localhost:{portNumber}/values");
-        req.Headers.Add("traceparent", "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00");
-        var res = await client.SendAsync(req);
-        var result = bool.Parse(await res.Content.ReadAsStringAsync());
+        var response = await client.SendAsync(request);
+        var result = bool.Parse(await response.Content.ReadAsStringAsync());
 
-        Assert.True(res.IsSuccessStatusCode);
+        Assert.True(response.IsSuccessStatusCode);
         Assert.True(result);
     }
 #endif

diff --git a/test/TestApp.AspNetCore/Controllers/ChildActivityController.cs b/test/TestApp.AspNetCore/Controllers/ChildActivityController.cs
@@ -15,6 +15,7 @@
 // </copyright>
 
 using System.Diagnostics;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc;
 using OpenTelemetry;
 
@@ -47,4 +48,13 @@ public IReadOnlyDictionary<string, string> GetChildActivityBaggageContext()
         var result = Baggage.Current.GetBaggage();
         return result;
     }
+
+    [HttpGet]
+    [Route("api/GetActivityEquality")]
+    public bool GetActivityEquality()
+    {
+        var activity = this.HttpContext.Features.GetRequiredFeature<IHttpActivityFeature>().Activity;
+        var equal = Activity.Current?.Id == activity.Id;
+        return equal;
+    }
 }
diff --git a/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj b/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Features" />
     <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>