Convert Spring Boot 3 / quarkus / armeria / vertx to smoke-test plugin#11421
Draft
bric3 wants to merge 5 commits into
Draft
Convert Spring Boot 3 / quarkus / armeria / vertx to smoke-test plugin#11421bric3 wants to merge 5 commits into
bric3 wants to merge 5 commits into
Conversation
Adds a new included build `build-logic/` hosting a single subproject
`smoke-test` that exposes the `dd-trace-java.smoke-test-app` plugin.
The plugin contributes:
- `NestedGradleBuild` task type that runs a nested Gradle build via the
Gradle Tooling API. It pins the nested Gradle version (no committed
per-application wrappers), uses the configured Java toolchain for the
nested daemon, forwards artifact paths from the root build as
`-P<name>=<path>`, and redirects the nested `buildDir` via
`-PappBuildDir=<path>` so outputs land under the outer project's build
directory.
- `smokeTestApp` project extension with an `application { ... }` block
that registers the `NestedGradleBuild` task, wires it into every `Test`
task via `dependsOn` + a `jvmArgumentProvider` for the produced
artifact's system property. Consumers can also register
`NestedGradleBuild` directly when they need more control; the plugin
is a no-op until `application` or a manual registration is done.
- `projectJar(name, project)` helper that forwards a sibling project's
jar to the nested build through a resolvable `Configuration` (avoids
`evaluationDependsOn` and the cross-project access ordering issues).
The plugin is verified with JUnit 5 unit tests (`ProjectBuilder`) and
end-to-end tests that drive the Tooling API path through the Gradle Test
Kit with a temporary Kotlin-DSL test project.
`build-logic/settings.gradle.kts` references the existing
`gradle/libs.versions.toml` catalog (mirroring `buildSrc/`) so the
plugin can use the same library coordinates as the rest of the repo.
The Gradle libs Maven repository (`https://repo.gradle.org/gradle/libs-releases`,
scoped to `org.gradle:`) is added to the root build's `pluginManagement`
and to `gradle/repositories.gradle` so the Tooling API jar resolves.
Smoke-test modules with Spring Boot plugin versions incompatible with
Gradle 9 will use this plugin in follow-up PRs instead of a committed
Gradle 8 wrapper.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…14.5
Set conventions on `smokeTestApp`:
- `gradleVersion` defaults to `"8.14.5"` (Gradle 8 last release; pinned because
Spring Boot plugin pre-3.5 calls `Configuration.getUploadTaskName()`, removed
in Gradle 9).
- `javaLauncher` defaults to a JDK 21 toolchain (the version the root build
requires for its own Gradle 9 migration; standardising the nested daemon on
the same JDK avoids requiring an extra toolchain on dev machines and CI
runners).
Consumers that need a different JDK or Gradle version still override
explicitly. The inner build script is responsible for pinning the produced
bytecode level (`java { sourceCompatibility = JavaVersion.VERSION_1_8 }` or
similar) — Gradle adds `--release N` automatically when source/target differs
from the daemon JVM.
`JavaToolchainService` is now injected into the extension; this works in any
project where a `java*` (or related) plugin is applied. Smoke-test modules
already apply `gradle/java.gradle`, which applies `java`, so the convention
resolves on first read.
Public defaults exposed as `DEFAULT_NESTED_GRADLE_VERSION` and
`DEFAULT_NESTED_JAVA_VERSION` constants so the values are discoverable.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…ugin
Switch the plugin sources and unit tests over to the typed
`org.gradle.kotlin.dsl` extension functions where they replace
`::class.java` boilerplate:
- `tasks.register(name, Type::class.java) { … }` → `tasks.register<Type>(name) { … }`
- `tasks.withType(Type::class.java).configureEach { … }` → `tasks.withType<Type>().configureEach { … }`
- `extensions.create("name", Type::class.java)` → `extensions.create<Type>("name")`
- `extensions.getByType(Type::class.java)` → `extensions.getByType<Type>()`
- `extensions.findByName("name")` (followed by `isInstanceOf`) → `extensions.findByType<Type>()`
- `project.plugins.apply(Plugin::class.java)` → `project.apply<Plugin>()` (PluginAware)
- `objects.newInstance(Type::class.java)` → `objects.newInstance<Type>()`
Also drop the six `captured*` local variables in `SmokeTestAppExtension.application` —
inside `tasks.register<NestedGradleBuild>(taskName) { … }` the outer extension's
properties are now reached via `this@SmokeTestAppExtension.<prop>` directly.
No behavioural change; the 9 plugin tests still pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
bric3
changed the title
bric3
added
tag: no release notes
…test plugin Drop-in conversion of ten more nested-build smoke tests to the `dd-trace-java.smoke-test-app` plugin (added in #11405). All ten previously used an `Exec` task that shelled out to a `gradlew` — either the root build's (now Gradle 9, incompatible with their plugin chain) or a committed inner wrapper. Spring Boot 3 / Gradle nested build, root-gradlew Exec: - `spring-boot-3.0-webflux` - `spring-boot-3.0-webmvc` - `spring-boot-3.3-webmvc` - `kafka-3` Non-Spring Gradle nested build, root-gradlew Exec: - `quarkus` (Quarkus 1.9.2 platform, Java 8) - `armeria-grpc` Inner Gradle wrapper (committed) → Tooling API: - `vertx-3.4`, `vertx-3.9`, `vertx-3.9-resteasy`, `vertx-4.2` The committed inner `gradlew` / `gradlew.bat` / `gradle/wrapper/` files are removed — the Tooling API pins the same Gradle 8.14.5 distribution the wrappers used. Each module's outer `build.gradle` collapses to a small `smokeTestApp { application { taskName / nestedTasks / artifactPath / sysProperty } projectJar(...) }` block. The daemon Gradle version + JDK 21 toolchain come from the plugin's conventions. Each inner `application/build.gradle` pins `sourceCompatibility` explicitly so JDK 21's javac cross-compiles to the right bytecode level (`--release`): Java 8 for `quarkus` and the vertx modules, Java 17 for the rest. `kafka-3` swaps its `toolchain.languageVersion` for `sourceCompatibility` to avoid pulling a separate JDK 17 toolchain on top of the daemon's JDK 21. Verified locally on Gradle 9.5.1: all ten nested builds produce their expected artifact; representative smoke tests (`spring-boot-3.0-webmvc`, `kafka-3`, `vertx-3.9`) pass with `-PskipFlakyTests=true`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
bric3
force-pushed
the
bdu/smoke-test-pattern-f-drop-in
branch
from
0f40797 to
8accae8
Compare
Match the review feedback applied on #11408: expand the terse comments on the nested settings.gradle files to explain the CI Maven mirror proxies and the CI-only shared build cache (f6ec1f5 / #982, b34ccbc), plus the Quarkus plugin version property forwarding. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Does This Do
Drop-in conversion of ten more nested-build smoke tests to the
dd-trace-java.smoke-test-appplugin added in #11405. All ten previously shelled out to agradlewvia anExectask — either the root build's (whicc might become incompatible with their plugin down the road).Spring Boot 3 / Gradle nested build, root-gradlew Exec:
spring-boot-3.0-webfluxspring-boot-3.0-webmvcspring-boot-3.3-webmvckafka-3Non-Spring Gradle nested build, root-gradlew Exec:
quarkus(Quarkus 1.9.2 platform, Java 8 application)armeria-grpcInner Gradle wrapper (committed) → Tooling API:
vertx-3.4,vertx-3.9,vertx-3.9-resteasy,vertx-4.2; by convention the smoke-test-app plugin pins Gradle to 8.14.5, and uses Java 21.Each outer
build.gradlecollapses to a smallsmokeTestApp { application { taskName / nestedTasks / artifactPath / sysProperty } projectJar(...) }block.Each inner
application/build.gradlepinssourceCompatibilityexplicitly so JDK 21's javac cross-compiles to the right bytecode level (--release): Java 8 forquarkusand the vertx modules, Java 17 for the rest.kafka-3swaps itstoolchain.languageVersionforsourceCompatibilityto avoid pulling a separate JDK 17 toolchain on top of the daemon's JDK 21.Motivation
These are the remaining straightforward Gradle-based nested smoke tests after Patterns B / C / D / E (#11406, #11407, #11408, #11417). With this PR landed, the only nested-build smoke tests still on plain
Execare the two GraalVM-native ones (quarkus-native,spring-boot-3.0-native) and the two Maven ones (springboot-openliberty-{20,23}). Both groups need different treatment — see the follow-up notes inTODO-gradle9-migration.md.Additional Notes
spring-boot-3.0-webmvc,kafka-3,vertx-3.9) pass with-PskipFlakyTests=true.Contributor Checklist
type:and (comp:orinst:) labels in addition to any other useful labels🤖 Generated with Claude Code