Add baseVersion(...) DSL helper for JvmTestSuite latest-deps selection

Replaces the 'if (otelProps.testLatestDeps) "latest.release" else "X.Y.Z"' ternary used inside JvmTestSuite dependency blocks with a dedicated DSL helper:

  baseVersion("4.0.0").orLatest()        // -> "latest.release" or "4.0.0"

  baseVersion("4.0.0").orLatest("5.+")   // -> "5.+" or "4.0.0"

Implemented as a Project extension registered alongside otelProps. Renames otel.props-conventions to otel.dsl-conventions to reflect the broader role.

Author: trask

conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

@@ -5,7 +5,7 @@ import io.opentelemetry.javaagent.muzzle.AcceptableVersions
 
 plugins {
   `java-library`
-  id("otel.props-conventions")
+  id("otel.dsl-conventions")
 }
 
 val otelProps = the<OtelPropsExtension>()

conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/BaseVersionExtension.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.gradle
+
+import org.gradle.api.Project
+
+/**
+ * Project extension that produces a version string suitable for use inside `JvmTestSuite`
+ * dependency blocks (where `library()` / `testLibrary()` are unavailable).
+ *
+ * In `build.gradle.kts`:
+ * ```
+ * implementation("g:a:${baseVersion("4.0.0").orLatest()}")
+ * implementation("g:a:${baseVersion("4.0.0").orLatest("5.+")}")
+ * ```
+ *
+ * `orLatest()` resolves to `"latest.release"` when `-PtestLatestDeps=true`, otherwise to the
+ * base version. `orLatest(constraint)` lets the caller cap the latest-deps resolution to a
+ * specific range (e.g. `"5.+"`) instead of letting it float to whatever the newest release
+ * happens to be.
+ */
+open class BaseVersionExtension(private val project: Project) {
+  operator fun invoke(baseVersion: String): BaseVersion = BaseVersion(project, baseVersion)
+}
+
+class BaseVersion(private val project: Project, private val baseVersion: String) {
+  fun orLatest(): String = orLatest("latest.release")
+
+  fun orLatest(latestConstraint: String): String =
+    if (project.findProperty("testLatestDeps") == "true") latestConstraint else baseVersion
+}

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

@@ -0,0 +1,5 @@
+import io.opentelemetry.instrumentation.gradle.BaseVersionExtension
+import io.opentelemetry.instrumentation.gradle.OtelPropsExtension
+
+extensions.create<OtelPropsExtension>("otelProps", project)
+extensions.create<BaseVersionExtension>("baseVersion", project)

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

@@ -2,7 +2,7 @@ import io.opentelemetry.instrumentation.gradle.OtelPropsExtension
 import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
-  id("otel.props-conventions")
+  id("otel.dsl-conventions")
   id("net.ltgt.errorprone")
 }
 

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

@@ -9,7 +9,7 @@ plugins {
   checkstyle
   idea
 
-  id("otel.props-conventions")
+  id("otel.dsl-conventions")
   id("otel.errorprone-conventions")
   id("otel.spotless-conventions")
   id("org.sonatype.gradle.plugins.scan")

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

@@ -43,7 +43,7 @@ testing {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
-        val version = if (otelProps.testLatestDeps) "latest.release" else "1.12.80"
+        val version = baseVersion("1.12.80").orLatest()
         implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
       }
     }

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

@@ -120,16 +120,16 @@ testing {
   suites {
     val s3PresignerTest by registering(JvmTestSuite::class) {
       dependencies {
-        val version = if (otelProps.testLatestDeps) "latest.release" else "2.10.12"
+        val version = baseVersion("2.10.12").orLatest()
         implementation("software.amazon.awssdk:s3:$version")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
       }
     }
 
     val s3CrtTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("software.amazon.awssdk:s3:" + if (otelProps.testLatestDeps) "latest.release" else "2.27.21")
-        implementation("software.amazon.awssdk.crt:aws-crt:" + if (otelProps.testLatestDeps) "latest.release" else "0.30.11")
+        implementation("software.amazon.awssdk:s3:${baseVersion("2.27.21").orLatest()}")
+        implementation("software.amazon.awssdk.crt:aws-crt:${baseVersion("0.30.11").orLatest()}")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
         implementation("org.testcontainers:testcontainers-localstack")
       }
@@ -147,7 +147,7 @@ testing {
       dependencies {
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
         // 2.25.63 is the first release with Converse API
-        val version = if (otelProps.testLatestDeps) "latest.release" else "2.25.63"
+        val version = baseVersion("2.25.63").orLatest()
         implementation("software.amazon.awssdk:bedrockruntime:$version")
       }
 

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -39,7 +39,7 @@ testing {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
         compileOnly("software.amazon.awssdk:sqs:2.2.0")
-        val version = if (otelProps.testLatestDeps) "latest.release" else "2.2.0"
+        val version = baseVersion("2.2.0").orLatest()
         implementation("software.amazon.awssdk:aws-core:$version")
         implementation("software.amazon.awssdk:aws-json-protocol:$version")
         implementation("software.amazon.awssdk:dynamodb:$version")
@@ -51,7 +51,7 @@ testing {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
-        val version = if (otelProps.testLatestDeps) "latest.release" else "2.17.0"
+        val version = baseVersion("2.17.0").orLatest()
         implementation("software.amazon.awssdk:lambda:$version")
       }
     }
@@ -60,7 +60,7 @@ testing {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
-        val version = if (otelProps.testLatestDeps) "latest.release" else "2.25.63"
+        val version = baseVersion("2.25.63").orLatest()
         implementation("software.amazon.awssdk:bedrockruntime:$version")
       }
     }

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -48,7 +48,7 @@ testing {
       dependencies {
         implementation(project(":instrumentation:reactor:reactor-3.1:library"))
         implementation(project(":instrumentation-annotations"))
-        val version = if (otelProps.testLatestDeps) "latest.release" else "3.1.0.RELEASE"
+        val version = baseVersion("3.1.0.RELEASE").orLatest()
         implementation("io.projectreactor:reactor-test:$version")
       }
     }