Merge branch 'master' into andrea.marziali/reactor-netty-ws

Author: amarziali

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<KotlinCoroutineTests> {
 
   @Override

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) {
 

dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java

@@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
     // we may have the status during response blocking, but in that case
     // the status code is not propagated to the servlet layer
     if (currentStatus == null || !span.isError()) {
-      span.setHttpStatusCode(status);
+      super.onResponseStatus(span, status);
     }
     return span;
   }

dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Test.groovy

@@ -127,15 +127,6 @@ abstract class Liberty20Test extends HttpServerTest<Server> {
     true
   }
 
-  @Override
-  String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
-    if (endpoint.path == '/not-found') {
-      'GET /testapp/not-found'
-    } else {
-      super.expectedResourceName(endpoint, method, address)
-    }
-  }
-
   def 'test blocking on response with commit during the response'() {
     setup:
     assumeTrue(testBlockingOnResponse())

dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java

@@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
     // we may have the status during response blocking, but in that case
     // the status code is not propagated to the servlet layer
     if (currentStatus == null || !span.isError()) {
-      span.setHttpStatusCode(status);
+      super.onResponseStatus(span, status);
     }
     return span;
   }

dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Test.groovy

@@ -117,15 +117,6 @@ abstract class Liberty23Test extends HttpServerTest<Server> {
     true
   }
 
-  @Override
-  String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
-    if (endpoint.path == '/not-found') {
-      'GET /testapp/not-found'
-    } else {
-      super.expectedResourceName(endpoint, method, address)
-    }
-  }
-
   def 'test blocking on response with commit during the response'() {
     setup:
     assumeTrue(testBlockingOnResponse())

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"]
       }
     }
   }