diff --git a/smoke-tests-otel-starter/spring-boot-common/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-common/build.gradle.kts index 1e4df320a25f..7c03ffe3df1d 100644 --- a/smoke-tests-otel-starter/spring-boot-common/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-common/build.gradle.kts @@ -1,15 +1,12 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { id("otel.java-conventions") - id("org.springframework.boot") version "2.6.15" } description = "smoke-tests-otel-starter-spring-boot-common" dependencies { // spring dependencies are compile only to enable testing against different versions of spring - compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15")) compileOnly("org.springframework.boot:spring-boot-starter-web") compileOnly("org.springframework.boot:spring-boot-starter-test") compileOnly("org.springframework.boot:spring-boot-starter-data-jdbc") @@ -27,6 +24,11 @@ dependencies { implementation(project(":instrumentation:spring:starters:spring-boot-starter")) } -tasks.withType { - enabled = false +tasks { + compileJava { + with(options) { + // preserve parameter names for @SpanAttribute + compilerArgs.add("-parameters") + } + } } diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts index 77eeb8ea3d0d..2950d0ab1f7d 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts @@ -1,22 +1,15 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { id("otel.java-conventions") - id("org.springframework.boot") version "2.6.15" } description = "smoke-tests-otel-starter-spring-boot-reactive-common" dependencies { // spring dependencies are compile only to enable testing against different versions of spring - compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15")) compileOnly("org.springframework.boot:spring-boot-starter-web") compileOnly("org.springframework.boot:spring-boot-starter-webflux") compileOnly("org.springframework.boot:spring-boot-starter-test") compileOnly("org.springframework.boot:spring-boot-starter-data-r2dbc") api(project(":smoke-tests-otel-starter:spring-smoke-testing")) } - -tasks.withType { - enabled = false -} diff --git a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts index fbbb80bd6478..0ffd2f38de95 100644 --- a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts @@ -1,22 +1,15 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { id("otel.java-conventions") - id("org.springframework.boot") version "2.6.15" } description = "smoke-tests-otel-starter-spring-smoke-testing" dependencies { // spring dependencies are compile only to enable testing against different versions of spring - compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15")) compileOnly("org.springframework.boot:spring-boot-starter") compileOnly("org.springframework.boot:spring-boot-starter-test") api(project(":testing-common")) api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi") implementation("com.google.guava:guava") } - -tasks.withType { - enabled = false -}