Move GraphQL observation support into spring-boot-graphql

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -101,7 +101,6 @@ dependencies {
 	optional("org.springframework:spring-webmvc")
 	optional("org.springframework.data:spring-data-couchbase")
 	optional("org.springframework.data:spring-data-jpa")
-	optional("org.springframework.graphql:spring-graphql")
 	optional("org.springframework.kafka:spring-kafka")
 	optional("org.springframework.security:spring-security-config")
 	optional("org.springframework.security:spring-security-web")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -16,7 +16,6 @@ org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAuto
 org.springframework.boot.actuate.autoconfigure.metrics.data.RepositoryMetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.task.TaskExecutorMetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.observation.graphql.GraphQlObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observation.web.client.HttpClientObservationsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observation.web.reactive.WebFluxObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observation.web.servlet.WebMvcObservationAutoConfiguration

spring-boot-project/spring-boot-graphql/build.gradle

@@ -16,6 +16,7 @@ dependencies {
 
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-http-converter"))
+	optional(project(":spring-boot-project:spring-boot-micrometer-observation"))
 	optional(project(":spring-boot-project:spring-boot-rsocket"))
 	optional(project(":spring-boot-project:spring-boot-security"))
 	optional(project(":spring-boot-project:spring-boot-webflux"))
@@ -33,6 +34,7 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation("io.micrometer:micrometer-observation-test")
 	testImplementation("org.springframework.graphql:spring-graphql-test")
 	testImplementation("org.springframework.security:spring-security-test")
 

…GraphQlObservationAutoConfiguration.java …GraphQlObservationAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/GraphQlObservationAutoConfiguration.java renamed to spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/observation/GraphQlObservationAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/GraphQlObservationAutoConfiguration.java renamed to spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/observation/GraphQlObservationAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.observation.graphql;
+package org.springframework.boot.graphql.autoconfigure.observation;
 
 import graphql.GraphQL;
 import io.micrometer.observation.Observation;
@@ -26,7 +26,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.observation.DataFetcherObservationConvention;
@@ -39,16 +38,17 @@
  * GraphQL endpoints.
  *
  * @author Brian Clozel
- * @since 3.0.0
+ * @since 4.0.0
  */
-@AutoConfiguration(after = ObservationAutoConfiguration.class)
+@AutoConfiguration(
+		afterName = "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration")
 @ConditionalOnBean(ObservationRegistry.class)
 @ConditionalOnClass({ GraphQL.class, GraphQlSource.class, Observation.class })
 public class GraphQlObservationAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public GraphQlObservationInstrumentation graphQlObservationInstrumentation(ObservationRegistry observationRegistry,
+	GraphQlObservationInstrumentation graphQlObservationInstrumentation(ObservationRegistry observationRegistry,
 			ObjectProvider<ExecutionRequestObservationConvention> executionConvention,
 			ObjectProvider<DataFetcherObservationConvention> dataFetcherConvention,
 			ObjectProvider<DataLoaderObservationConvention> dataLoaderObservationConvention) {

…re/observation/graphql/package-info.java …oconfigure/observation/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/package-info.java renamed to spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/observation/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/package-info.java renamed to spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/observation/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Spring GraphQL observations.
  */
-package org.springframework.boot.actuate.autoconfigure.observation.graphql;
+package org.springframework.boot.graphql.autoconfigure.observation;

spring-boot-project/spring-boot-graphql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -3,6 +3,7 @@ org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQueryByExampl
 org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQuerydslAutoConfiguration
 org.springframework.boot.graphql.autoconfigure.data.GraphQlQueryByExampleAutoConfiguration
 org.springframework.boot.graphql.autoconfigure.data.GraphQlQuerydslAutoConfiguration
+org.springframework.boot.graphql.autoconfigure.observation.GraphQlObservationAutoConfiguration
 org.springframework.boot.graphql.autoconfigure.reactive.GraphQlWebFluxAutoConfiguration
 org.springframework.boot.graphql.autoconfigure.rsocket.GraphQlRSocketAutoConfiguration
 org.springframework.boot.graphql.autoconfigure.rsocket.RSocketGraphQlClientAutoConfiguration

…QlObservationAutoConfigurationTests.java …QlObservationAutoConfigurationTests.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/GraphQlObservationAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/observation/GraphQlObservationAutoConfigurationTests.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/graphql/GraphQlObservationAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/observation/GraphQlObservationAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.observation.graphql;
+package org.springframework.boot.graphql.autoconfigure.observation;
 
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.tck.TestObservationRegistry;