Skip to content

Inherit local context in observation instrumentation instead of overwriting it #761

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

Closed
wants to merge 2 commits into from
Closed

Inherit local context in observation instrumentation instead of overwriting it #761

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae96745
inherit local context instead of overwriting it
koenpunt Jul 20, 2023
1da0d30
pass local context instead of full environment to wrap method
koenpunt Jul 20, 2023
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
11 changes: 7 additions & 4 deletions .../main/java/org/springframework/graphql/observation/GraphQlObservationInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher,
throw new CompletionException(error);
}
dataFetcherObservation.stop();
return wrapAsDataFetcherResult(result, dataFetcherObservation);
return wrapAsDataFetcherResult(result, dataFetcherObservation, environment.getLocalContext());
});
}
else {
observationContext.setValue(value);
dataFetcherObservation.stop();
return wrapAsDataFetcherResult(value, dataFetcherObservation);
return wrapAsDataFetcherResult(value, dataFetcherObservation, environment.getLocalContext());
}
}
catch (Throwable throwable) {
Expand All @@ -187,7 +187,8 @@ private static Observation getCurrentObservation(DataFetchingEnvironment environ
return currentObservation;
}

private static DataFetcherResult<?> wrapAsDataFetcherResult(Object value, Observation dataFetcherObservation) {
private static DataFetcherResult<?> wrapAsDataFetcherResult(Object value, Observation dataFetcherObservation,
@Nullable GraphQLContext dataFetcherLocalContext) {
if (value instanceof DataFetcherResult<?> result) {
if (result.getLocalContext() == null) {
return result.transform(builder -> builder.localContext(GraphQLContext.newContext().of(ObservationThreadLocalAccessor.KEY, dataFetcherObservation).build()));
Expand All @@ -201,9 +202,11 @@ else if (result.getLocalContext() instanceof GraphQLContext) {
return result;
}
else {
GraphQLContext localContext = dataFetcherLocalContext == null ?
GraphQLContext.getDefault() : dataFetcherLocalContext;
return DataFetcherResult.newResult()
.data(value)
.localContext(GraphQLContext.newContext().of(ObservationThreadLocalAccessor.KEY, dataFetcherObservation).build())
.localContext(localContext.put(ObservationThreadLocalAccessor.KEY, dataFetcherObservation))
.build();
}

Expand Down