Commit Graph

898 Commits

Author SHA1 Message Date
Brian Clozel
c8d1f7c4e2 Upgrade to Gradle 8.3 and Gradle plugins
This commit upgrades the build to:

* Gradle 8.3
* Gradle Spring conventions 0.0.14
* Gradle Enterprise plugin 3.12.6
2023-08-18 11:44:09 +02:00
Brian Clozel
ae5b7e7cb0 Set current observation in data fetching environment
Prior to this commit, the Observability instrumentation would instrument
`DataFetcher` instances and set the current observation in the local
context of the value returned by the data fetcher itself.
This allowed to properly build a parent/child chain of observations
between the main request and the instrumented data fetching
observations.

Because the current observation was not set in the
`DataFetchingEnvironment` given as a parameter to the data fetcher, any
operation done in the data fetcher would not propagate using the current
observation but instead the parent one.

This commit revisits the implementation of the instrumentation to not
wrap the result anymore, but to build a new local `GraphQLContext` that
holds the current observation right before calling the data fetcher.
Note that we cannot "just" set the current observation in that local
context as this is shared mutable instance for all child data fetchers.

Fixes gh-764
2023-08-17 18:22:13 +02:00
Brian Clozel
c5f1e5f4de Add test case for gh-774
This commit also ensures that a new local context is created, copying
the existing values. This avoids mutating the parent local context and
polluting it with local values.
This could cause unintended side effects on other child datafetchers.

Fixes gh-774
2023-08-16 20:49:58 +02:00
Koen Punt
8131c7e88f Inherit local context from environment in instrumentation
Prior to this commit, a `DataFetcher` instrumented by the
`GraphQlObservationInstrumentation` would incorrectly overwrite the
local context when:

* the `DataFetcher` returns a value object (i.e. not a
  `DataFetcherResult`)
* the given `DatFetchingEnvironment` has an existing local context
with values

For this case, the instrumentation would create a new local context but
would not inherit from the existing local context.

See gh-774
2023-08-16 20:22:29 +02:00
Spring Builds
8f91e7ccc4 Next development version (v1.1.6-SNAPSHOT) 2023-06-20 08:30:23 +00:00
rstoyanchev
d1975ff422 Enhance request body check
Closes gh-733
2023-06-20 08:03:14 +01:00
Brian Clozel
0182e72fde Upgrade to Context Propagation 1.0.3
Closes gh-718
2023-06-19 21:16:07 +02:00
Brian Clozel
2d54d77ff6 Upgrade build to Spring Boot 3.0.7 2023-06-19 20:56:28 +02:00
Brian Clozel
2f52fefc79 Upgrade to Spring Framework 6.0.10
Closes gh-730
2023-06-19 20:55:59 +02:00
Brian Clozel
a03a79c887 Upgrade to GraphQL Java 19.6
Closes gh-729
2023-06-19 20:55:10 +02:00
Brian Clozel
32931f350d Upgrade to Spring Data 2022.0.7
Closes gh-732
2023-06-19 20:54:11 +02:00
Brian Clozel
e7410edda6 Upgrade to Micrometer 1.10.8 and Tracing 1.0.7
Closes gh-731
2023-06-19 20:52:42 +02:00
Brian Clozel
49bd405098 Upgrade to Reactor 2022.0.8
Closes gh-720
2023-06-19 20:47:48 +02:00
rstoyanchev
c8a8fb2b83 Drop deprecated method in ExceptionResolversExceptionHandler
Closes gh-711
2023-06-16 11:39:16 +01:00
Brian Clozel
10528388dc Start building against Reactor 2022.0.8 SNAPSHOTs
See gh-720
2023-06-07 16:19:00 +02:00
Brian Clozel
48c16267e8 Upgrade to Context Propagation 1.0.3
Closes gh-716
Closes gh-718
2023-06-07 16:13:42 +02:00
Spring Builds
c944d9bbb4 Next development version (v1.1.5-SNAPSHOT) 2023-05-16 11:32:11 +00:00
Brian Clozel
ebe5706cda Upgrade to Jackson 2.14.3 2023-05-15 14:30:23 +02:00
Brian Clozel
ddf2ac83ac Upgrade to Micrometer 1.10.7
Closes gh-700
2023-05-15 14:29:34 +02:00
Brian Clozel
d106af5ad1 Upgrade to Reactor 2022.0.7
Closes gh-699
2023-05-15 14:28:38 +02:00
Brian Clozel
4616d0fde3 Upgrade to Spring Security 6.0.3
Closes gh-698
2023-05-15 14:27:05 +02:00
Brian Clozel
968b8e6673 Upgrade to Spring Data 2022.0.6
Closes gh-697
2023-05-15 14:26:16 +02:00
Brian Clozel
66fd6b05db Upgrade to Spring Boot 3.0.6 2023-05-15 14:24:53 +02:00
Brian Clozel
51cf46657d Upgrade to GraphQL Java 19.5
Closes gh-696
2023-05-15 14:24:23 +02:00
Brian Clozel
cec3555687 Upgrade to Spring Framework 6.0.9
Closes gh-695
2023-05-15 14:22:34 +02:00
Brian Clozel
faea9d1c8b Fix observability instrumentation for CompletionStage
This commit fixes the observability instrumentation for data fetchers
when the return type is of `CompletionStage`. Prior to this commit, the
instrumentation of `CompletionStage` return values as
`DataFetcherResult` would wrap the asynchronous value twice.

Closes gh-676
2023-05-11 14:44:32 +02:00
Brian Clozel
0a41104226 Use localContext for storing data fetcher observations
Prior to this commit, a partial fix in a56ff6e introduced proper
relationships between request and data fetcher observations by tracking
them in a local concurrent map. This fix is incomplete as data fetcher
operations are not set as current in the ThreadLocal or reactive
contexts when the actual DataFetcher is executed.

