Leave trace flags out of comparison to create sibling activity

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

@@ -125,10 +125,11 @@ public void OnStartActivity(Activity activity, object payload)
         if (textMapPropagator is not TraceContextPropagator)
         {
             var ctx = textMapPropagator.Extract(default, request, HttpRequestHeaderValuesGetter);
-
+            var activityContext = new ActivityContext(activity.TraceId, activity.ParentSpanId, activity.ActivityTraceFlags, activity.TraceStateString, true);
             if (ctx.ActivityContext.IsValid()
-                && (activity.IdFormat != ActivityIdFormat.W3C || ctx.ActivityContext.TraceFlags == ActivityTraceFlags.Recorded)
-                && ctx.ActivityContext != new ActivityContext(activity.TraceId, activity.ParentSpanId, activity.ActivityTraceFlags, activity.TraceStateString, true))
+                && ((ctx.ActivityContext.TraceId != activityContext.TraceId)
+                    || (ctx.ActivityContext.SpanId != activityContext.SpanId)
+                    || (ctx.ActivityContext.TraceState != activityContext.TraceState)))
             {
                 // Create a new activity with its parent set from the extracted context.
                 // This makes the new activity as a "sibling" of the activity created by

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs

@@ -1072,67 +1072,6 @@ public async Task NoSiblingActivityCreatedWhenIdFormatIsW3CWithTraceFlagsNone()
 
         Assert.True(res.IsSuccessStatusCode);
         Assert.True(result);
-
-        // using (var client = this.factory
-        //    .CreateClient())
-        // {
-        //    var req = new HttpRequestMessage(HttpMethod.Get, "/api/values");
-        //    var traceParent = "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00";
-        //    req.Headers.Add("traceparent", traceParent);
-        //    var res = await client.SendAsync(req);
-        //    Assert.True(res.IsSuccessStatusCode);
-        //    Assert.Single(exportedItems);
-        //    Assert.Equal(traceParent, exportedItems[0].ParentId);
-        // }
-    }
-
-    [Fact(Skip = "TODO")]
-    public async Task SiblingActivityCreatedWhenIdFormatIsNotW3CWithTraceFlagsNone()
-    {
-        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();
-
-        var url = app.Urls.ToArray()[0];
-        var portNumber = url.Substring(url.LastIndexOf(':') + 1);
-
-        Activity.DefaultIdFormat = ActivityIdFormat.Hierarchical;
-
-        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());
-
-        Assert.True(res.IsSuccessStatusCode);
-        Assert.False(result);
-
-        // using (var client = this.factory
-        //    .CreateClient())
-        // {
-        //    var req = new HttpRequestMessage(HttpMethod.Get, "/api/values");
-        //    var traceParent = "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00";
-        //    req.Headers.Add("traceparent", traceParent);
-        //    var res = await client.SendAsync(req);
-        //    Assert.True(res.IsSuccessStatusCode);
-        //    Assert.Single(exportedItems);
-        //    Assert.Equal(traceParent, exportedItems[0].ParentId);
-        // }
     }
 #endif