diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 59efaed4d44..d559d3b0cc9 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -46,6 +46,7 @@ + diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ActivityTestHelper.cs b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ActivityTestHelper.cs index aa027f62c9a..21e566de3ce 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ActivityTestHelper.cs +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ActivityTestHelper.cs @@ -1,6 +1,8 @@ using System.Diagnostics; using System.Text.RegularExpressions; -using HotChocolate.Utilities; +using Newtonsoft.Json; +using OpenTelemetry; +using OpenTelemetry.Trace; namespace HotChocolate.Diagnostics; @@ -13,94 +15,45 @@ public static partial class ActivityTestHelper public static IDisposable CaptureActivities(out object activities) { - var sync = new object(); - var listener = new ActivityListener(); - var root = new OrderedDictionary(); - var lookup = new Dictionary>(); - var spanLookup = new Dictionary>(); - Activity rootActivity = null!; - - listener.ShouldListenTo = source => source.Name.EqualsOrdinal("HotChocolate.Diagnostics"); - listener.ActivityStarted = a => - { - lock (sync) - { - if (a.Parent is null - && a.OperationName.EqualsOrdinal("ExecuteHttpRequest") - && lookup.TryGetValue(rootActivity, out var parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - } + var exported = new List(); - if (a.Parent is not null - && lookup.TryGetValue(a.Parent, out parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - spanLookup[a.SpanId] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - return; - } - - if (a.Parent is null - && a.ParentSpanId != default - && spanLookup.TryGetValue(a.ParentSpanId, out parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - spanLookup[a.SpanId] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - } - } - }; - listener.ActivityStopped = SerializeActivity; - listener.Sample = (ref ActivityCreationOptions _) => - ActivitySamplingResult.AllData; - ActivitySource.AddActivityListener(listener); - - rootActivity = HotChocolateActivitySource.Source.StartActivity()!; - rootActivity.SetCustomProperty("test.data", root); - lookup[rootActivity] = root; - spanLookup[rootActivity.SpanId] = root; - - activities = root; - return new Session(rootActivity, listener); + var tracerProvider = Sdk.CreateTracerProviderBuilder() + .AddHotChocolateInstrumentation() + .SetSampler(new AlwaysOnSampler()) + .AddInMemoryExporter(exported) + .Build()!; + + var capture = new Capture(tracerProvider, exported); + activities = capture; + return capture; } - private static void RegisterActivity( + private static OrderedDictionary SerializeActivity( Activity activity, - OrderedDictionary parent) + IReadOnlyDictionary> byParent) { - if (!(parent.TryGetValue("activities", out var value) && value is List children)) + var data = new OrderedDictionary { - children = []; - parent["activities"] = children; - } - - var data = new OrderedDictionary(); - activity.SetCustomProperty("test.data", data); - SerializeActivity(activity); - children.Add(data); - } - - private static void SerializeActivity(Activity activity) - { - var data = (OrderedDictionary?)activity.GetCustomProperty("test.data"); + ["OperationName"] = activity.OperationName, + ["DisplayName"] = activity.DisplayName, + ["Kind"] = activity.Kind, + ["Status"] = activity.Status, + ["tags"] = activity.TagObjects, + ["event"] = activity.Events.Select(e => new + { + e.Name, + Tags = ScrubEventTags(e.Tags) + }) + }; - if (data is null) + if (byParent.TryGetValue(activity.SpanId, out var children) && children.Count > 0) { - return; + data["activities"] = children + .Select(c => SerializeActivity(c, byParent)) + .ToList(); } - data["OperationName"] = activity.OperationName; - data["DisplayName"] = activity.DisplayName; - data["Kind"] = activity.Kind; - data["Status"] = activity.Status; - data["tags"] = activity.TagObjects; - data["event"] = activity.Events.Select(t => new - { - t.Name, - Tags = ScrubEventTags(t.Tags) - }); + return data; } private static IEnumerable> ScrubEventTags( @@ -134,21 +87,42 @@ private static void SerializeActivity(Activity activity) } } - private sealed class Session : IDisposable + private sealed class Capture : IDisposable { - private readonly Activity _activity; - private readonly ActivityListener _listener; + private readonly TracerProvider _tracerProvider; + private readonly List _exported; - public Session(Activity activity, ActivityListener listener) + public Capture(TracerProvider tracerProvider, List exported) { - _activity = activity; - _listener = listener; + _tracerProvider = tracerProvider; + _exported = exported; } - public void Dispose() + [JsonProperty("source", Order = 0)] + public OrderedDictionary Source + => new() + { + ["name"] = _exported.FirstOrDefault()?.Source.Name + }; + + [JsonProperty("activities", Order = 1)] + public IReadOnlyList> Activities { - _activity.Dispose(); - _listener.Dispose(); + get + { + var spanIds = new HashSet(_exported.Select(a => a.SpanId)); + var byParent = _exported + .GroupBy(a => a.ParentSpanId) + .ToDictionary(g => g.Key, g => g.OrderBy(a => a.StartTimeUtc).ToList()); + + return _exported + .Where(a => a.ParentSpanId == default || !spanIds.Contains(a.ParentSpanId)) + .OrderBy(a => a.StartTimeUtc) + .Select(root => SerializeActivity(root, byParent)) + .ToList(); + } } + + public void Dispose() => _tracerProvider.Dispose(); } } diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj index 2f7b559fa8a..17be57e9f89 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj @@ -11,6 +11,11 @@ + + + + + Always diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Emits_Activity.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Emits_Activity.snap index 780b2631e19..c4697070be9 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Emits_Activity.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Emits_Activity.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL DataLoader Dispatch", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Tracks_Dispatch_Events.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Tracks_Dispatch_Events.snap index 5547359e38b..4efdd90340f 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Tracks_Dispatch_Events.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityDataLoaderDiagnosticListenerTests.Run_Batch_Dispatch_Coordinator_Tracks_Dispatch_Events.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL DataLoader Dispatch", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.AllScopes_IncludesExecuteRequestAndParseDocumentSpans.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.AllScopes_IncludesExecuteRequestAndParseDocumentSpans.snap index 0c917ed38ec..70f37607f21 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.AllScopes_IncludesExecuteRequestAndParseDocumentSpans.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.AllScopes_IncludesExecuteRequestAndParseDocumentSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap index 434adc4dcf4..a164840f28e 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap index a5843ae49e8..cadca2a10d8 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ComplexityAnalysis_Enabled_RecordsCostInSpan.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ComplexityAnalysis_Enabled_RecordsCostInSpan.snap index 2bc385740f6..280456a3876 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ComplexityAnalysis_Enabled_RecordsCostInSpan.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ComplexityAnalysis_Enabled_RecordsCostInSpan.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndCompile_LimitsSpans.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndCompile_LimitsSpans.snap index da4ac328dd2..e7563a93ec9 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndCompile_LimitsSpans.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndCompile_LimitsSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_RecordsBatchSpan.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_RecordsBatchSpan.snap index 89279334494..ee9afd9826a 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_RecordsBatchSpan.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_RecordsBatchSpan.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_With_Keys_RecordsBatchSpan.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_With_Keys_RecordsBatchSpan.snap index aa9036f1b32..14ec0a4c843 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_With_Keys_RecordsBatchSpan.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DataLoader_BatchExecution_With_Keys_RecordsBatchSpan.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap index 9a847b6550e..f1be0165b6f 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap index c176dc90d73..9f753dbe532 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap index 9ad73529430..2c6615c0f4d 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap index cdea6ccdfaa..7ec6ff1ee4c 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithExtensionsCode_SetsErrorTypeFromCode.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithExtensionsCode_SetsErrorTypeFromCode.snap index c1ee2364516..e12569e0fd1 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithExtensionsCode_SetsErrorTypeFromCode.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithExtensionsCode_SetsErrorTypeFromCode.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithoutExtensionsCode_FallsBackToExecutionError.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithoutExtensionsCode_FallsBackToExecutionError.snap index ab8e95d578f..c157dd50ba1 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithoutExtensionsCode_FallsBackToExecutionError.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.GraphQLError_WithoutExtensionsCode_FallsBackToExecutionError.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.MaxErrorEvents_CapsErrorEventsOnRootSpan.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.MaxErrorEvents_CapsErrorEventsOnRootSpan.snap index 1afa6c5a7e0..7d708404b8f 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.MaxErrorEvents_CapsErrorEventsOnRootSpan.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.MaxErrorEvents_CapsErrorEventsOnRootSpan.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap index 234a7e2dcb3..918b5af9694 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap index c72d135b9e6..75330bd51c0 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_AtRootLevel_MarksOperationAsError.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_AtRootLevel_MarksOperationAsError.snap index b74114cd832..7d3ebcb60bc 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_AtRootLevel_MarksOperationAsError.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_AtRootLevel_MarksOperationAsError.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_DeepInTree_MarksNestedFieldAsError.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_DeepInTree_MarksNestedFieldAsError.snap index 0f5ee4da9d4..c008e5c6516 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_DeepInTree_MarksNestedFieldAsError.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverError_DeepInTree_MarksNestedFieldAsError.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverException_OnNullableField_SetsErrorTypeToExceptionTypeName.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverException_OnNullableField_SetsErrorTypeToExceptionTypeName.snap index 0746a4148f2..5a51853a6a8 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverException_OnNullableField_SetsErrorTypeToExceptionTypeName.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ResolverException_OnNullableField_SetsErrorTypeToExceptionTypeName.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEventError_Records_Subscription_Event_Error.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEventError_Records_Subscription_Event_Error.snap index 7c721e3a550..c2cc9edaf4a 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEventError_Records_Subscription_Event_Error.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEventError_Records_Subscription_Event_Error.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap index b3acc4454c6..e9a7c449d0d 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap index 9a847b6550e..f1be0165b6f 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap index b27a20604da..3abeb1e10ed 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap index 68b597ced62..ed01f5ef1f8 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.VariableCoercion_WithAllScopes_RecordsCoercionSpan.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.VariableCoercion_WithAllScopes_RecordsCoercionSpan.snap index 17a03218100..ebb27a688ea 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.VariableCoercion_WithAllScopes_RecordsCoercionSpan.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityExecutionDiagnosticListenerTests.VariableCoercion_WithAllScopes_RecordsCoercionSpan.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap index 58586983eef..ee9a0782cdb 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SingleRequest_GetHeroName.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SingleRequest_GetHeroName.snap index 98d79919e82..880a7f4379a 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SingleRequest_GetHeroName.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Get_SingleRequest_GetHeroName.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap index f86bc355edb..65da759c667 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Capture_Deferred_Response.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Capture_Deferred_Response.snap index 73c2c27652b..e17fdbbd266 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Capture_Deferred_Response.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Capture_Deferred_Response.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Ensure_List_Path_Is_Correctly_Built.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Ensure_List_Path_Is_Correctly_Built.snap index 12da5ad6cec..cd2ceaf8439 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Ensure_List_Path_Is_Correctly_Built.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Ensure_List_Path_Is_Correctly_Built.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap index 17773642078..951264b800c 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName.snap index 62fb17f216f..e69bb6db42b 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName_Default.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName_Default.snap index e8a7ccb6426..b6e6c9d15be 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName_Default.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_SingleRequest_GetHeroName_Default.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap index dc23408f713..716d88510b1 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap index 02c3628f452..02d2e62bf43 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap index c872fb83791..06717cf1040 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap index 91b58e9f60f..327cb935c3f 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap index c477bcff620..181eac0e14b 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap index 12992b6c7c5..24e045678ad 100644 --- a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap +++ b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/__snapshots__/ActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/ActivityTestHelper.cs b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/ActivityTestHelper.cs index 4dd7b9ebc5c..609cc298f19 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/ActivityTestHelper.cs +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/ActivityTestHelper.cs @@ -1,5 +1,8 @@ using System.Diagnostics; using System.Text.RegularExpressions; +using Newtonsoft.Json; +using OpenTelemetry; +using OpenTelemetry.Trace; namespace HotChocolate.Fusion.Diagnostics; @@ -7,98 +10,50 @@ public static partial class ActivityTestHelper { [GeneratedRegex(@" in (?.+?):line (?\d+)", RegexOptions.CultureInvariant)] private static partial Regex StackTracePathRegex(); + [GeneratedRegex(@"lambda_method\d+", RegexOptions.CultureInvariant)] + private static partial Regex LambdaMethodRegex(); public static IDisposable CaptureActivities(out object activities) { - var sync = new object(); - var listener = new ActivityListener(); - var root = new OrderedDictionary(); - var lookup = new Dictionary>(); - var spanLookup = new Dictionary>(); - Activity rootActivity = null!; - - listener.ShouldListenTo = source => - string.Equals(source.Name, "HotChocolate.Fusion.Diagnostics", StringComparison.Ordinal); - listener.ActivityStarted = a => - { - lock (sync) - { - if (a.Parent is null - && string.Equals(a.OperationName, "ExecuteHttpRequest", StringComparison.Ordinal) - && lookup.TryGetValue(rootActivity, out var parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - } + var exported = new List(); - if (a.Parent is not null - && lookup.TryGetValue(a.Parent, out parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - spanLookup[a.SpanId] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - return; - } - - if (a.Parent is null - && a.ParentSpanId != default - && spanLookup.TryGetValue(a.ParentSpanId, out parentData)) - { - RegisterActivity(a, parentData); - lookup[a] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - spanLookup[a.SpanId] = (OrderedDictionary)a.GetCustomProperty("test.data")!; - } - } - }; - listener.ActivityStopped = SerializeActivity; - listener.Sample = (ref ActivityCreationOptions _) => - ActivitySamplingResult.AllData; - ActivitySource.AddActivityListener(listener); - - rootActivity = HotChocolateFusionActivitySource.Source.StartActivity()!; - rootActivity.SetCustomProperty("test.data", root); - lookup[rootActivity] = root; - spanLookup[rootActivity.SpanId] = root; - - activities = root; - return new Session(rootActivity, listener); + var tracerProvider = Sdk.CreateTracerProviderBuilder() + .AddHotChocolateFusionInstrumentation() + .SetSampler(new AlwaysOnSampler()) + .AddInMemoryExporter(exported) + .Build()!; + + var capture = new Capture(tracerProvider, exported); + activities = capture; + return capture; } - private static void RegisterActivity( + private static OrderedDictionary SerializeActivity( Activity activity, - OrderedDictionary parent) + IReadOnlyDictionary> byParent) { - if (!(parent.TryGetValue("activities", out var value) && value is List children)) + var data = new OrderedDictionary { - children = []; - parent["activities"] = children; - } - - var data = new OrderedDictionary(); - activity.SetCustomProperty("test.data", data); - SerializeActivity(activity); - children.Add(data); - } - - private static void SerializeActivity(Activity activity) - { - var data = (OrderedDictionary?)activity.GetCustomProperty("test.data"); + ["OperationName"] = activity.OperationName, + ["DisplayName"] = activity.DisplayName, + ["Kind"] = activity.Kind, + ["Status"] = activity.Status, + ["tags"] = activity.TagObjects, + ["event"] = activity.Events.Select(e => new + { + e.Name, + Tags = ScrubEventTags(e.Tags) + }) + }; - if (data is null) + if (byParent.TryGetValue(activity.SpanId, out var children) && children.Count > 0) { - return; + data["activities"] = children + .Select(c => SerializeActivity(c, byParent)) + .ToList(); } - data["OperationName"] = activity.OperationName; - data["DisplayName"] = activity.DisplayName; - data["Kind"] = activity.Kind; - data["Status"] = activity.Status; - data["tags"] = activity.TagObjects; - data["event"] = activity.Events.Select(t => new - { - t.Name, - Tags = ScrubEventTags(t.Tags) - }); + return data; } private static IEnumerable> ScrubEventTags( @@ -115,13 +70,15 @@ private static void SerializeActivity(Activity activity) && (tag.Key.Equals("exception.stacktrace", StringComparison.Ordinal) || tag.Key.EndsWith(".stacktrace", StringComparison.Ordinal))) { + var scrubbedStackTrace = StackTracePathRegex().Replace(stackTrace, match => + { + var fileName = System.IO.Path.GetFileName(match.Groups["path"].Value); + return $" in {fileName}"; + }); + yield return new KeyValuePair( tag.Key, - StackTracePathRegex().Replace(stackTrace, match => - { - var fileName = System.IO.Path.GetFileName(match.Groups["path"].Value); - return $" in {fileName}"; - })); + LambdaMethodRegex().Replace(scrubbedStackTrace, "lambda_method")); } else { @@ -130,21 +87,42 @@ private static void SerializeActivity(Activity activity) } } - private sealed class Session : IDisposable + private sealed class Capture : IDisposable { - private readonly Activity _activity; - private readonly ActivityListener _listener; + private readonly TracerProvider _tracerProvider; + private readonly List _exported; - public Session(Activity activity, ActivityListener listener) + public Capture(TracerProvider tracerProvider, List exported) { - _activity = activity; - _listener = listener; + _tracerProvider = tracerProvider; + _exported = exported; } - public void Dispose() + [JsonProperty("source", Order = 0)] + public OrderedDictionary Source + => new() + { + ["name"] = _exported.FirstOrDefault()?.Source.Name + }; + + [JsonProperty("activities", Order = 1)] + public IReadOnlyList> Activities { - _activity.Dispose(); - _listener.Dispose(); + get + { + var spanIds = new HashSet(_exported.Select(a => a.SpanId)); + var byParent = _exported + .GroupBy(a => a.ParentSpanId) + .ToDictionary(g => g.Key, g => g.OrderBy(a => a.StartTimeUtc).ToList()); + + return _exported + .Where(a => a.ParentSpanId == default || !spanIds.Contains(a.ParentSpanId)) + .OrderBy(a => a.StartTimeUtc) + .Select(root => SerializeActivity(root, byParent)) + .ToList(); + } } + + public void Dispose() => _tracerProvider.Dispose(); } } diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/HotChocolate.Fusion.Diagnostics.Tests.csproj b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/HotChocolate.Fusion.Diagnostics.Tests.csproj index 73db7d6bb3c..b2891b486da 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/HotChocolate.Fusion.Diagnostics.Tests.csproj +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/HotChocolate.Fusion.Diagnostics.Tests.csproj @@ -12,4 +12,9 @@ + + + + + diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.AllScopes_IncludesAllSpans.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.AllScopes_IncludesAllSpans.snap index dd45a0a0b07..3dc8443e89e 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.AllScopes_IncludesAllSpans.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.AllScopes_IncludesAllSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap index c4aaa4cf3ef..9df7f0254f9 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Allow_Document_To_Be_Captured.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap index c4128fc3bb3..4f8a1db8580 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Cause_A_Resolver_Error_That_Deletes_The_Whole_Result.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndPlan_LimitsSpans.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndPlan_LimitsSpans.snap index da4ac328dd2..8f1b5f60f58 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndPlan_LimitsSpans.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.CustomScopes_OnlyValidateAndPlan_LimitsSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap index 4b807576414..9235a936bfc 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DefaultScopes_ExcludesExecuteRequestAndParseDocumentSpans.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap index 90cb9f09d41..8831ccf04cd 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentCache_SecondExecution_RecordsCacheHitEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap index 9ad73529430..90235ee9ee7 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.DocumentNotFoundInStorage_RecordsEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap index 52ebe8abedd..2b876737a67 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Ensure_That_The_Validation_Activity_Has_An_Error_Status.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.MultipleSources_SourceSchemaResolverError_RecordsDeeplyNestedError.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.MultipleSources_SourceSchemaResolverError_RecordsDeeplyNestedError.snap index ef853481761..0dd2d044366 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.MultipleSources_SourceSchemaResolverError_RecordsDeeplyNestedError.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.MultipleSources_SourceSchemaResolverError_RecordsDeeplyNestedError.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap index 234a7e2dcb3..53a8b38c0a5 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ParsingError_InvalidGraphQLDocument_ReportsErrorStatus.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap index 6ad9036a663..c7e54a76601 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.PersistedOperation_LoadsFromStorage_DefaultScopes.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Source_Schema_Transport_Error.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Source_Schema_Transport_Error.snap index 998a24d919a..de65b4a956a 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Source_Schema_Transport_Error.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Source_Schema_Transport_Error.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap index eb9fc70e01a..eb81a14f38d 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.SubscriptionEvent_Records_Subscription_Event_Span.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Query_With_Multiple_Sources.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Query_With_Multiple_Sources.snap index e90c0c6c132..bcc9f074926 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Query_With_Multiple_Sources.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Query_With_Multiple_Sources.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap index 4b807576414..9235a936bfc 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.Track_Events_Of_A_Simple_Query_Default.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Document Validation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap index b27a20604da..1df114cd786 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.UntrustedDocumentRejected_RecordsEvent.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap index 3d3b287c570..cd6f73c13fb 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityExecutionDiagnosticListenerTests.ValidationError_UnknownField_ReportsErrorStatus.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "GraphQL Operation", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap index 58586983eef..6271216f37b 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_SDL_Download.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_Single_Request.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_Single_Request.snap index d0ceed49810..122307b5c8d 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_Single_Request.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Get_Single_Request.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap index a63c51460fd..e90c1df8c1b 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Add_Variables_To_Http_Activity.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap index 59ab7e3002c..993b870d6de 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Parser_Error.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request.snap index 13ab6b989e0..282a6db2e2f 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request_Default.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request_Default.snap index f81e4edcca5..f6b1b9d5f7f 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request_Default.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Single_Request_Default.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap index cb4e5ceece4..bdb3bad2b77 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_Variables_Are_Not_Automatically_Added_To_Activities.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap index 866d095ca33..7256bd52f08 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.Http_Post_With_Extensions_Map.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap index 1887bc935c5..ee17b23ed8b 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_All_IncludesAllDetails.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap index 542cb1fa862..3eaa62d4789 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_Default_IncludesIdHashOperationNameExtensions.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap index b3f42800613..2891c74fdef 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_DocumentOnly_IncludesDocumentTag.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest", diff --git a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap index 8808d613d51..89cea31500a 100644 --- a/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap +++ b/src/HotChocolate/Fusion/test/Fusion.Diagnostics.Tests/__snapshots__/FusionActivityServerDiagnosticListenerTests.RequestDetails_None_ExcludesAllDetails.snap @@ -1,4 +1,7 @@ { + "source": { + "name": "HotChocolate.Fusion.Diagnostics" + }, "activities": [ { "OperationName": "ExecuteHttpRequest",