Merge branch 'main' into z-os-container-id

Author: laurit

RELEASING.md

@@ -12,9 +12,9 @@ as the last step, which publishes a snapshot build to
 
 ## Release cadence
 
-This repository roughly targets monthly minor releases from the `main` branch on the Thursday after
-the second Monday of the month (roughly a couple of days after the monthly minor release of
-[opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)).
+This repository roughly targets monthly minor releases from the `main` branch on the Wednesday after
+the second Monday of the month (roughly a few days after the monthly minor release of
+[opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)).
 
 ## Preparing a new major or minor release
 

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
     with(ctx.details) {
       if (id.group == "io.netty" && id.name != "netty") {
         if (id.version.startsWith("4.1.")) {
-          belongsTo("io.netty:netty-bom:4.1.116.Final", false)
+          belongsTo("io.netty:netty-bom:4.1.117.Final", false)
         } else if (id.version.startsWith("4.0.")) {
           belongsTo("io.netty:netty-bom:4.0.56.Final", false)
         }

instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts

@@ -26,26 +26,38 @@ dependencies {
     exclude("org.codehaus.groovy", "groovy")
   }
 
-  // the latest version of apache shenyu uses spring-boot 2.7
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.7.+") // related dependency
+  // the latest version of apache shenyu uses spring-boot 3.3
+  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.3.+") // related dependency
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
+// spring 6 (spring boot 3) requires java 17
+if (latestDepTest) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_17)
+  }
+}
+
 tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.apache-shenyu.experimental-span-attributes=true")
 
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
-  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+  systemProperty("testLatestDeps", latestDepTest)
 }
 
-configurations.testRuntimeClasspath {
-  resolutionStrategy {
-    // requires old logback (and therefore also old slf4j)
-    force("ch.qos.logback:logback-classic:1.2.11")
-    force("org.slf4j:slf4j-api:1.7.36")
+// spring 6 (spring boot 3) uses slf4j 2.0
+if (!latestDepTest) {
+  configurations.testRuntimeClasspath {
+    resolutionStrategy {
+      // requires old logback (and therefore also old slf4j)
+      force("ch.qos.logback:logback-classic:1.2.11")
+      force("org.slf4j:slf4j-api:1.7.36")
+    }
   }
 }

instrumentation/apache-shenyu-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ShenYuRouteTest.java

@@ -74,7 +74,7 @@ static void beforeAll()
           InvocationTargetException,
           IllegalAccessException {
 
-    Class<?> metaDataCache = null;
+    Class<?> metaDataCache;
     try {
       metaDataCache = Class.forName("org.apache.shenyu.plugin.global.cache.MetaDataCache");
     } catch (ClassNotFoundException e) {
@@ -87,17 +87,18 @@ static void beforeAll()
 
     cacheMethod.invoke(
         cacheInst,
-        new MetaData(
-            "123",
-            "test-shenyu",
-            "/",
-            "/a/b/c",
-            "http",
-            "shenyu-service",
-            "hello",
-            "string",
-            "test-ext",
-            true));
+        MetaData.builder()
+            .id("123")
+            .appName("test-shenyu")
+            .contextPath("/")
+            .path("/a/b/c")
+            .rpcType("http")
+            .serviceName("shenyu-service")
+            .methodName("hello")
+            .parameterTypes("string")
+            .rpcExt("test-ext")
+            .enabled(true)
+            .build());
   }
 
   @Test