Merge branch 'otel_main' into add_metric_annotation_instrument

Author: Duncan-tree-zhou

.github/workflows/reusable-markdown-link-check.yml

@@ -17,7 +17,7 @@ jobs:
           # excluding links to pull requests and issues is done for performance
           args: >
             --include-fragments
-            --exclude "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issue|pull)/\\d+$"
+            --exclude "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issues|pull)/\\d+$"
             --exclude "^http://code.google.com/p/concurrentlinkedhashmap$"
             --max-retries 6
             .

benchmark-overhead/Dockerfile.petclinic

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.26_4-jdk@sha256:dbec31f15dc815b1094e4e646c8b33b1e45f1ba8e7b0866b6fb3bbf396217487 as app-build
+FROM eclipse-temurin:11.0.26_4-jdk@sha256:8079494e381af731e6abea6123696a5051a054dbb18e5f7f1f73867b3179837f as app-build
 
 # This is the base image that will contain a built version of the spring-petclinic-rest
 # application. Installing the dependencies and maven compiling the application is time
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
 RUN ./mvnw package -Dmaven.test.skip=true
 RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
 
-FROM bellsoft/liberica-openjdk-alpine:21.0.6@sha256:5f23f8082baea518a1657b420dbe19c181483255209b70af836543d6068fed8c
+FROM bellsoft/liberica-openjdk-alpine:21.0.7@sha256:143e4c24da2872fad6803fcbde5d335bbbe47dddb8ebf20fd916c02bdc7f463b
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
 
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
-  testImplementation("org.testcontainers:postgresql:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
+  testImplementation("org.testcontainers:postgresql:1.21.0")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

benchmark-overhead/src/test/java/io/opentelemetry/OverheadTests.java

@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,11 +146,11 @@ private void doWarmupPhase(TestConfig testConfig, GenericContainer<?> petclinic)
         System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(testConfig.getWarmupSeconds());
     while (System.currentTimeMillis() < deadline) {
       GenericContainer<?> k6 =
-          new GenericContainer<>(DockerImageName.parse("loadimpact/k6"))
+          new GenericContainer<>(DockerImageName.parse("grafana/k6"))
               .withNetwork(NETWORK)
               .withCopyFileToContainer(MountableFile.forHostPath("./k6"), "/app")
               .withCommand("run", "-u", "5", "-i", "200", "/app/basic.js")
-              .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+              .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)));
       k6.start();
     }
 

benchmark-overhead/src/test/java/io/opentelemetry/containers/PetClinicRestContainer.java

@@ -87,7 +87,7 @@ private String[] buildCommandline(Optional<Path> agentJar) {
                 "-Dotel.traces.exporter=otlp",
                 "-Dotel.imr.export.interval=5000",
                 "-Dotel.exporter.otlp.insecure=true",
-                "-Dotel.exporter.otlp.endpoint=http://collector:4317",
+                "-Dotel.exporter.otlp.endpoint=http://collector:4318",
                 "-Dotel.resource.attributes=service.name=petclinic-otel-overhead"));
     result.addAll(this.agent.getAdditionalJvmArgs());
     agentJar.ifPresent(path -> result.add("-javaagent:/app/" + path.getFileName()));

conventions/build.gradle.kts

@@ -67,7 +67,7 @@ dependencies {
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.5")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
-  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
+  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 

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

@@ -62,7 +62,6 @@ tasks {
         disable("UnnecessarilyFullyQualified")
 
         // TODO (trask) use animal sniffer
-        disable("Java7ApiChecker")
         disable("Java8ApiChecker")
         disable("AndroidJdkLibsChecker")
 
@@ -124,8 +123,8 @@ tasks {
 
         disable("NonFinalStaticField")
 
-        // We get this warning in modules that compile for old java versions
-        disable("StringConcatToTextBlock")
+        // Requires adding compile dependency to JSpecify
+        disable("AddNullMarkedToPackageInfo")
 
         if (testLatestDeps) {
           // Some latest dep tests are compiled for java 17 although the base version uses an older

dependencyManagement/build.gradle.kts

@@ -33,12 +33,12 @@ val DEPENDENCY_BOMS = listOf(
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:1.20.6"
+  "org.testcontainers:testcontainers-bom:1.21.0"
 )
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.37.0"
+val errorProneVersion = "2.38.0"
 val byteBuddyVersion = "1.17.5"
 val asmVersion = "9.8"
 val jmhVersion = "1.37"
@@ -82,8 +82,8 @@ val CORE_DEPENDENCIES = listOf(
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
   "org.junit.jupiter:junit-jupiter-api:5.12.2",
-  "org.spockframework:spock-core:2.4-M5-groovy-4.0",
-  "org.spockframework:spock-junit4:2.4-M5-groovy-4.0",
+  "org.spockframework:spock-core:2.4-M6-groovy-4.0",
+  "org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
 
   "io.r2dbc:r2dbc-proxy:1.1.5.RELEASE",
   "ch.qos.logback:logback-classic:1.3.15", // 1.4+ requires Java 11+

examples/distro/smoke-tests/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
   testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

examples/extension/build.gradle

@@ -97,7 +97,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.17.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
   testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")