Skip to content

Commit c5a98d6

Browse files
authored
fix: kotlin compiler daemon memory settings (#8829)
Also, avoid warning by explicitly opting in coroutines.
1 parent b4aebf8 commit c5a98d6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

dd-java-agent/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import datadog.trace.core.DDSpan
22
import datadog.trace.instrumentation.kotlin.coroutines.AbstractKotlinCoroutineInstrumentationTest
3+
import kotlin.OptIn
34
import kotlinx.coroutines.CoroutineDispatcher
5+
import kotlinx.coroutines.ExperimentalCoroutinesApi
46

7+
@OptIn(markerClass = ExperimentalCoroutinesApi)
58
class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrumentationTest<KotlinCoroutineTests> {
69

710
@Override

dd-java-agent/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer.get
33
import datadog.trace.instrumentation.kotlin.coroutines.CoreKotlinCoroutineTests
44
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
55
import kotlinx.coroutines.CoroutineDispatcher
6+
import kotlinx.coroutines.ExperimentalCoroutinesApi
67
import kotlinx.coroutines.channels.actor
78
import kotlinx.coroutines.channels.consumeEach
89
import kotlinx.coroutines.channels.produce
910
import kotlinx.coroutines.channels.toChannel
1011

12+
@OptIn(ExperimentalCoroutinesApi::class)
1113
@SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE")
1214
class KotlinCoroutineTests(dispatcher: CoroutineDispatcher) : CoreKotlinCoroutineTests(dispatcher) {
1315

gradle/java_no_deps.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,7 @@ project.afterEvaluate {
228228
if (project.plugins.hasPlugin('kotlin')) {
229229
['compileKotlin', 'compileTestKotlin'].each { type ->
230230
tasks.named(type).configure {
231-
kotlinOptions {
232-
freeCompilerArgs += '-Xmx256m'
233-
}
231+
kotlinDaemonJvmArguments = ["-Xmx256m", "-XX:+UseParallelGC"]
234232
}
235233
}
236234
}

0 commit comments

Comments
 (0)