Skip to content

Update OpenTelemetry.Api (1.1.0 -> 1.15.3) #9610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glen-84 merged 4 commits into from
Apr 29, 2026
Merged

Update OpenTelemetry.Api (1.1.0 -> 1.15.3) #9610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a11eb8
Update `OpenTelemetry.Api` (1.1.0 -> 1.15.3)
glen-84 Apr 28, 2026
40c9322
Merge branch 'main-version-15' into gai/update-open-telemetry-api
glen-84 Apr 28, 2026
46b4706
Address Copilot feedback
glen-84 Apr 28, 2026
1c0bb30
Merge branch 'main-version-15' into gai/update-open-telemetry-api
glen-84 Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="NodaTime" Version="3.0.0" />
<PackageVersion Include="Npgsql" Version="8.0.4" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.1.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
<PackageVersion Include="ProjNET" Version="2.0.0" />
<PackageVersion Include="RabbitMQ.Client" Version="6.4.0" />
<PackageVersion Include="RavenDB.Client" Version="6.0.104" />
Expand Down
3 changes: 1 addition & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/ActivityEnricher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using HotChocolate.Language.Utilities;
using HotChocolate.Resolvers;
using HotChocolate.Types;
using OpenTelemetry.Trace;
using static HotChocolate.Diagnostics.SemanticConventions;
using static HotChocolate.WellKnownContextData;

Expand Down Expand Up @@ -589,7 +588,7 @@ protected virtual void EnrichError(IError error, Activity activity)
{
if (error.Exception is { } exception)
{
activity.RecordException(exception);
activity.AddException(exception);
}

var tags = new ActivityTagsCollection
Expand Down
6 changes: 0 additions & 6 deletions ...HotChocolate/Diagnostics/src/Diagnostics/Listeners/ActivityExecutionDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using HotChocolate.Execution.Instrumentation;
using HotChocolate.Execution.Processing;
using HotChocolate.Resolvers;
using OpenTelemetry.Trace;
using static HotChocolate.Diagnostics.ContextKeys;
using static HotChocolate.Diagnostics.HotChocolateActivitySource;

Expand Down Expand Up @@ -121,7 +120,6 @@ public override void SyntaxError(IRequestContext context, IError error)

var activity = (Activity)value;
_enricher.EnrichSyntaxError(context, activity, error);
activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down Expand Up @@ -158,7 +156,6 @@ public override void ValidationErrors(IRequestContext context, IReadOnlyList<IEr
_enricher.EnrichValidationError(context, activity, error);
}

activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
}
Expand Down Expand Up @@ -289,7 +286,6 @@ public override IDisposable ResolveFieldValue(IMiddlewareContext context)
}

_enricher.EnrichResolveFieldValue(context, activity);
activity.SetStatus(Status.Ok);
activity.SetStatus(ActivityStatusCode.Ok);

context.SetLocalState(ResolverActivity, activity);
Expand All @@ -306,7 +302,6 @@ public override void ResolverError(IMiddlewareContext context, IError error)

var activity = (Activity)value;
_enricher.EnrichResolverError(context, error, activity);
activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
}
Expand All @@ -320,7 +315,6 @@ public override void ResolverError(IRequestContext context, ISelection selection

var activity = (Activity)value;
_enricher.EnrichResolverError(context, selection, error, activity);
activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
}
Expand Down
7 changes: 2 additions & 5 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Listeners/ActivityServerDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using HotChocolate.AspNetCore.Instrumentation;
using HotChocolate.Execution;
using HotChocolate.Language;
using OpenTelemetry.Trace;
using static HotChocolate.Diagnostics.ContextKeys;

namespace HotChocolate.Diagnostics.Listeners;
Expand Down Expand Up @@ -82,7 +81,7 @@ public override void HttpRequestError(HttpContext context, IError error)
{
var activity = (Activity)value!;
_enricher.EnrichHttpRequestError(context, error, activity);
activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
Comment thread
glen-84 marked this conversation as resolved.
}

Expand All @@ -92,7 +91,7 @@ public override void HttpRequestError(HttpContext context, Exception exception)
{
var activity = (Activity)value!;
_enricher.EnrichHttpRequestError(context, exception, activity);
activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
}

Expand All @@ -111,7 +110,6 @@ public override IDisposable ParseHttpRequest(HttpContext context)
}

_enricher.EnrichParseHttpRequest(context, activity);
activity.SetStatus(Status.Ok);
activity.SetStatus(ActivityStatusCode.Ok);
context.Items[ParseHttpRequestActivity] = activity;

Expand All @@ -129,7 +127,6 @@ public override void ParserErrors(HttpContext context, IReadOnlyList<IError> err
_enricher.EnrichParserErrors(context, error, activity);
}