We cannot use the global GraphQLContext for DataFetcher observations,
as it is shared for the entire GraphQL request (and no thread safe).

This commit makes the Instrumentation instrument DataFetcher and make
them return a `DataFetcherResult` that holds a
`g.s.DataFetchingEnvironment#getLocalContext` with a reference to the
current data fetcher observation. A temporary fix is also applied in
`ContextDataFetcherDecorator` to merge both global and local contexts
when capturing a `ContextSnapshot` to be applied for the data fetching
operation.

Fixes gh-676
See gh-688
2023-05-10 14:50:45 +02:00
Brian Clozel
a56ff6e58d Fix DataFetcher observations hierarchy
Prior to this commit, the `GraphQlObservationInstrumentation` would
organize the parent/child relationship between data fetcher observations
by setting the current observation under a well-known key in the global
GraphQL context.

In some cases, the order of execution and the scheduling of operations
does not reflect the actual operation hierarchy as defined by the
GraphQL `ExecutionStepInfo`. This would result in traces where data
fetching operations are set with incorrect parent/child relationships.

This commit ensures that data fetcher observations have their parent set
with the expected one, by keeping track of active observations and using
the `ExecutionStepInfo` path as a key.

Fixes gh-676
2023-04-24 22:51:24 +02:00
Brian Clozel
4e5aaeddab Revisit request observation context type
Prior to this commit, the request execution observation would have a
context of type `RequestReplyReceiverContext` to directly deal with
tracing propagation at the transport level. This approach doesn't work
anymore as the parent observation is not properly set on the resulting
trace, even if it is manually set in the instrumentation.

This commit revisits the request observation setup and turns its context
into a regular `Observation.Context`. Tracing propagation should be
dealt with directly at the transport level by an underlying observation.
This is the case already for Spring Framework HTTP server observations.

As a result, the `PropagationWebGraphQlInterceptor` is deprecated with
no replacement and should not be used anymore.

Fixes gh-675
2023-04-24 22:03:34 +02:00
rstoyanchev
c650db895b Add link in documentation to Apollo federation sample
Closes gh-384
2023-04-14 08:27:17 +01:00
rstoyanchev
b7d1e6e9d2 Pass attributes in HttpGraphQlTransport
Closes gh-659
2023-04-14 06:59:34 +01:00
rstoyanchev
4a0d01a33b Fix auto-registration issue with non-null List
Closes gh-661
2023-04-14 06:55:36 +01:00
Spring Builds
db55ee2c2c Next development version (v1.1.4-SNAPSHOT) 2023-03-21 10:22:40 +00:00
Brian Clozel
d28d9091d7 Upgrade dependencies
This commit upgrades mandatory and optional dependencies:

* Spring Framework 6.0.7
* GraphQL Java 19.3
* Reactor 2022.0.5
* Micrometer 1.10.5
* Micrometer Tracing 1.0.3
* Spring Data 2022.0.3
* Spring Security 6.0.2

Closes gh-641
Closes gh-642
Closes gh-643
Closes gh-644
Closes gh-645
Closes gh-646
Closes gh-647
2023-03-20 18:20:43 +01:00
rstoyanchev
7fc4df74a6 Add request attributes to WebGraphQlRequest
Closes gh-633
2023-03-14 08:17:02 +00:00
rstoyanchev
66b3c82280 Add cookies to WebGraphQlRequest
Closes gh-626
2023-03-10 16:04:40 +00:00
rstoyanchev
2e229fec26 Polishing contribution
Closes gh-604
2023-03-08 13:31:12 +00:00
Koen Punt
345052381d Fix issue returning CompletableFuture
See gh-604
2023-03-08 13:28:05 +00:00
rstoyanchev
581b1108f2 Ensure resolved bean instance is used for validation
Closes gh-624
2023-03-06 20:30:56 +00:00
rstoyanchev
3b100c6047 Update Java version in .sdkmanrc
Closes gh-622
2023-03-02 12:18:07 +00:00
Tim te Beek
27f0f64c81 Use SpringJunitConfig in tests
Co-authored-by: Moderne <team@moderne.io>

See gh-622
2023-03-02 12:18:07 +00:00
Spring Builds
707bc36d6b Next development version (v1.1.3-SNAPSHOT) 2023-02-21 10:52:10 +00:00
Brian Clozel
312446ffa2 Upgrade to Spring Data 2022.0.2
Closes gh-617
2023-02-21 11:41:56 +01:00
Brian Clozel
0e358393cb Upgrade to Reactor 2022.0.3
Closes gh-616
2023-02-21 11:41:26 +01:00
Brian Clozel
a959e749fe Upgrade to Spring Framework 6.0.5
Closes gh-618
2023-02-21 11:40:52 +01:00
rstoyanchev
dc90558d9a Configure ExecutionInput in ExecutionGraphQlServiceTester
Closes gh-615
2023-02-16 18:20:45 +00:00
Brian Clozel
44ff134b92 Upgrade CI image to Ubuntu Jammy 2023-02-20 11:45:39 +01:00
Brian Clozel
7d87d3b29d Upgrade OCI build task in CI pipeline
This commit upgrades the OCI build task Concourse resource to 0.11.1 and
configures the Docker credentials for this task.
2023-02-20 11:43:37 +01:00
Brian Clozel
beafa43f25 Upgrade other dependencies
* Spring Framework 6.0.4
* Spring Data 2022.0.1
* Jackson 2.14.2
* Reactor 2022.0.2
2023-02-14 16:06:14 +01:00
Brian Clozel
e3b73e84e1 Upgrade to Micrometer Tracing 1.0.2
Closes gh-614
2023-02-14 16:04:57 +01:00