Merge branch 'main' into kafka-client-2.6-capture-headers

Author: mznet

benchmark-overhead/Dockerfile.petclinic

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.27_6-jdk@sha256:2fd4e5e0ba72f725016e757a5688ce14fda6a792da566fca62ef6ff73f50df35 as app-build
+FROM eclipse-temurin:11.0.27_6-jdk@sha256:cbc64d6d1a253561c029fd951575c449d70558063d5f898ab0b6213bc1fb0109 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.7@sha256:143e4c24da2872fad6803fcbde5d335bbbe47dddb8ebf20fd916c02bdc7f463b
+FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.1.0"
+  id("com.diffplug.spotless") version "7.2.0"
 }
 
 spotless {

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.1.0"
+  id("com.diffplug.spotless") version "7.2.0"
 }
 
 spotless {
@@ -54,7 +54,7 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.0")
   implementation("com.google.guava:guava:33.4.8-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")

examples/distro/build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.1.0"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.0"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.19.0-alpha-SNAPSHOT"
   }

examples/extension/build.gradle

@@ -11,7 +11,7 @@ plugins {
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
   id "com.gradleup.shadow" version "8.3.8"
-  id "com.diffplug.spotless" version "7.1.0"
+  id "com.diffplug.spotless" version "7.2.0"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.19.0-alpha-SNAPSHOT"
   id "io.opentelemetry.instrumentation.muzzle-check" version "2.19.0-alpha-SNAPSHOT"

javaagent/src/test/java/io/opentelemetry/javaagent/ShadingTest.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import org.junit.jupiter.api.Test;
+
+class ShadingTest {
+
+  private static final List<String> EXPECTED_ENTRY_PREFIXES =
+      asList("io/opentelemetry/javaagent/", "inst/", "META-INF/");
+
+  @Test
+  void agentJarContainsOnlyExpectedEntries() throws Exception {
+    String agentJarPath = getAgentJarPath();
+    assertThat(agentJarPath).isNotNull();
+
+    File agentJar = new File(agentJarPath);
+    assertThat(agentJar).exists();
+    assertThat(agentJar).isFile();
+
+    List<String> unexpectedEntries = new ArrayList<>();
+
+    try (JarFile jarFile = new JarFile(agentJar)) {
+      jarFile.stream()
+          .map(JarEntry::getName)
+          .filter(entryName -> !entryName.endsWith("/")) // Skip directories
+          .forEach(
+              entryName -> {
+                boolean isExpected =
+                    EXPECTED_ENTRY_PREFIXES.stream().anyMatch(entryName::startsWith);
+                if (!isExpected) {
+                  unexpectedEntries.add(entryName);
+                }
+              });
+    }
+
+    assertThat(unexpectedEntries)
+        .as(
+            "Agent jar should only contain entries with expected prefixes: %s",
+            EXPECTED_ENTRY_PREFIXES)
+        .isEmpty();
+  }
+
+  private static String getAgentJarPath() {
+    RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+    for (String arg : runtimeMxBean.getInputArguments()) {
+      if (arg.startsWith("-javaagent:")) {
+        return arg.substring("-javaagent:".length());
+      }
+    }
+    return null;
+  }
+}

smoke-tests/images/early-jdk8/Dockerfile

@@ -1,5 +1,5 @@
 # https://github.com/zulu-openjdk/zulu-openjdk/blob/master/ubuntu/8u412-8.78/Dockerfile
-FROM ubuntu:noble-20250619@sha256:440dcf6a5640b2ae5c77724e68787a906afb8ddee98bf86db94eea8528c2c076
+FROM ubuntu:noble-20250714@sha256:a08e551cb33850e4740772b38217fc1796a66da2506d312abe51acda354ff061
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'