[Diagnostics] Include HTTP and MCP spans in diagnostic test snapshots

src/Directory.Packages.props

@@ -47,6 +47,8 @@
     <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageVersion Include="Polly" Version="8.6.5" />
     <PackageVersion Include="ProjNET" Version="2.0.0" />
     <PackageVersion Include="RabbitMQ.Client" Version="7.0.0" />

src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ActivityTestHelper.cs

@@ -19,6 +19,9 @@ public static IDisposable CaptureActivities(out object activities)
 
         var tracerProvider = Sdk.CreateTracerProviderBuilder()
             .AddHotChocolateInstrumentation()
+            .AddAspNetCoreInstrumentation()
+            .AddHttpClientInstrumentation()
+            .AddSource("Experimental.ModelContextProtocol")
             .SetSampler(new AlwaysOnSampler())
             .AddInMemoryExporter(exported)
             .Build()!;
@@ -102,7 +105,13 @@ public Capture(TracerProvider tracerProvider, List<Activity> exported)
         public OrderedDictionary<string, object?> Source
             => new()
             {
-                ["name"] = _exported.FirstOrDefault()?.Source.Name
+                // The first source name in stable (ordinal) order. Using the first exported
+                // activity is not deterministic once nested transport spans are involved,
+                // because the order in which sibling spans complete can vary between runs.
+                ["name"] = _exported
+                    .Select(a => a.Source.Name)
+                    .OrderBy(name => name, StringComparer.Ordinal)
+                    .FirstOrDefault()
             };
 
         [JsonProperty("activities", Order = 1)]

src/HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj

@@ -14,6 +14,8 @@
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
     <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
   </ItemGroup>
 
   <ItemGroup>

src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap

@@ -4,21 +4,68 @@
   },
   "activities": [
     {
-      "OperationName": "ExecuteHttpRequest",
-      "DisplayName": "GraphQL HTTP GET SDL",
-      "Kind": "Internal",
-      "Status": "Ok",
+      "OperationName": "Microsoft.AspNetCore.Hosting.HttpRequestIn",
+      "DisplayName": "GET /graphql/{**slug}",
+      "Kind": "Server",
+      "Status": "Unset",
       "tags": [
         {
-          "Key": "graphql.http.kind",
-          "Value": "HttpGetSchema"
+          "Key": "server.address",
+          "Value": "localhost"
         },
         {
-          "Key": "graphql.schema.name",
-          "Value": "_Default"
+          "Key": "server.port",
+          "Value": 5000
+        },
+        {
+          "Key": "url.query",
+          "Value": "?sdl"
+        },
+        {
+          "Key": "http.request.method",
+          "Value": "GET"
+        },
+        {
+          "Key": "url.scheme",
+          "Value": "http"
+        },
+        {
+          "Key": "url.path",
+          "Value": "/graphql"
+        },
+        {
+          "Key": "network.protocol.version",
+          "Value": "1.1"
+        },
+        {
+          "Key": "http.route",
+          "Value": "/graphql/{**slug}"
+        },
+        {
+          "Key": "http.response.status_code",
+          "Value": 200
         }
       ],
-      "event": []
+      "event": [],
+      "activities": [
+        {
+          "OperationName": "ExecuteHttpRequest",
+          "DisplayName": "GraphQL HTTP GET SDL",
+          "Kind": "Internal",
+          "Status": "Ok",
+          "tags": [
+            {
+              "Key": "graphql.http.kind",
+              "Value": "HttpGetSchema"
+            },
+            {
+              "Key": "graphql.schema.name",
+              "Value": "_Default"
+            }
+          ],
+          "event": []
+        }
+      ]
     }
   ]
 }