Skip to content
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

Jump to bottom

Use a local copy of ContextRegistry #2009

Merged
merged 1 commit into from
Sep 17, 2024
+8 −8
Merged

Use a local copy of ContextRegistry #2009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ...-autoconfigure/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsAutoConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,6 @@ open class DgsAutoConfiguration(
@ConditionalOnClass(name = ["reactor.core.publisher.Flux"])
open fun fluxReactiveDataFetcherResultProcessor(): FluxDataFetcherResultProcessor = FluxDataFetcherResultProcessor()

@Bean
@ConditionalOnMissingBean
open fun dgsMicrometerContextRegistry(): ContextRegistry =
ContextRegistry
.getInstance()
.registerThreadLocalAccessor(Slf4jThreadLocalAccessor())

/**
* JDK 21+ only - Creates the dgsAsyncTaskExecutor which is used to run data fetchers automatically wrapped in CompletableFuture.
* Can be provided by other frameworks to enable context propagation.
Expand All @@ -347,8 +340,15 @@ open class DgsAutoConfiguration(
@ConditionalOnJava(JavaVersion.TWENTY_ONE)
@ConditionalOnMissingBean(name = ["dgsAsyncTaskExecutor"])
@ConditionalOnProperty(name = ["dgs.graphql.virtualthreads.enabled"], havingValue = "true", matchIfMissing = false)
open fun virtualThreadsTaskExecutor(contextRegistry: ContextRegistry): AsyncTaskExecutor {
open fun virtualThreadsTaskExecutor(): AsyncTaskExecutor {
LOG.info("Enabling virtual threads for DGS")

val contextRegistry =
ContextRegistry()
.loadContextAccessors()
.loadThreadLocalAccessors()
.registerThreadLocalAccessor(Slf4jThreadLocalAccessor())

val executor = SimpleAsyncTaskExecutor("dgs-virtual-thread-")
executor.setVirtualThreads(true)
executor.setTaskDecorator(
Expand Down
Loading