Merge branch 'master' into fix/graphqlcontext

Author: paulbakker

build.gradle.kts

@@ -36,7 +36,6 @@ plugins {
     id("me.champeau.jmh") version "0.7.2"
 
     kotlin("jvm") version Versions.KOTLIN_VERSION
-    kotlin("kapt") version Versions.KOTLIN_VERSION
     idea
     eclipse
 }
@@ -88,10 +87,6 @@ configure(subprojects.filterNot { it in internalBomModules }) {
     dependencies {
         // Apply the BOM to applicable subprojects.
         api(platform(project(":graphql-dgs-platform")))
-        // Speed up processing of AutoConfig's produced by Spring Boot
-        annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
-        // Produce Config Metadata for properties used in Spring Boot
-        annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
         // Sets the JMH version to use across modules.
         // Please refer to the following links for further reference.

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

…ional-spring-configuration-metadata.json …A-INF/spring-configuration-metadata.jsongraphql-dgs-extended-scalars/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-extended-scalars/src/main/resources/META-INF/spring-configuration-metadata.json graphql-dgs-extended-scalars/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-extended-scalars/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -21,6 +21,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cache.CacheManager
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.core.Ordered
+import org.springframework.core.annotation.Order
 import java.util.Optional
 
 /**
@@ -38,6 +40,7 @@ open class DgsGraphQLMicrometerAutoConfiguration {
     }
 
     @Bean
+    @Order(Ordered.LOWEST_PRECEDENCE)
     @ConditionalOnProperty(
         prefix = "$AUTO_CONF_PREFIX.instrumentation",
         name = ["enabled"],

…ional-spring-configuration-metadata.json …A-INF/spring-configuration-metadata.jsongraphql-dgs-extended-validation/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-extended-validation/src/main/resources/META-INF/spring-configuration-metadata.json graphql-dgs-extended-validation/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-extended-validation/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -387,7 +387,7 @@ class MicrometerServletSmokeTest {
                     .and("gql.operation.name", "anonymous")
                     .and("gql.query.complexity", "none")
                     .and("gql.query.sig.hash", "none")
-                    .and("gql.errorDetail", "none")
+                    .and("gql.errorDetail", "INVALID_ARGUMENT")
                     .and("gql.errorCode", "BAD_REQUEST")
                     .and("gql.path", "[hello]")
                     .and("outcome", "failure"),

graphql-dgs-spring-boot-micrometer/src/main/kotlin/com/netflix/graphql/dgs/metrics/micrometer/DgsGraphQLMicrometerAutoConfiguration.kt

@@ -20,4 +20,8 @@ management:
       exposure:
         include:
           - metrics
-debug: true
+debug: true
+dgs:
+  graphql:
+    apq:
+      enabled: true

…ional-spring-configuration-metadata.json …A-INF/spring-configuration-metadata.jsongraphql-dgs-spring-boot-micrometer/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-spring-boot-micrometer/src/main/resources/META-INF/spring-configuration-metadata.json graphql-dgs-spring-boot-micrometer/src/main/resources/META-INF/additional-spring-configuration-metadata.json renamed to graphql-dgs-spring-boot-micrometer/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2025 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.graphql.dgs.apq
+
+import graphql.ExecutionInput
+import graphql.execution.preparsed.PreparsedDocumentEntry
+import graphql.execution.preparsed.PreparsedDocumentProvider
+import graphql.execution.preparsed.persisted.ApolloPersistedQuerySupport
+import graphql.execution.preparsed.persisted.PersistedQueryCache
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.function.Function
+
+class DgsAPQPreParsedDocumentProviderWrapper(
+    persistedQueryCache: PersistedQueryCache,
+    private val preparsedDocumentProvider: Optional<PreparsedDocumentProvider>,
+) : ApolloPersistedQuerySupport(persistedQueryCache) {
+    override fun getDocumentAsync(
+        executionInput: ExecutionInput,
+        parseAndValidateFunction: Function<ExecutionInput, PreparsedDocumentEntry>,
+    ): CompletableFuture<PreparsedDocumentEntry> {
+        val queryId = getPersistedQueryId(executionInput)
+        if (queryId.isPresent) {
+            return super.getDocumentAsync(executionInput, parseAndValidateFunction)
+        }
+
+        if (preparsedDocumentProvider.isPresent) {
+            return preparsedDocumentProvider.get().getDocumentAsync(executionInput, parseAndValidateFunction)
+        }
+
+        return CompletableFuture.completedFuture(parseAndValidateFunction.apply(executionInput))
+    }
+}

graphql-dgs-spring-boot-micrometer/src/test/kotlin/com/netflix/graphql/dgs/metrics/micrometer/MicrometerServletSmokeTest.kt

@@ -19,24 +19,28 @@ package com.netflix.graphql.dgs.apq
 import com.github.benmanes.caffeine.cache.Cache
 import com.github.benmanes.caffeine.cache.Caffeine
 import com.github.benmanes.caffeine.cache.CaffeineSpec
-import com.netflix.graphql.dgs.internal.QueryValueCustomizer
+import com.netflix.graphql.dgs.springgraphql.autoconfig.DgsSpringGraphQLAutoConfiguration
 import graphql.execution.preparsed.PreparsedDocumentEntry
-import graphql.execution.preparsed.persisted.ApolloPersistedQuerySupport
+import graphql.execution.preparsed.PreparsedDocumentProvider
 import graphql.execution.preparsed.persisted.PersistedQueryCache
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.binder.cache.CaffeineCacheMetrics
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.autoconfigure.AutoConfiguration
+import org.springframework.boot.autoconfigure.AutoConfigureAfter
 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.autoconfigure.condition.ConditionalOnProperty
+import org.springframework.boot.autoconfigure.graphql.GraphQlSourceBuilderCustomizer
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import java.time.Duration
+import java.util.*
 
 @AutoConfiguration
+@AutoConfigureAfter(DgsSpringGraphQLAutoConfiguration::class)
 @ConditionalOnProperty(
     prefix = DgsAPQSupportProperties.PREFIX,
     name = ["enabled"],
@@ -46,18 +50,17 @@ import java.time.Duration
 @EnableConfigurationProperties(DgsAPQSupportProperties::class)
 open class DgsAPQSupportAutoConfiguration {
     @Bean
-    @ConditionalOnBean(PersistedQueryCache::class)
-    open fun apolloPersistedQuerySupport(persistedQueryCache: PersistedQueryCache): ApolloPersistedQuerySupport =
-        ApolloPersistedQuerySupport(persistedQueryCache)
-
-    @Bean
-    @ConditionalOnBean(ApolloPersistedQuerySupport::class)
-    open fun apolloAPQQueryValueCustomizer(): QueryValueCustomizer =
-        QueryValueCustomizer { query ->
-            if (query.isNullOrBlank()) {
-                ApolloPersistedQuerySupport.PERSISTED_QUERY_MARKER
-            } else {
-                query
+    open fun apqSourceBuilderCustomizer(
+        preparsedDocumentProvider: Optional<PreparsedDocumentProvider>,
+        persistedQueryCache: Optional<PersistedQueryCache>,
+    ): GraphQlSourceBuilderCustomizer =
+        GraphQlSourceBuilderCustomizer { builder ->
+            builder.configureGraphQl { graphQlBuilder ->
+                // For non-APQ queries, the user specified PreparsedDocumentProvider should be used, so we configure the DgsAPQPreparsedDocumentProvider to
+                // wrap the user specified one and delegate appropriately since we can only have one PreParsedDocumentProvider bean
+                val apqPreParsedDocumentProvider =
+                    DgsAPQPreParsedDocumentProviderWrapper(persistedQueryCache.get(), preparsedDocumentProvider)
+                graphQlBuilder.preparsedDocumentProvider(apqPreParsedDocumentProvider)
             }
         }