activity.SetStatus(Status.Error);
activity.SetStatus(ActivityStatusCode.Error);
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/CoerceVariablesScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,7 +20,6 @@ protected override void SetStatus()
{
if (Context.Variables is not null)
{
Activity.SetStatus(Status.Ok);
Activity.SetStatus(ActivityStatusCode.Ok);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/CompileOperationScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,7 +20,6 @@ protected override void SetStatus()
{
if (Context.Operation is not null)
{
Activity.SetStatus(Status.Ok);
Activity.SetStatus(ActivityStatusCode.Ok);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
3 changes: 0 additions & 3 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/ExecuteOperationScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,12 +20,10 @@ protected override void SetStatus()
{
if (Context.Result is null or IOperationResult { Errors: [_, ..] })
{
Activity.SetStatus(Status.Error);
Activity.SetStatus(ActivityStatusCode.Error);
}
else
{
Activity.SetStatus(Status.Ok);
Activity.SetStatus(ActivityStatusCode.Ok);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/ExecuteRequestScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,7 +20,6 @@ protected override void SetStatus()
{
if (Context.Result is null or IOperationResult { Errors: [_, ..] })
{
Activity.SetStatus(Status.Error);
Activity.SetStatus(ActivityStatusCode.Error);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/ParseDocumentScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,7 +20,6 @@ protected override void SetStatus()
{
if (Context.Document is not null)
{
Activity.SetStatus(Status.Ok);
Activity.SetStatus(ActivityStatusCode.Ok);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Diagnostics/src/Diagnostics/Scopes/ValidateDocumentScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;
using HotChocolate.Execution;
using OpenTelemetry.Trace;

namespace HotChocolate.Diagnostics.Scopes;

Expand All @@ -21,7 +20,6 @@ protected override void SetStatus()
{
if (Context.IsValidDocument)
{
Activity.SetStatus(Status.Ok);
Activity.SetStatus(ActivityStatusCode.Ok);
}
Comment thread
glen-84 marked this conversation as resolved.
}
Expand Down
31 changes: 4 additions & 27 deletions ...gnostics.Tests/__snapshots__/QueryInstrumentationTests.Allow_document_to_be_captured.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"activities": [
{
"OperationName": "ExecuteRequest",
Expand Down Expand Up @@ -41,12 +41,7 @@
"OperationName": "ParseDocument",
"DisplayName": "Parse Document",
"Status": "Ok",
"tags": [
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"tags": [],
"event": []
},
{
Expand All @@ -61,10 +56,6 @@
{
"Key": "graphql.document.hash",
"Value": "6af18618ae20c266f6ffc352b78cb69b"
},
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"event": []
Expand All @@ -73,24 +64,14 @@
"OperationName": "CompileOperation",
"DisplayName": "Compile Operation",
"Status": "Ok",
"tags": [
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"tags": [],
"event": []
},
{
"OperationName": "ExecuteOperation",
"DisplayName": "Execute Operation SayHelloOperation",
"Status": "Ok",
"tags": [
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"tags": [],
"event": [],
"activities": [
{
Expand Down Expand Up @@ -125,10 +106,6 @@
{
"Key": "graphql.selection.field.declaringType",
"Value": "SimpleQuery"
},
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"event": []
Expand Down
35 changes: 4 additions & 31 deletions ...ots__/QueryInstrumentationTests.Cause_a_resolver_error_that_deletes_the_whole_result.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"activities": [
{
"OperationName": "ExecuteRequest",
Expand All @@ -24,10 +24,6 @@
{
"Key": "graphql.document.body",
"Value": "query SayHelloOperation {\n causeFatalError\n}"
},
{
"Key": "otel.status_code",
"Value": "ERROR"
}
],
"event": [
Expand All @@ -45,12 +41,7 @@
"OperationName": "ParseDocument",
"DisplayName": "Parse Document",
"Status": "Ok",
"tags": [
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"tags": [],
"event": []
},
{
Expand All @@ -65,10 +56,6 @@
{
"Key": "graphql.document.hash",
"Value": "851fb754d9ba6b5cc5a55ebcbea2621d"
},
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"event": []
Expand All @@ -77,24 +64,14 @@
"OperationName": "CompileOperation",
"DisplayName": "Compile Operation",
"Status": "Ok",
"tags": [
{
"Key": "otel.status_code",
"Value": "OK"
}
],
"tags": [],
"event": []
},
{
"OperationName": "ExecuteOperation",
"DisplayName": "Execute Operation SayHelloOperation",
"Status": "Error",
"tags": [
{
"Key": "otel.status_code",
"Value": "ERROR"
}
],
"tags": [],
"event": [],
"activities": [
{
Expand Down Expand Up @@ -129,10 +106,6 @@
{
"Key": "graphql.selection.field.declaringType",
"Value": "SimpleQuery"
},
{
"Key": "otel.status_code",
"Value": "ERROR"
}
],
"event": [
Expand Down
Loading
Loading