Skip to content

Commit d9f9d09

Browse files
committed
Upgrade to Micrometer 1.16.0-M1 and Micrometer Tracing 1.6.0-M1
Closes gh-1269
1 parent 3cbf2c1 commit d9f9d09

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

platform/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ dependencies {
1111
api(platform("com.fasterxml.jackson:jackson-bom:2.18.4"))
1212
api(platform("tools.jackson:jackson-bom:3.0.0-rc4"))
1313
api(platform("io.projectreactor:reactor-bom:2025.0.0-M5"))
14-
api(platform("io.micrometer:micrometer-bom:1.15.0"))
15-
api(platform("io.micrometer:micrometer-tracing-bom:1.5.0"))
14+
api(platform("io.micrometer:micrometer-bom:1.16.0-M1"))
15+
api(platform("io.micrometer:micrometer-tracing-bom:1.6.0-M1"))
1616
api(platform("org.springframework.data:spring-data-bom:2025.1.0-M3"))
1717
api(platform("org.springframework.security:spring-security-bom:6.5.0"))
1818
api(platform("com.querydsl:querydsl-bom:5.1.0"))
@@ -27,7 +27,6 @@ dependencies {
2727

2828
constraints {
2929
api("com.graphql-java:graphql-java:${graphQlJavaVersion}")
30-
api("io.micrometer:context-propagation:1.1.3")
3130

3231
api("jakarta.annotation:jakarta.annotation-api:3.0.0")
3332
api("jakarta.servlet:jakarta.servlet-api:6.1.0")

spring-graphql/src/main/java/org/springframework/graphql/observation/GraphQlObservationInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher,
202202
observationContext.setValue(result);
203203
if (error != null) {
204204
if (error instanceof CompletionException completionException) {
205-
dataFetcherObservation.error(error.getCause());
205+
dataFetcherObservation.error((error.getCause() != null) ? error.getCause() : error);
206206
dataFetcherObservation.stop();
207207
throw completionException;
208208
}

0 commit comments

Comments
 (0)