Fix japicmp (#8067)

Author: jack-berg

buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts

@@ -74,7 +74,7 @@ fun getAllPublishedModules(): List<Project> {
   }.toList()
 }
 
-fun getOldClassPath(version: String): List<File> {
+fun getClasspathForVersion(version: String): List<File> {
   // Temporarily change the group name because we want to fetch an artifact with the same
   // Maven coordinates as the project, which Gradle would not allow otherwise.
   val existingGroup = group
@@ -95,7 +95,7 @@ fun getOldClassPath(version: String): List<File> {
   }
 }
 
-fun getNewClassPath(): List<File> {
+fun getCurrentClassPath(): List<File> {
   return getAllPublishedModules().map {
     val archiveFile = it.tasks.getByName<Jar>("jar").archiveFile
     archiveFile.get().asFile
@@ -125,8 +125,8 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
         // and generates false positive compatibility errors when methods are lifted into superclasses,
         // superinterfaces.
         val archiveName = base.archivesName.get()
-        val newClassPath = getNewClassPath()
-        val oldClassPath = getOldClassPath(baselineVersion)
+        val newClassPath = apiNewVersion?.let { getClasspathForVersion(it) } ?: getCurrentClassPath()
+        val oldClassPath = getClasspathForVersion(baselineVersion)
         val pattern = (archiveName + "-([0-9\\.]*)(-SNAPSHOT)?.jar").toRegex()
         val newArchive = newClassPath.singleOrNull { it.name.matches(pattern) }
         val oldArchive = oldClassPath.singleOrNull { it.name.matches(pattern) }

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-api.txt

@@ -1,4 +1,4 @@
-Comparing source compatibility of opentelemetry-api-1.60.0-SNAPSHOT.jar against opentelemetry-api-1.58.0.jar
+Comparing source compatibility of opentelemetry-api-1.59.0.jar against opentelemetry-api-1.58.0.jar
 ***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.common.AttributeKey  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	GENERIC TEMPLATES: === T:java.lang.Object

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-common-1.60.0-SNAPSHOT.jar against opentelemetry-common-1.58.0.jar
+Comparing source compatibility of opentelemetry-common-1.59.0.jar against opentelemetry-common-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-context.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-context-1.60.0-SNAPSHOT.jar against opentelemetry-context-1.58.0.jar
+Comparing source compatibility of opentelemetry-context-1.59.0.jar against opentelemetry-context-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-common-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-common-1.59.0.jar against opentelemetry-exporter-common-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-logging-otlp.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.59.0.jar against opentelemetry-exporter-logging-otlp-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-logging.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-1.59.0.jar against opentelemetry-exporter-logging-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-otlp-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-otlp-common-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-otlp-common-1.59.0.jar against opentelemetry-exporter-otlp-common-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-otlp.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-otlp-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-otlp-1.59.0.jar against opentelemetry-exporter-otlp-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-sender-grpc-managed-channel.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.59.0.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.58.0.jar
 No changes.