From 258a605e2f54bbbaf62cf8b99b6be5e7d4a5c1d2 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 15 May 2025 11:59:40 +0200 Subject: [PATCH] fix: kotlin compiler daemon memory settings Also, avoid warning by explicitly opting in coroutines. --- .../src/test/groovy/KotlinCoroutineInstrumentationTest.groovy | 3 +++ .../kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt | 2 ++ gradle/java_no_deps.gradle | 4 +--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy index 95403c64a06..d905b9d87f8 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -1,7 +1,10 @@ import datadog.trace.core.DDSpan import datadog.trace.instrumentation.kotlin.coroutines.AbstractKotlinCoroutineInstrumentationTest +import kotlin.OptIn import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.ExperimentalCoroutinesApi +@OptIn(markerClass = ExperimentalCoroutinesApi) class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrumentationTest { @Override diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt b/dd-java-agent/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt index a1baec0f0f5..87306e30d1c 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt +++ b/dd-java-agent/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt @@ -3,11 +3,13 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer.get import datadog.trace.instrumentation.kotlin.coroutines.CoreKotlinCoroutineTests import edu.umd.cs.findbugs.annotations.SuppressFBWarnings import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.actor import kotlinx.coroutines.channels.consumeEach import kotlinx.coroutines.channels.produce import kotlinx.coroutines.channels.toChannel +@OptIn(ExperimentalCoroutinesApi::class) @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") class KotlinCoroutineTests(dispatcher: CoroutineDispatcher) : CoreKotlinCoroutineTests(dispatcher) { diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index bd4f3ed0aac..51d7225dce3 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -228,9 +228,7 @@ project.afterEvaluate { if (project.plugins.hasPlugin('kotlin')) { ['compileKotlin', 'compileTestKotlin'].each { type -> tasks.named(type).configure { - kotlinOptions { - freeCompilerArgs += '-Xmx256m' - } + kotlinDaemonJvmArguments = ["-Xmx256m", "-XX:+UseParallelGC"] } } }