Merge branch 'main' into fix-post-release-workflow

laurit · web-flow · commit a2be5ba8426a · 2025-11-20T07:52:13.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-## Version 2.22.0 (2025-11-19)
+## Version 2.22.0 (2025-11-20)
 
 ### ⚠️ Breaking Changes
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -76,24 +76,25 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
         throw GradleException("Invalid test partition")
       }
 
-      val partitionTasks = ArrayList<Test>()
+      val partitionTasks = ArrayList<String>()
       var testPartitionCounter = 0
       subprojects {
         // relying on predictable ordering of subprojects
         // (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4)
         // since we are splitting these tasks across different github action jobs
         val enabled = testPartitionCounter++ % 4 == testPartition
         if (enabled) {
+          val projectPath = this.path
           tasks.withType<Test>().configureEach {
-            partitionTasks.add(this)
+            val taskPath = projectPath + ":" + this.name
+            partitionTasks.add(taskPath)
           }
         }
       }
 
       doLast {
         File("test-tasks.txt").printWriter().use { writer ->
-          partitionTasks.forEach { task ->
-            var taskPath = task.project.path + ":" + task.name
+          partitionTasks.forEach { taskPath ->
             // smoke tests are run separately
             // :instrumentation:test runs all instrumentation tests
             if (taskPath != ":smoke-tests:test" && taskPath != ":instrumentation:test") {
diff --git a/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-instrumentation-annotations.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0.jar against opentelemetry-instrumentation-annotations-2.21.0.jar
+No changes.
diff --git a/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-instrumentation-api.txt b/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-instrumentation-api.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.22.0.jar against opentelemetry-instrumentation-api-2.21.0.jar
+No changes.
diff --git a/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-spring-boot-autoconfigure.txt
@@ -0,0 +1,5 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0.jar against opentelemetry-spring-boot-autoconfigure-2.21.0.jar
+===  UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	---  REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
+		---  REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)
diff --git a/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/2.22.0_vs_2.21.0/opentelemetry-spring-boot-starter.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.22.0.jar against opentelemetry-spring-boot-starter-2.21.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.21.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.22.0.jar
 No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.21.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.22.0.jar
 No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt
@@ -1,5 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.21.0.jar
-===  UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration  (not serializable)
-	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
-	---  REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
-		---  REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.22.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.21.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.23.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.22.0.jar
 No changes.
diff --git a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
@@ -136,10 +136,21 @@ val muzzle by tasks.registering {
 tasks.register("printMuzzleReferences") {
   group = "Muzzle"
   description = "Print references created by instrumentation muzzle"
+  val muzzleShadowJarFile = shadowModule.flatMap { it.archiveFile }
+  val muzzleToolingShadowJarFile = shadowMuzzleTooling.flatMap { it.archiveFile }
+  
   dependsOn(compileMuzzle)
   dependsOn(shadowModule)
+  dependsOn(shadowMuzzleTooling)
+  
   doLast {
-    val instrumentationCL = createInstrumentationClassloader()
+    // Create instrumentation classloader
+    val instrumentationUrls = arrayOf(
+      muzzleShadowJarFile.get().asFile.toURI().toURL(),
+      muzzleToolingShadowJarFile.get().asFile.toURI().toURL()
+    )
+    val instrumentationCL = URLClassLoader(instrumentationUrls, ClassLoader.getPlatformClassLoader())
+    
     MuzzleGradlePluginUtil.printMuzzleReferences(instrumentationCL)
   }
 }
@@ -149,7 +160,8 @@ val hasRelevantTask = gradle.startParameter.taskNames.any {
   val taskName = it.removePrefix(":")
   val projectPath = project.path.substring(1)
   // Either the specific muzzle task in this project or a top level muzzle task.
-  taskName == "${projectPath}:muzzle" || taskName.startsWith("instrumentation:muzzle")
+  taskName == "${projectPath}:muzzle" || taskName.startsWith("instrumentation:muzzle") ||
+    taskName.contains(":muzzle-Assert")
 }
 
 if (hasRelevantTask) {
@@ -206,10 +218,8 @@ fun getProjectRepositories(project: Project): List<RemoteRepository> {
   return projectRepositories
 }
 
-fun createInstrumentationClassloader(): ClassLoader {
+fun createInstrumentationClassloader(muzzleShadowJar: File, muzzleToolingShadowJar: File): ClassLoader {
   logger.info("Creating instrumentation class loader for: $path")
-  val muzzleShadowJar = shadowModule.get().archiveFile.get()
-  val muzzleToolingShadowJar = shadowMuzzleTooling.get().archiveFile.get()
   return classpathLoader(files(muzzleShadowJar, muzzleToolingShadowJar), ClassLoader.getPlatformClassLoader())
 }
 
@@ -296,24 +306,42 @@ fun addMuzzleTask(muzzleDirective: MuzzleDirective, versionArtifact: Artifact?,
   }
 
   val muzzleTask = tasks.register(taskName) {
+    val configFiles = config.incoming.files
+    val muzzleShadowJarFile = shadowModule.flatMap { it.archiveFile }
+    val muzzleToolingShadowJarFile = shadowMuzzleTooling.flatMap { it.archiveFile }
+    val muzzleBootstrapShadowJarFile = shadowMuzzleBootstrap.flatMap { it.archiveFile }
+    val excludedNames = muzzleDirective.excludedInstrumentationNames.get()
+    val shouldAssertPass = muzzleDirective.assertPass.get()
+    
     dependsOn(configurations.named("runtimeClasspath"))
     dependsOn(shadowModule)
+    dependsOn(shadowMuzzleTooling)
+    dependsOn(shadowMuzzleBootstrap)
+    
     doLast {
-      val instrumentationCL = createInstrumentationClassloader()
-      val userCL = createClassLoaderForTask(config)
+      // Create instrumentation classloader
+      val instrumentationUrls = arrayOf(
+        muzzleShadowJarFile.get().asFile.toURI().toURL(),
+        muzzleToolingShadowJarFile.get().asFile.toURI().toURL()
+      )
+      val instrumentationCL = URLClassLoader(instrumentationUrls, ClassLoader.getPlatformClassLoader())
+      
+      // Create user classloader
+      val userUrls = (configFiles + muzzleBootstrapShadowJarFile.get().asFile).map { it.toURI().toURL() }.toTypedArray()
+      val userCL = URLClassLoader(userUrls, ClassLoader.getPlatformClassLoader())
+      
       MuzzleGradlePluginUtil.assertInstrumentationMuzzled(instrumentationCL, userCL,
-        muzzleDirective.excludedInstrumentationNames.get(), muzzleDirective.assertPass.get())
+        excludedNames, shouldAssertPass)
     }
   }
 
   runAfter.configure { finalizedBy(muzzleTask) }
   return muzzleTask
 }
 
-fun createClassLoaderForTask(muzzleTaskConfiguration: Configuration): ClassLoader {
+fun createClassLoaderForTask(muzzleTaskFiles: FileCollection, muzzleBootstrapShadowJar: File): ClassLoader {
   logger.info("Creating user class loader for muzzle check")
-  val muzzleBootstrapShadowJar = shadowMuzzleBootstrap.get().archiveFile.get()
-  return classpathLoader(muzzleTaskConfiguration + files(muzzleBootstrapShadowJar), ClassLoader.getPlatformClassLoader())
+  return classpathLoader(muzzleTaskFiles + files(muzzleBootstrapShadowJar), ClassLoader.getPlatformClassLoader())
 }
 
 fun inverseOf(muzzleDirective: MuzzleDirective, system: RepositorySystem, session: RepositorySystemSession, repos: List<RemoteRepository>): Set<MuzzleDirective> {
diff --git a/testing/agent-for-testing/build.gradle.kts b/testing/agent-for-testing/build.gradle.kts
@@ -24,21 +24,37 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-api")
 }
 
+abstract class ExtractJar : Copy() {
+  @get:InputFiles
+  abstract val jarFile: ConfigurableFileCollection
+
+  @get:Inject
+  abstract val archiveOperations: ArchiveOperations
+
+  init {
+    from(jarFile.elements.map { files -> files.map { archiveOperations.zipTree(it) } })
+  }
+}
+
 tasks {
+  val extractAgent by registering(ExtractJar::class) {
+    jarFile.from(agent)
+    into(layout.buildDirectory.dir("extracted-agent"))
+  }
+
   jar {
-    dependsOn(agent)
-    from(zipTree(agent.singleFile))
+    from(extractAgent.map { it.outputs.files })
     from(extensionLibs) {
       into("extensions")
     }
 
-    manifest.from(
-      providers.provider {
-        zipTree(agent.singleFile).matching {
-          include("META-INF/MANIFEST.MF")
-        }.singleFile
-      }
-    )
+    val manifestFileProvider = extractAgent.flatMap { task ->
+      layout.buildDirectory.file("extracted-agent/META-INF/MANIFEST.MF")
+    }
+
+    doFirst {
+      manifest.from(manifestFileProvider.get().asFile)
+    }
   }
 
   afterEvaluate {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0.jar against opentelemetry-instrumentation-annotations-2.21.0.jar`
	`2`	`+No changes.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.21.0.jar`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.22.0.jar`
`2`	`2`	`No changes.`