Merge branch 'main' into restlet-1.1-java

Author: laurit

.github/workflows/build-common.yml

@@ -198,7 +198,7 @@ jobs:
           - 11
           - 17
           - 21
-          - 22
+          - 23
         vm:
           - hotspot
           - openj9
@@ -209,7 +209,7 @@ jobs:
           - 3
         exclude:
           - vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
-          - test-java-version: 22
+          - test-java-version: 23
             vm: openj9
       fail-fast: false
     steps:

build.gradle.kts

@@ -49,7 +49,7 @@ if (project.findProperty("skipTests") as String? == "true") {
   }
 }
 
-if (gradle.startParameter.taskNames.any { it.equals("listTestsInPartition") }) {
+if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
   tasks {
     val listTestsInPartition by registering {
       group = "Help"

conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

@@ -37,6 +37,7 @@ abstract class TestLatestDepsRule : ComponentMetadataRule {
     if (version.contains("-alpha", true)
       || version.contains("-beta", true)
       || version.contains("-rc", true)
+      || version.contains(".rc", true)
       || version.contains("-m", true) // e.g. spring milestones are published to grails repo
       || version.contains(".m", true) // e.g. lettuce
       || version.contains(".alpha", true) // e.g. netty

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java

@@ -12,6 +12,7 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -114,7 +115,7 @@ public SimpleHttpRequest buildRequest(String method, URI uri, Map<String, String
 
     @Override
     HttpResponse executeRequest(SimpleHttpRequest request, URI uri) throws Exception {
-      return client.execute(request, getContext(), null).get();
+      return client.execute(request, getContext(), null).get(30, TimeUnit.SECONDS);
     }
 
     @Override

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts

@@ -18,6 +18,11 @@ dependencies {
   testServer("org.wildfly:wildfly-dist:18.0.0.Final@zip")
 }
 
+otelJava {
+  // due to security manager deprecation this test does not work on jdk 23 with default configuration
+  maxJavaVersionForTests.set(JavaVersion.VERSION_22)
+}
+
 tasks {
   // extract wildfly dist, path is used from arquillian.xml
   val setupServer by registering(Copy::class) {

instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts

@@ -19,6 +19,11 @@ dependencies {
   testServer("org.wildfly:wildfly-dist:18.0.0.Final@zip")
 }
 
+otelJava {
+  // due to security manager deprecation this test does not work on jdk 23 with default configuration
+  maxJavaVersionForTests.set(JavaVersion.VERSION_22)
+}
+
 tasks {
   // extract wildfly dist, path is used from arquillian.xml
   val setupServer by registering(Copy::class) {