diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 00000000000..bb93eab8829 --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,45 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.extra.has("gradlePluginProxy")) { + maven { + url = uri(settings.extra["gradlePluginProxy"] as String) + isAllowInsecureProtocol = true + } + } + if (settings.extra.has("mavenRepositoryProxy")) { + maven { + url = uri(settings.extra["mavenRepositoryProxy"] as String) + isAllowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + mavenLocal() + if (settings.extra.has("mavenRepositoryProxy")) { + maven { + url = uri(settings.extra["mavenRepositoryProxy"] as String) + isAllowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + // Hosts the Gradle Tooling API artifact, which the smoke-test plugin uses to + // run nested Gradle builds without committing per-application wrappers. + maven { + url = uri("https://repo.gradle.org/gradle/libs-releases") + content { + includeGroup("org.gradle") + } + } + } +} + +rootProject.name = "build-logic" + +include(":smoke-test") diff --git a/build-logic/smoke-test/build.gradle.kts b/build-logic/smoke-test/build.gradle.kts new file mode 100644 index 00000000000..7c5693d469d --- /dev/null +++ b/build-logic/smoke-test/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + `java-gradle-plugin` + `kotlin-dsl` +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) + } +} + +dependencies { + implementation("org.gradle:gradle-tooling-api:8.14.5") + runtimeOnly("org.slf4j:slf4j-simple:1.7.36") +} + +gradlePlugin { + plugins { + create("smoke-test-app") { + id = "dd-trace-java.smoke-test-app" + implementationClass = "datadog.buildlogic.smoketest.SmokeTestAppPlugin" + } + } +} diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedBuildProjectJar.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedBuildProjectJar.kt new file mode 100644 index 00000000000..503f78c47b4 --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedBuildProjectJar.kt @@ -0,0 +1,24 @@ +package datadog.buildlogic.smoketest + +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.PathSensitive +import org.gradle.api.tasks.PathSensitivity + +/** + * A jar produced by the root build that needs to be forwarded into a [NestedGradleBuild]. + * + * At execution time the task adds `-P${propertyName}=` to the nested + * Gradle invocation, so the inner build script can pick it up via `findProperty(...)`. + */ +abstract class NestedBuildProjectJar { + + @get:Input + abstract val propertyName: Property + + @get:InputFile + @get:PathSensitive(PathSensitivity.NONE) + abstract val file: RegularFileProperty +} diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt new file mode 100644 index 00000000000..bb8a269c4d0 --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt @@ -0,0 +1,112 @@ +package datadog.buildlogic.smoketest + +import org.gradle.api.Action +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileTree +import org.gradle.api.file.RegularFile +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.Property +import org.gradle.api.provider.Provider +import org.gradle.api.tasks.IgnoreEmptyDirectories +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.Nested +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.PathSensitive +import org.gradle.api.tasks.PathSensitivity +import org.gradle.api.tasks.TaskAction +import org.gradle.jvm.toolchain.JavaLauncher +import org.gradle.tooling.GradleConnector +import javax.inject.Inject + +/** + * Runs a nested Gradle build inside [applicationDir] via the Gradle Tooling API. + * + * Lets a smoke test pin a Gradle version (typically older than the root build) and a Java + * toolchain for the nested daemon, without committing per-application `gradlew` wrappers. + * + * The nested build script is expected to honour `-PappBuildDir=` and redirect its + * `buildDir` to that path so the artifact lands in [applicationBuildDir]. Project artifacts + * from the root build can be forwarded via [projectJar]; each entry is passed as + * `-P=` and tracked as a task input so the nested build re-runs + * when the upstream jar changes. + */ +abstract class NestedGradleBuild @Inject constructor(private val objects: ObjectFactory) : + DefaultTask() { + + @get:Internal + abstract val applicationDir: DirectoryProperty + + @get:InputFiles + @get:IgnoreEmptyDirectories + @get:PathSensitive(PathSensitivity.RELATIVE) + val applicationSources: FileTree = + objects.fileTree().from(applicationDir).matching { + exclude(".gradle/**", "build/**") + } + + @get:Input + abstract val gradleVersion: Property + + @get:Nested + abstract val javaLauncher: Property + + @get:Input + abstract val tasksToRun: ListProperty + + @get:Input + abstract val buildArguments: ListProperty + + @get:Nested + abstract val projectJars: ListProperty + + @get:OutputDirectory + abstract val applicationBuildDir: DirectoryProperty + + /** Forward a root-build jar as `-P=` into the nested build. */ + fun projectJar(name: String, file: Provider) { + val entry = objects.newInstance(NestedBuildProjectJar::class.java) + entry.propertyName.set(name) + entry.file.set(file) + projectJars.add(entry) + } + + /** Configure additional aspects of the nested build via a typed action. */ + fun projectJar(action: Action) { + val entry = objects.newInstance(NestedBuildProjectJar::class.java) + action.execute(entry) + projectJars.add(entry) + } + + @TaskAction + fun runNestedBuild() { + val appDir = applicationDir.get().asFile + val appBuildDirFile = applicationBuildDir.get().asFile + val daemonJavaHome = javaLauncher.get().metadata.installationPath.asFile + + val args = buildList { + add("-PappBuildDir=${appBuildDirFile.absolutePath}") + projectJars.get().forEach { entry -> + add("-P${entry.propertyName.get()}=${entry.file.get().asFile.absolutePath}") + } + addAll(buildArguments.get()) + } + + val connector = GradleConnector.newConnector() + .useGradleVersion(gradleVersion.get()) + .forProjectDirectory(appDir) + + connector.connect().use { connection -> + connection.newBuild() + .forTasks(*tasksToRun.get().toTypedArray()) + .withArguments(args) + .setJavaHome(daemonJavaHome) + .setStandardOutput(System.out) + .setStandardError(System.err) + .run() + } + } +} diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt new file mode 100644 index 00000000000..c6a9b926bbc --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt @@ -0,0 +1,182 @@ +package datadog.buildlogic.smoketest + +import org.gradle.api.Action +import org.gradle.api.Project +import org.gradle.api.artifacts.Configuration +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.RegularFile +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.MapProperty +import org.gradle.api.provider.Property +import org.gradle.api.provider.Provider +import org.gradle.api.tasks.TaskProvider +import org.gradle.api.tasks.testing.Test +import org.gradle.jvm.toolchain.JavaLauncher +import org.gradle.process.CommandLineArgumentProvider +import java.util.Locale +import javax.inject.Inject + +/** + * Project extension that wires a [NestedGradleBuild] task for a smoke-test application. + * + * The plugin only contributes a task when the consumer calls [application]; if the extension + * stays unconfigured, the plugin is a no-op and consumers can register [NestedGradleBuild] + * directly. + */ +abstract class SmokeTestAppExtension @Inject constructor(private val project: Project) { + + /** Gradle version used by the nested daemon. Defaults to the root build's version. */ + abstract val gradleVersion: Property + + /** JDK used by the nested daemon. Required when calling [application]. */ + abstract val javaLauncher: Property + + /** Directory containing the nested project's `settings.gradle` + sources. */ + abstract val applicationDir: DirectoryProperty + + /** + * Directory the nested build writes its outputs to. The nested build script is expected to + * honour `-PappBuildDir=`; see the existing smoke-test inner builds for the pattern. + */ + abstract val applicationBuildDir: DirectoryProperty + + internal abstract val projectJars: ListProperty + + init { + applicationDir.convention(project.layout.projectDirectory.dir("application")) + applicationBuildDir.convention(project.layout.buildDirectory.dir("application")) + gradleVersion.convention(project.gradle.gradleVersion) + } + + /** + * Register the nested-build task and wire the produced artifact into every `Test` task as + * a system property. Calling this triggers task registration; consumers that prefer to + * register [NestedGradleBuild] manually can leave [application] uncalled. + */ + fun application(action: Action) { + require(javaLauncher.isPresent) { + "smokeTestApp.javaLauncher must be set before configuring application { ... }" + } + val spec = project.objects.newInstance(ApplicationSpec::class.java) + action.execute(spec) + val taskName = requireNotNull(spec.taskName.orNull) { + "smokeTestApp.application { taskName = ... } is required" + } + val artifactPath = requireNotNull(spec.artifactPath.orNull) { + "smokeTestApp.application { artifactPath = ... } is required" + } + val sysProperty = requireNotNull(spec.sysProperty.orNull) { + "smokeTestApp.application { sysProperty = ... } is required" + } + val nestedTasks = spec.nestedTasks.orNull?.takeIf { it.isNotEmpty() } ?: listOf(taskName) + + val capturedJars = projectJars + val capturedAppDir = applicationDir + val capturedAppBuildDir = applicationBuildDir + val capturedGradleVersion = gradleVersion + val capturedJavaLauncher = javaLauncher + val capturedBuildArguments = spec.buildArguments + + val taskProvider: TaskProvider = + project.tasks.register(taskName, NestedGradleBuild::class.java) { + applicationDir.set(capturedAppDir) + applicationBuildDir.set(capturedAppBuildDir) + gradleVersion.set(capturedGradleVersion) + javaLauncher.set(capturedJavaLauncher) + tasksToRun.set(nestedTasks) + buildArguments.set(capturedBuildArguments) + projectJars.set(capturedJars) + } + + val artifactProvider: Provider = applicationBuildDir.file(artifactPath) + val extras = spec.additionalSystemProperties.get().mapValues { (_, relativePath) -> + applicationBuildDir.file(relativePath) + } + project.tasks.withType(Test::class.java).configureEach { + dependsOn(taskProvider) + jvmArgumentProviders.add(SmokeTestArgProvider(sysProperty, artifactProvider, extras)) + } + } + + /** + * Forward the default `jar` artifact from [sourceProject] into the nested build as + * `-P=`. The jar is consumed via a resolvable [Configuration], + * which both establishes the correct task dependency and lets Gradle resolve the artifact + * lazily — no `evaluationDependsOn` is needed. + */ + fun projectJar(propertyName: String, sourceProject: Project) { + val configurationName = "smokeTestAppExtraJar" + + propertyName.replaceFirstChar { it.titlecase(Locale.ROOT) } + val cfg = project.configurations.maybeCreate(configurationName).apply { + isCanBeConsumed = false + isCanBeResolved = true + isTransitive = false + description = "Jar artifact forwarded as -P$propertyName into the smoke-test nested build" + } + project.dependencies.add(configurationName, sourceProject) + addProjectJarFromConfiguration(propertyName, cfg) + } + + /** + * Lower-level overload for the rare case where the caller already has a provider of the + * file. The caller is responsible for the upstream task dependency. + */ + fun projectJar(propertyName: String, file: Provider) { + val entry = project.objects.newInstance(NestedBuildProjectJar::class.java) + entry.propertyName.set(propertyName) + entry.file.set(file) + projectJars.add(entry) + } + + private fun addProjectJarFromConfiguration(propertyName: String, cfg: Configuration) { + val entry = project.objects.newInstance(NestedBuildProjectJar::class.java) + entry.propertyName.set(propertyName) + // Configuration.elements yields a Provider that carries the producing task dependency, so + // wiring it into the task's @InputFile both tracks file contents and arranges build order. + entry.file.set( + cfg.elements.map { files -> + project.objects.fileProperty().fileValue(files.single().asFile).get() + } + ) + projectJars.add(entry) + } +} + +/** DSL describing the nested-build invocation for one smoke-test application. */ +abstract class ApplicationSpec @Inject constructor() { + /** Outer task name; the nested daemon runs the same task by default. */ + abstract val taskName: Property + + /** Path to the produced artifact, relative to `applicationBuildDir`. */ + abstract val artifactPath: Property + + /** System property name set on Test tasks to point them at the produced artifact. */ + abstract val sysProperty: Property + + /** Tasks run inside the nested build. Defaults to `[taskName]`. */ + abstract val nestedTasks: ListProperty + + /** Extra arguments passed to the nested Gradle invocation. */ + abstract val buildArguments: ListProperty + + /** + * Additional system properties to forward to every `Test` task, keyed by property name with + * values resolved against `applicationBuildDir`. Use this for smoke tests that need more + * than the single primary artifact path (e.g. a separately unpacked server install). + */ + abstract val additionalSystemProperties: MapProperty +} + +private class SmokeTestArgProvider( + private val sysProperty: String, + private val artifact: Provider, + private val extras: Map>, +) : CommandLineArgumentProvider { + override fun asArguments(): Iterable = + buildList { + add("-D$sysProperty=${artifact.get().asFile.absolutePath}") + extras.forEach { (key, value) -> + add("-D$key=${value.get().asFile.absolutePath}") + } + } +} diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt new file mode 100644 index 00000000000..a3bb337eaac --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt @@ -0,0 +1,20 @@ +package datadog.buildlogic.smoketest + +import org.gradle.api.Plugin +import org.gradle.api.Project + +/** + * Exposes the [NestedGradleBuild] task type plus a `smokeTestApp` extension that wires the + * nested-build task and Test-side system properties for a smoke-test application. + * + * Consumers can either: + * - configure `smokeTestApp { application { ... } }` to let the plugin register the task and + * wire it into every `Test` task, or + * - leave the extension untouched and register a [NestedGradleBuild] task manually (for cases + * that need more control, e.g. additional `Exec`-like task wiring). + */ +class SmokeTestAppPlugin : Plugin { + override fun apply(project: Project) { + project.extensions.create("smokeTestApp", SmokeTestAppExtension::class.java) + } +} diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle index 9eac038bfd8..b6836682a5d 100644 --- a/dd-java-agent/agent-debugger/build.gradle +++ b/dd-java-agent/agent-debugger/build.gradle @@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' + id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" @@ -47,6 +48,14 @@ dependencies { implementation libs.okhttp implementation libs.slf4j + // Dependencies needed to compile the test-fixture helpers (LogProbeTestHelper, + // MoshiSnapshotTestHelper); they reference siblings + Moshi + internal-api. + testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') + testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-el') + testFixturesImplementation project(':internal-api') + testFixturesImplementation libs.moshi + testFixturesImplementation libs.junit.jupiter + testImplementation libs.asm.util testImplementation libs.bundles.junit5 testImplementation libs.junit.jupiter.params diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/LogProbeTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java similarity index 100% rename from dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/LogProbeTestHelper.java rename to dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java similarity index 100% rename from dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java rename to dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java diff --git a/dd-smoke-tests/apm-tracing-disabled/application/build.gradle b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle new file mode 100644 index 00000000000..3f5c868f46a --- /dev/null +++ b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = '1.8' +} + +if (hasProperty('apiJar')) { + dependencies { + implementation files(property('apiJar')) + } +} else { + dependencies { + implementation "com.datadoghq:dd-trace-api:+" + } +} + +dependencies { + compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0' + implementation group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0' +} diff --git a/dd-smoke-tests/apm-tracing-disabled/application/settings.gradle b/dd-smoke-tests/apm-tracing-disabled/application/settings.gradle new file mode 100644 index 00000000000..aac1278eba5 --- /dev/null +++ b/dd-smoke-tests/apm-tracing-disabled/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'apm-tracing-disabled-smoketest' diff --git a/dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java similarity index 100% rename from dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java rename to dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java diff --git a/dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java similarity index 100% rename from dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java rename to dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java diff --git a/dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java rename to dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java diff --git a/dd-smoke-tests/apm-tracing-disabled/build.gradle b/dd-smoke-tests/apm-tracing-disabled/build.gradle index 638260752db..54b2162f552 100644 --- a/dd-smoke-tests/apm-tracing-disabled/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/build.gradle @@ -1,36 +1,36 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'ASM Standalone Billing Tests.' -java { - sourceCompatibility = '1.8' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/apm-tracing-disabled-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } + projectJar('apiJar', project(':dd-trace-api')) } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0' - implementation group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0' - implementation project(':dd-trace-api') testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } -tasks.withType(Test).configureEach { - def bootJarTask = tasks.named('bootJar', BootJar) - dependsOn bootJarTask - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle index fe525e8a70e..502d39ba6f7 100644 --- a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle +++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle @@ -3,11 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java' - id 'org.springframework.boot' version '2.6.3' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" description = 'Kafka Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/debugger-integration-tests/build.gradle b/dd-smoke-tests/debugger-integration-tests/build.gradle index e07b7d6e7b6..da0000bcfee 100644 --- a/dd-smoke-tests/debugger-integration-tests/build.gradle +++ b/dd-smoke-tests/debugger-integration-tests/build.gradle @@ -17,8 +17,8 @@ dependencies { testImplementation project(':dd-java-agent:agent-debugger') testImplementation project(':dd-java-agent:agent-debugger:debugger-el') testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') - // dependency on some helper classes made only for tests - testImplementation project(':dd-java-agent:agent-debugger').sourceSets.test.output + // helper classes shared via java-test-fixtures (LogProbeTestHelper, MoshiSnapshotTestHelper) + testImplementation testFixtures(project(':dd-java-agent:agent-debugger')) testImplementation libs.bundles.junit5 testImplementation libs.bundles.mockito } diff --git a/dd-smoke-tests/kafka-2/application/build.gradle b/dd-smoke-tests/kafka-2/application/build.gradle new file mode 100644 index 00000000000..f5ffc8e910c --- /dev/null +++ b/dd-smoke-tests/kafka-2/application/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +if (hasProperty('iastUtilJar')) { + dependencies { + implementation files(property('iastUtilJar')) + } +} + +dependencies { + implementation('org.springframework.boot:spring-boot-starter-web') + implementation('org.springframework.boot:spring-boot-starter-actuator') + implementation('org.springframework.kafka:spring-kafka') +} diff --git a/dd-smoke-tests/kafka-2/application/settings.gradle b/dd-smoke-tests/kafka-2/application/settings.gradle new file mode 100644 index 00000000000..f5d4088d9b5 --- /dev/null +++ b/dd-smoke-tests/kafka-2/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'kafka-2-smoketest' diff --git a/dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/KafkaApplication.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java similarity index 100% rename from dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/KafkaApplication.java rename to dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/KafkaApplication.java diff --git a/dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java similarity index 100% rename from dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java rename to dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastConfiguration.java diff --git a/dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastController.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java similarity index 100% rename from dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastController.java rename to dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java diff --git a/dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java b/dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java similarity index 100% rename from dd-smoke-tests/kafka-2/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java rename to dd-smoke-tests/kafka-2/application/src/main/java/datadog/smoketest/kafka/iast/IastMessage.java diff --git a/dd-smoke-tests/kafka-2/build.gradle b/dd-smoke-tests/kafka-2/build.gradle index c947425a4ba..34a622602bb 100644 --- a/dd-smoke-tests/kafka-2/build.gradle +++ b/dd-smoke-tests/kafka-2/build.gradle @@ -1,34 +1,40 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" -description = 'Kafka 2.x Smoke Tests.' -dependencies { - implementation('org.springframework.boot:spring-boot-starter-web') - implementation('org.springframework.boot:spring-boot-starter-actuator') - implementation('org.springframework.kafka:spring-kafka') +description = 'Kafka 2.x Smoke Tests.' - testImplementation('org.springframework.kafka:spring-kafka-test') +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/kafka-2-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } + projectJar('iastUtilJar', project(':dd-smoke-tests:iast-util')) +} +dependencies { + // Pinned: this version was previously resolved transitively from the Spring Boot BOM in + // the outer build. Now that the application is in a nested build, the BOM is no longer + // available here. + testImplementation('org.springframework.kafka:spring-kafka-test:2.8.11') testImplementation project(':dd-smoke-tests') - implementation project(':dd-smoke-tests:iast-util') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } -tasks.withType(Test).configureEach { - def bootJarTask = tasks.named('bootJar', BootJar) - dependsOn bootJarTask - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/openfeature/application/build.gradle b/dd-smoke-tests/openfeature/application/build.gradle new file mode 100644 index 00000000000..a74020164f9 --- /dev/null +++ b/dd-smoke-tests/openfeature/application/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = 11 + targetCompatibility = 11 +} + +if (hasProperty('featureFlaggingApiJar')) { + dependencies { + implementation files(property('featureFlaggingApiJar')) + } +} + +dependencies { + // OpenFeature SDK is an API dependency of feature-flagging-api but is not + // transitively resolved when the jar is passed as a files() dependency. + implementation 'dev.openfeature:sdk:1.20.1' + implementation 'org.springframework.boot:spring-boot-starter-web' +} diff --git a/dd-smoke-tests/openfeature/application/settings.gradle b/dd-smoke-tests/openfeature/application/settings.gradle new file mode 100644 index 00000000000..cd52c32ced8 --- /dev/null +++ b/dd-smoke-tests/openfeature/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'openfeature-smoketest' diff --git a/dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java similarity index 100% rename from dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java rename to dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java diff --git a/dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java b/dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java similarity index 100% rename from dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java rename to dd-smoke-tests/openfeature/application/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java diff --git a/dd-smoke-tests/openfeature/build.gradle b/dd-smoke-tests/openfeature/build.gradle index a38696418ef..396837270cc 100644 --- a/dd-smoke-tests/openfeature/build.gradle +++ b/dd-smoke-tests/openfeature/build.gradle @@ -1,38 +1,39 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'Open Feature provider Smoke Tests.' testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } -tasks.named("compileJava", JavaCompile) { - configureCompiler(it, 11, JavaVersion.VERSION_11) +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(11) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/openfeature-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } + projectJar('featureFlaggingApiJar', project(':products:feature-flagging:feature-flagging-api')) } dependencies { - implementation project(':products:feature-flagging:feature-flagging-api') - implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation project(':dd-smoke-tests') testImplementation project(':products:feature-flagging:feature-flagging-lib') } -tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle index 00cc72f1b01..ee3ea4fc5ef 100644 --- a/dd-smoke-tests/rum/wildfly-15/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/build.gradle @@ -1,3 +1,9 @@ +import datadog.buildlogic.smoketest.NestedGradleBuild + +plugins { + id 'dd-trace-java.smoke-test-app' +} + ext { serverName = 'wildfly' //serverModule = 'servlet' @@ -49,29 +55,24 @@ dependencies { testImplementation project(':dd-smoke-tests') } -def appDir = "$projectDir/rum-ear" -def appBuildDir = "$buildDir/rm-ear" -def isWindows = System.getProperty("os.name").toLowerCase().contains("win") -def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' -// define the task that builds the quarkus project -tasks.register('earBuild', Exec) { - workingDir "$appDir" - environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] - commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" - - outputs.cacheIf { true } - - outputs.dir(appBuildDir) - .withPropertyName("applicationEar") - - inputs.files(fileTree(appDir) { - include '**/*' - exclude '.gradle/**' - }) - .withPropertyName("application") - .withPathSensitivity(PathSensitivity.RELATIVE) - - dependsOn project(':dd-trace-api').tasks.named("jar") +def appBuildDir = layout.buildDirectory.dir("rm-ear") +evaluationDependsOn(':dd-trace-api') +def apiJarTask = project(':dd-trace-api').tasks.named('jar') + +// Run the nested EAR build through the Gradle Tooling API, pinned to Gradle 8.14.5 on a +// Java 8 daemon. The previous Exec-based form invoked the root `gradlew`, which is +// Gradle 9+ now and would not run the Spring Boot / EAR plugin chain inside the nested +// project on Java 8. +tasks.register('earBuild', NestedGradleBuild) { + applicationDir = layout.projectDirectory.dir("rum-ear") + applicationBuildDir = appBuildDir + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + tasksToRun = ['assemble'] + projectJar('apiJar', apiJarTask.flatMap { it.archiveFile }) + dependsOn apiJarTask } tasks.named("compileTestGroovy", GroovyCompile) { @@ -121,8 +122,8 @@ tasks.withType(Jar).configureEach { def wildflyDir = "${buildDir}/${serverName}-${serverVersion}" tasks.register("deploy", Copy) { - dependsOn 'unzip' - from "${appBuildDir}/libs/wildfly-rum-ear-smoketest.ear" + dependsOn 'unzip', 'earBuild' + from appBuildDir.map { it.file("libs/wildfly-rum-ear-smoketest.ear") } into "${wildflyDir}/standalone/deployments" } diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index ec403dc3c20..c1afbc338da 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -1,40 +1,27 @@ -apply from: "$rootDir/gradle/java.gradle" - -description = 'Spring Boot 2.7 Webflux Smoke Tests.' - -dependencies { - testImplementation project(':dd-smoke-tests') +plugins { + id 'dd-trace-java.smoke-test-app' } -def appDir = "$projectDir/application" -def appBuildDir = "$buildDir/application" -def isWindows = System.getProperty("os.name").toLowerCase().contains("win") -def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' - -// define the task that builds the project -tasks.register('webfluxBuild', Exec) { - workingDir "$appDir" - environment += [ - "GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'", - "JAVA_HOME": getLazyJavaHomeFor(8) - ] - commandLine "$rootDir/${gradlewCommand}", "bootJar", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" - - outputs.cacheIf { true } +apply from: "$rootDir/gradle/java.gradle" - outputs.dir(appBuildDir) - .withPropertyName("applicationJar") +description = 'Spring Boot 2.7 Webflux Smoke Tests.' - inputs.files(fileTree(appDir) { - include '**/*' - exclude '.gradle/**' - }) - .withPropertyName("application") - .withPathSensitivity(PathSensitivity.RELATIVE) +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'webfluxBuild' + nestedTasks = ['bootJar'] + artifactPath = 'libs/webflux-2.7-smoketest.jar' + sysProperty = 'datadog.smoketest.webflux.uberJar.path' + } + projectJar('apiJar', project(':dd-trace-api')) } -tasks.named("webfluxBuild", Exec) { - dependsOn project(':dd-trace-api').tasks.named("jar") +dependencies { + testImplementation project(':dd-smoke-tests') } tasks.named("compileTestGroovy", GroovyCompile) { @@ -44,10 +31,6 @@ tasks.named("compileTestGroovy", GroovyCompile) { } } -tasks.withType(Test).configureEach { - jvmArgs "-Ddatadog.smoketest.webflux.uberJar.path=$appBuildDir/libs/webflux-2.7-smoketest.jar" -} - spotless { java { target "**/*.java" diff --git a/dd-smoke-tests/springboot-freemarker/application/build.gradle b/dd-smoke-tests/springboot-freemarker/application/build.gradle new file mode 100644 index 00000000000..3a0220c4ca8 --- /dev/null +++ b/dd-smoke-tests/springboot-freemarker/application/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = '1.8' +} + +dependencies { + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE' + implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating' +} diff --git a/dd-smoke-tests/springboot-freemarker/application/settings.gradle b/dd-smoke-tests/springboot-freemarker/application/settings.gradle new file mode 100644 index 00000000000..c35041e5d73 --- /dev/null +++ b/dd-smoke-tests/springboot-freemarker/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-freemarker-smoketest' diff --git a/dd-smoke-tests/springboot-freemarker/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-freemarker/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/java/datadog/smoketest/springboot/XssController.java rename to dd-smoke-tests/springboot-freemarker/application/src/main/java/datadog/smoketest/springboot/XssController.java diff --git a/dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.24-insecure.ftlh b/dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.24-insecure.ftlh similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.24-insecure.ftlh rename to dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.24-insecure.ftlh diff --git a/dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.24-secure.ftlh b/dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.24-secure.ftlh similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.24-secure.ftlh rename to dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.24-secure.ftlh diff --git a/dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.9-insecure.ftlh b/dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.9-insecure.ftlh similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.9-insecure.ftlh rename to dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.9-insecure.ftlh diff --git a/dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.9-secure.ftlh b/dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.9-secure.ftlh similarity index 100% rename from dd-smoke-tests/springboot-freemarker/src/main/resources/templates/freemarker-2.3.9-secure.ftlh rename to dd-smoke-tests/springboot-freemarker/application/src/main/resources/templates/freemarker-2.3.9-secure.ftlh diff --git a/dd-smoke-tests/springboot-freemarker/build.gradle b/dd-smoke-tests/springboot-freemarker/build.gradle index 57c7a4e9eb1..aad7c38c8f5 100644 --- a/dd-smoke-tests/springboot-freemarker/build.gradle +++ b/dd-smoke-tests/springboot-freemarker/build.gradle @@ -1,35 +1,56 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'SpringBoot Freemarker Smoke Tests.' -java { - sourceCompatibility = '1.8' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/springboot-freemarker-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } } dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE' - implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating' - testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } +// XssController loads templates from the filesystem at "resources/main/templates" relative to +// the test JVM's working directory (this module's build dir). Mirror the nested app's +// processed resources so that path resolves at runtime. +def applicationResourcesProvider = layout.buildDirectory.dir("application/resources/main") +tasks.register('copyAppResources', Copy) { + dependsOn 'bootJar' + from applicationResourcesProvider + into layout.buildDirectory.dir("resources/main") +} + +// `java.gradle` applies the `java` plugin so an empty `jar` task is created with +// `build/resources/main` as one of its inputs. Wire the dependency so Gradle knows +// `copyAppResources` writes there. +tasks.named('jar') { + dependsOn 'copyAppResources' +} + tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) + dependsOn 'copyAppResources' +} + +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-java-11/application/build.gradle b/dd-smoke-tests/springboot-java-11/application/build.gradle new file mode 100644 index 00000000000..ea12bb0cdc4 --- /dev/null +++ b/dd-smoke-tests/springboot-java-11/application/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = 11 +} + +if (hasProperty('iastUtil11Jar')) { + dependencies { + implementation files(property('iastUtil11Jar')) + } +} + +dependencies { + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' +} diff --git a/dd-smoke-tests/springboot-java-11/application/settings.gradle b/dd-smoke-tests/springboot-java-11/application/settings.gradle new file mode 100644 index 00000000000..d2356e2b0b3 --- /dev/null +++ b/dd-smoke-tests/springboot-java-11/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-java-11-smoketest' diff --git a/dd-smoke-tests/springboot-java-11/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-java-11/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-java-11/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle index 029df98dbd8..e17467bf804 100644 --- a/dd-smoke-tests/springboot-java-11/build.gradle +++ b/dd-smoke-tests/springboot-java-11/build.gradle @@ -1,42 +1,41 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" +description = 'SpringBoot Java 11 Smoke Tests.' + testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" -description = 'SpringBoot Java 11 Smoke Tests.' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(11) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/springboot-java-11-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } + projectJar('iastUtil11Jar', project(':dd-smoke-tests:iast-util:iast-util-11')) +} dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' - testImplementation project(':dd-smoke-tests') testImplementation testFixtures(project(":dd-smoke-tests:iast-util:iast-util-11")) testImplementation testFixtures(project(':dd-smoke-tests:iast-util')) - - implementation project(':dd-smoke-tests:iast-util:iast-util-11') } -tasks.named("compileJava", JavaCompile) { - configureCompiler(it, 11, JavaVersion.VERSION_11) -} +spotless { + java { + target "**/*.java" + } -tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-java-17/application/build.gradle b/dd-smoke-tests/springboot-java-17/application/build.gradle new file mode 100644 index 00000000000..413f24ce06d --- /dev/null +++ b/dd-smoke-tests/springboot-java-17/application/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = 17 +} + +if (hasProperty('iastUtil17Jar')) { + dependencies { + implementation files(property('iastUtil17Jar')) + } +} + +dependencies { + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' +} diff --git a/dd-smoke-tests/springboot-java-17/application/settings.gradle b/dd-smoke-tests/springboot-java-17/application/settings.gradle new file mode 100644 index 00000000000..83e3c7f2135 --- /dev/null +++ b/dd-smoke-tests/springboot-java-17/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-java-17-smoketest' diff --git a/dd-smoke-tests/springboot-java-17/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-java-17/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-java-17/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle index cb878a92c7f..08187496c32 100644 --- a/dd-smoke-tests/springboot-java-17/build.gradle +++ b/dd-smoke-tests/springboot-java-17/build.gradle @@ -1,42 +1,41 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" +description = 'SpringBoot Java 17 Smoke Tests.' + testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" -description = 'SpringBoot Java 17 Smoke Tests.' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(17) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/springboot-java-17-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } + projectJar('iastUtil17Jar', project(':dd-smoke-tests:iast-util:iast-util-17')) +} dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' - testImplementation project(':dd-smoke-tests') testImplementation testFixtures(project(":dd-smoke-tests:iast-util:iast-util-17")) testImplementation testFixtures(project(':dd-smoke-tests:iast-util')) - - implementation project(':dd-smoke-tests:iast-util:iast-util-17') } -tasks.named("compileJava", JavaCompile) { - configureCompiler(it, 17, JavaVersion.VERSION_17) -} +spotless { + java { + target "**/*.java" + } -tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-jetty-jsp/application/build.gradle b/dd-smoke-tests/springboot-jetty-jsp/application/build.gradle new file mode 100644 index 00000000000..4c68c426f93 --- /dev/null +++ b/dd-smoke-tests/springboot-jetty-jsp/application/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java' + id 'war' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = '1.8' +} + +sourceSets { + main { + resources.srcDir("src/main/webapp") + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + + runtimeOnly("javax.servlet:jstl") + runtimeOnly("org.apache.tomcat.embed:tomcat-embed-jasper") + + providedRuntime("org.springframework.boot:spring-boot-starter-jetty") +} diff --git a/dd-smoke-tests/springboot-jetty-jsp/application/settings.gradle b/dd-smoke-tests/springboot-jetty-jsp/application/settings.gradle new file mode 100644 index 00000000000..dad60537f79 --- /dev/null +++ b/dd-smoke-tests/springboot-jetty-jsp/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-jetty-jsp-smoketest' diff --git a/dd-smoke-tests/springboot-jetty-jsp/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-jetty-jsp/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-jetty-jsp/src/main/java/datadog/smoketest/springboot/ViewController.java b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java similarity index 100% rename from dd-smoke-tests/springboot-jetty-jsp/src/main/java/datadog/smoketest/springboot/ViewController.java rename to dd-smoke-tests/springboot-jetty-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java diff --git a/dd-smoke-tests/springboot-jetty-jsp/src/main/resources/application.properties b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/resources/application.properties similarity index 100% rename from dd-smoke-tests/springboot-jetty-jsp/src/main/resources/application.properties rename to dd-smoke-tests/springboot-jetty-jsp/application/src/main/resources/application.properties diff --git a/dd-smoke-tests/springboot-jetty-jsp/src/main/webapp/WEB-INF/jsp/test_xss.jsp b/dd-smoke-tests/springboot-jetty-jsp/application/src/main/webapp/WEB-INF/jsp/test_xss.jsp similarity index 100% rename from dd-smoke-tests/springboot-jetty-jsp/src/main/webapp/WEB-INF/jsp/test_xss.jsp rename to dd-smoke-tests/springboot-jetty-jsp/application/src/main/webapp/WEB-INF/jsp/test_xss.jsp diff --git a/dd-smoke-tests/springboot-jetty-jsp/build.gradle b/dd-smoke-tests/springboot-jetty-jsp/build.gradle index d8fdc4fbab4..3e2388a56ad 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/build.gradle +++ b/dd-smoke-tests/springboot-jetty-jsp/build.gradle @@ -1,47 +1,35 @@ -import org.springframework.boot.gradle.tasks.bundling.BootWar - plugins { - id 'java' - id 'war' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" -description = 'SpringBoot Jetty JSP Smoke Tests.' -java { - sourceCompatibility = '1.8' -} +description = 'SpringBoot Jetty JSP Smoke Tests.' -sourceSets { - main { - resources.srcDir("src/main/webapp") +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootWar' + artifactPath = 'libs/springboot-jetty-jsp-smoketest.war' + sysProperty = 'datadog.smoketest.springboot.war.path' } } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - - runtimeOnly("javax.servlet:jstl") - runtimeOnly("org.apache.tomcat.embed:tomcat-embed-jasper") - - providedRuntime("org.springframework.boot:spring-boot-starter-jetty") - testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } -tasks.withType(Test).configureEach { - dependsOn "war", "bootWar" +spotless { + java { + target "**/*.java" + } - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - def bootWarTask = tasks.named('bootWar', BootWar).get() - return ["-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}"] - } - }) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-jpa/application/build.gradle b/dd-smoke-tests/springboot-jpa/application/build.gradle new file mode 100644 index 00000000000..a38bb884c1d --- /dev/null +++ b/dd-smoke-tests/springboot-jpa/application/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'java' + id 'war' + id 'org.springframework.boot' version '2.6.0' +} + +apply plugin: 'io.spring.dependency-management' + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.apache.tomcat.embed:tomcat-embed-jasper' + implementation 'javax.servlet:jstl:1.2' + implementation 'com.h2database:h2:2.1.214' + + compileOnly 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.34' +} diff --git a/dd-smoke-tests/springboot-jpa/application/settings.gradle b/dd-smoke-tests/springboot-jpa/application/settings.gradle new file mode 100644 index 00000000000..ff156736e67 --- /dev/null +++ b/dd-smoke-tests/springboot-jpa/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-jpa-smoketest' diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/controller/LibraryController.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Author.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Author.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Author.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Book.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Book.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Book.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Library.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Library.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Library.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Owner.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/entity/Owner.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/entity/Owner.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/filter/SessionVisitorFilter.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/service/LibraryService.java b/dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/java/datadog/smoketest/springboot/service/LibraryService.java rename to dd-smoke-tests/springboot-jpa/application/src/main/java/datadog/smoketest/springboot/service/LibraryService.java diff --git a/dd-smoke-tests/springboot-jpa/src/main/resources/application.yml b/dd-smoke-tests/springboot-jpa/application/src/main/resources/application.yml similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/resources/application.yml rename to dd-smoke-tests/springboot-jpa/application/src/main/resources/application.yml diff --git a/dd-smoke-tests/springboot-jpa/src/main/webapp/WEB-INF/jsp/update.jsp b/dd-smoke-tests/springboot-jpa/application/src/main/webapp/WEB-INF/jsp/update.jsp similarity index 100% rename from dd-smoke-tests/springboot-jpa/src/main/webapp/WEB-INF/jsp/update.jsp rename to dd-smoke-tests/springboot-jpa/application/src/main/webapp/WEB-INF/jsp/update.jsp diff --git a/dd-smoke-tests/springboot-jpa/build.gradle b/dd-smoke-tests/springboot-jpa/build.gradle index af9c22ff235..e674a12b686 100644 --- a/dd-smoke-tests/springboot-jpa/build.gradle +++ b/dd-smoke-tests/springboot-jpa/build.gradle @@ -1,44 +1,33 @@ -import org.springframework.boot.gradle.tasks.bundling.BootWar - plugins { - id 'java' - id 'war' - id 'org.springframework.boot' version '2.6.0' + id 'dd-trace-java.smoke-test-app' } -apply plugin: 'io.spring.dependency-management' apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'SpringBoot JPA Smoke Tests.' -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.apache.tomcat.embed:tomcat-embed-jasper' - implementation 'javax.servlet:jstl:1.2' - implementation 'com.h2database:h2:2.1.214' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootWar' + artifactPath = 'libs/springboot-jpa-smoketest.war' + sysProperty = 'datadog.smoketest.springboot.bootWar.path' + } +} +dependencies { testImplementation project(':dd-smoke-tests') - - compileOnly 'org.projectlombok:lombok:1.18.34' - annotationProcessor 'org.projectlombok:lombok:1.18.34' - - testCompileOnly 'org.projectlombok:lombok:1.18.34' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.34' } -tasks.withType(Test).configureEach { - dependsOn "bootWar" - - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - def bootWarTask = tasks.named('bootWar', BootWar).get() - return ["-Ddatadog.smoketest.springboot.bootWar.path=${bootWarTask.archiveFile.get()}"] - } - }) -} +spotless { + java { + target "**/*.java" + } -tasks.withType(GroovyCompile).configureEach { - configureCompiler(it, 8) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-thymeleaf/application/build.gradle b/dd-smoke-tests/springboot-thymeleaf/application/build.gradle new file mode 100644 index 00000000000..77f8e57d848 --- /dev/null +++ b/dd-smoke-tests/springboot-thymeleaf/application/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = '1.8' +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' +} diff --git a/dd-smoke-tests/springboot-thymeleaf/application/settings.gradle b/dd-smoke-tests/springboot-thymeleaf/application/settings.gradle new file mode 100644 index 00000000000..0dbff5f340e --- /dev/null +++ b/dd-smoke-tests/springboot-thymeleaf/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-thymeleaf-smoketest' diff --git a/dd-smoke-tests/springboot-thymeleaf/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-thymeleaf/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-thymeleaf/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java similarity index 100% rename from dd-smoke-tests/springboot-thymeleaf/src/main/java/datadog/smoketest/springboot/XssController.java rename to dd-smoke-tests/springboot-thymeleaf/application/src/main/java/datadog/smoketest/springboot/XssController.java diff --git a/dd-smoke-tests/springboot-thymeleaf/src/main/resources/templates/utext.html b/dd-smoke-tests/springboot-thymeleaf/application/src/main/resources/templates/utext.html similarity index 100% rename from dd-smoke-tests/springboot-thymeleaf/src/main/resources/templates/utext.html rename to dd-smoke-tests/springboot-thymeleaf/application/src/main/resources/templates/utext.html diff --git a/dd-smoke-tests/springboot-thymeleaf/build.gradle b/dd-smoke-tests/springboot-thymeleaf/build.gradle index 7de0a0833e5..aa935a6d685 100644 --- a/dd-smoke-tests/springboot-thymeleaf/build.gradle +++ b/dd-smoke-tests/springboot-thymeleaf/build.gradle @@ -1,35 +1,35 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'SpringBoot thymeleaf 3 Smoke Tests.' -java { - sourceCompatibility = '1.8' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/springboot-thymeleaf-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' + } } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } -tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-tomcat-jsp/application/build.gradle b/dd-smoke-tests/springboot-tomcat-jsp/application/build.gradle new file mode 100644 index 00000000000..8632e7afc64 --- /dev/null +++ b/dd-smoke-tests/springboot-tomcat-jsp/application/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java' + id 'war' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +java { + sourceCompatibility = '1.8' +} + +sourceSets { + main { + resources.srcDir("src/main/webapp") + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + + runtimeOnly("javax.servlet:jstl") + runtimeOnly("org.apache.tomcat.embed:tomcat-embed-jasper") + + providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") +} diff --git a/dd-smoke-tests/springboot-tomcat-jsp/application/settings.gradle b/dd-smoke-tests/springboot-tomcat-jsp/application/settings.gradle new file mode 100644 index 00000000000..1c31089a007 --- /dev/null +++ b/dd-smoke-tests/springboot-tomcat-jsp/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-tomcat-jsp-smoketest' diff --git a/dd-smoke-tests/springboot-tomcat-jsp/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-tomcat-jsp/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-tomcat-jsp/src/main/java/datadog/smoketest/springboot/ViewController.java b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java similarity index 100% rename from dd-smoke-tests/springboot-tomcat-jsp/src/main/java/datadog/smoketest/springboot/ViewController.java rename to dd-smoke-tests/springboot-tomcat-jsp/application/src/main/java/datadog/smoketest/springboot/ViewController.java diff --git a/dd-smoke-tests/springboot-tomcat-jsp/src/main/resources/application.properties b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/resources/application.properties similarity index 100% rename from dd-smoke-tests/springboot-tomcat-jsp/src/main/resources/application.properties rename to dd-smoke-tests/springboot-tomcat-jsp/application/src/main/resources/application.properties diff --git a/dd-smoke-tests/springboot-tomcat-jsp/src/main/webapp/WEB-INF/jsp/test_xss.jsp b/dd-smoke-tests/springboot-tomcat-jsp/application/src/main/webapp/WEB-INF/jsp/test_xss.jsp similarity index 100% rename from dd-smoke-tests/springboot-tomcat-jsp/src/main/webapp/WEB-INF/jsp/test_xss.jsp rename to dd-smoke-tests/springboot-tomcat-jsp/application/src/main/webapp/WEB-INF/jsp/test_xss.jsp diff --git a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle index 224274ece2a..22055519987 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle +++ b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle @@ -1,47 +1,35 @@ -import org.springframework.boot.gradle.tasks.bundling.BootWar - plugins { - id 'java' - id 'war' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" -description = 'SpringBoot Tomcat JSP Smoke Tests.' -java { - sourceCompatibility = '1.8' -} +description = 'SpringBoot Tomcat JSP Smoke Tests.' -sourceSets { - main { - resources.srcDir("src/main/webapp") +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootWar' + artifactPath = 'libs/springboot-tomcat-jsp-smoketest.war' + sysProperty = 'datadog.smoketest.springboot.war.path' } } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - - runtimeOnly("javax.servlet:jstl") - runtimeOnly("org.apache.tomcat.embed:tomcat-embed-jasper") - - providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") - testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } -tasks.withType(Test).configureEach { - dependsOn "war", "bootWar" +spotless { + java { + target "**/*.java" + } - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - def bootWarTask = tasks.named('bootWar', BootWar).get() - return ["-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}"] - } - }) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-tomcat/application/build.gradle b/dd-smoke-tests/springboot-tomcat/application/build.gradle new file mode 100644 index 00000000000..5d1b73a7518 --- /dev/null +++ b/dd-smoke-tests/springboot-tomcat/application/build.gradle @@ -0,0 +1,83 @@ +plugins { + id 'war' + id 'org.springframework.boot' version '2.5.12' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +ext { + serverName = 'tomcat' + serverModule = 'tomcat-9' + serverVersion = '9.0.117' + serverExtension = 'zip' +} + +repositories { + ivy { + url = 'https://dlcdn.apache.org' + patternLayout { + artifact '/[organisation]/[module]/v[revision]/bin/apache-[organisation]-[revision].[ext]' + } + metadataSources { + it.artifact() + } + } +} + +configurations { + serverFile { + extendsFrom implementation + canBeResolved = true + } +} + +dependencies { + // uses the ivy repository url to download the tomcat server + // organisation = serverName, revision = serverVersion, module = serverModule, ext = serverExtension + serverFile "${serverName}:${serverModule}:${serverVersion}@${serverExtension}" + + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.5.12' + providedRuntime group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.5.12' +} + +tasks.register("unzip", Copy) { + def zipFileNamePrefix = "tomcat" + def serverZipTree = providers.provider { + // eager access + def zipPath = project.configurations.serverFile.find { + it.name.startsWith(zipFileNamePrefix) + } + if (zipPath == null) { + throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix) + } + zipTree(zipPath) + } + + from serverZipTree + into layout.buildDirectory + + // When tests are disabled this would still be run, so disable this manually + onlyIf { !project.rootProject.hasProperty("skipTests") } +} + +tasks.named('bootWar') { + dependsOn 'unzip' +} + +tasks.named('bootWarMainClassName') { + dependsOn 'unzip' +} + +tasks.named('war') { + dependsOn 'unzip' +} diff --git a/dd-smoke-tests/springboot-tomcat/application/settings.gradle b/dd-smoke-tests/springboot-tomcat/application/settings.gradle new file mode 100644 index 00000000000..c526fe40384 --- /dev/null +++ b/dd-smoke-tests/springboot-tomcat/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-tomcat-smoketest' diff --git a/dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java similarity index 100% rename from dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java rename to dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/SpringbootTomcatApplication.java diff --git a/dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java similarity index 100% rename from dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java rename to dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/TestSuite.java diff --git a/dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/controller/ViewController.java b/dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java similarity index 100% rename from dd-smoke-tests/springboot-tomcat/src/main/java/datadog/smoketest/springboot/controller/ViewController.java rename to dd-smoke-tests/springboot-tomcat/application/src/main/java/datadog/smoketest/springboot/controller/ViewController.java diff --git a/dd-smoke-tests/springboot-tomcat/src/main/resources/application.properties b/dd-smoke-tests/springboot-tomcat/application/src/main/resources/application.properties similarity index 100% rename from dd-smoke-tests/springboot-tomcat/src/main/resources/application.properties rename to dd-smoke-tests/springboot-tomcat/application/src/main/resources/application.properties diff --git a/dd-smoke-tests/springboot-tomcat/build.gradle b/dd-smoke-tests/springboot-tomcat/build.gradle index 14d0705eeca..980d02d2994 100644 --- a/dd-smoke-tests/springboot-tomcat/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/build.gradle @@ -1,126 +1,38 @@ -import org.springframework.boot.gradle.tasks.bundling.BootWar - plugins { - id 'war' - id 'org.springframework.boot' version '2.5.12' -} - -ext { - serverName = 'tomcat' - serverModule = 'tomcat-9' - serverVersion = '9.0.117' - serverExtension = 'zip' + id 'dd-trace-java.smoke-test-app' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'SpringBoot Tomcat Smoke Tests.' -repositories { - ivy { - url = 'https://dlcdn.apache.org' - patternLayout { - artifact '/[organisation]/[module]/v[revision]/bin/apache-[organisation]-[revision].[ext]' - } - metadataSources { - it.artifact() - } - } -} +def serverName = 'tomcat' +def serverVersion = '9.0.117' -configurations { - serverFile { - extendsFrom implementation - canBeResolved = true +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) } -} - -dependencies { - // uses the ivy repository url to download the tomcat server - // organisation = serverName, revision = serverVersion, module = serverModule, ext = serverExtension - serverFile "${serverName}:${serverModule}:${serverVersion}@${serverExtension}" - - testImplementation project(':dd-smoke-tests') -} - -tasks.register("unzip", Copy) { - def zipFileNamePrefix = "tomcat" - def serverZipTree = providers.provider { - // eager access - def zipPath = project.configurations.serverFile.find { - it.name.startsWith(zipFileNamePrefix) - } - if (zipPath == null) { - throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix) - } - zipTree(zipPath) + application { + taskName = 'bootWar' + artifactPath = 'libs/springboot-tomcat-smoketest.war' + sysProperty = 'datadog.smoketest.springboot.war.path' + additionalSystemProperties.put('datadog.smoketest.tomcatDir', "apache-${serverName}-${serverVersion}") } - - from serverZipTree - into layout.buildDirectory - - // When tests are disabled this would still be run, so disable this manually - onlyIf { !project.rootProject.hasProperty("skipTests") } } dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.5.12' - providedRuntime group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.5.12' - testImplementation group: 'commons-io', name: 'commons-io', version: '2.11.0' testImplementation project(':dd-smoke-tests') + testImplementation group: 'commons-io', name: 'commons-io', version: '2.11.0' } -tasks.named('sourcesJar') { - dependsOn 'unzip' -} - -tasks.named('javadocJar') { - dependsOn 'unzip' -} - -tasks.named('bootWar') { - dependsOn 'unzip' -} - -tasks.named('bootWarMainClassName') { - dependsOn 'unzip' -} - -tasks.named('war') { - dependsOn 'unzip' -} - -tasks.named('javadocJar') { - dependsOn 'unzip' -} - -tasks.named('sourcesJar') { - dependsOn 'unzip' -} - -tasks.named('forbiddenApisMain') { - dependsOn 'unzip' -} - -tasks.named('spotbugsMain') { - dependsOn 'unzip' -} - -tasks.matching({it.name.startsWith('compileTest')}).configureEach { - dependsOn 'war', 'bootWar', 'unzip' -} - -tasks.withType(Test).configureEach { - dependsOn "war", "bootWar", "unzip" +spotless { + java { + target "**/*.java" + } - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - def bootWarTask = tasks.named('bootWar', BootWar).get() - return [ - "-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}", - "-Ddatadog.smoketest.tomcatDir=${layout.buildDirectory.get()}/apache-${serverName}-${serverVersion}" - ] - } - }) + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/springboot-velocity/application/build.gradle b/dd-smoke-tests/springboot-velocity/application/build.gradle new file mode 100644 index 00000000000..49a85dacc10 --- /dev/null +++ b/dd-smoke-tests/springboot-velocity/application/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.15' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +def sharedRootDir = "$rootDir/../../../" +def sharedConfigDirectory = "$sharedRootDir/gradle" +rootProject.ext.sharedConfigDirectory = sharedConfigDirectory + +apply from: "$sharedConfigDirectory/repositories.gradle" + +if (hasProperty('appBuildDir')) { + buildDir = property('appBuildDir') +} + +version = "" + +dependencies { + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE' + implementation group: 'org.apache.velocity', name: 'velocity', version: '1.5' + implementation(group: 'org.apache.velocity', name: 'velocity-tools', version: '1.3') { + exclude group: 'javax.servlet', module: 'servlet-api' + } +} diff --git a/dd-smoke-tests/springboot-velocity/application/settings.gradle b/dd-smoke-tests/springboot-velocity/application/settings.gradle new file mode 100644 index 00000000000..0d5e7d082bc --- /dev/null +++ b/dd-smoke-tests/springboot-velocity/application/settings.gradle @@ -0,0 +1,32 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol = true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol = true + } + } + gradlePluginPortal() + mavenCentral() + } +} + +def isCI = providers.environmentVariable("CI").isPresent() + +if (isCI) { + def sharedRootDir = "$rootDir/../../../" + buildCache { + local { + directory = "$sharedRootDir/workspace/build-cache" + } + } +} + +rootProject.name = 'springboot-velocity-smoketest' diff --git a/dd-smoke-tests/springboot-velocity/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java similarity index 100% rename from dd-smoke-tests/springboot-velocity/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java rename to dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java diff --git a/dd-smoke-tests/springboot-velocity/src/main/java/datadog/smoketest/springboot/XssController.java b/dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java similarity index 100% rename from dd-smoke-tests/springboot-velocity/src/main/java/datadog/smoketest/springboot/XssController.java rename to dd-smoke-tests/springboot-velocity/application/src/main/java/datadog/smoketest/springboot/XssController.java diff --git a/dd-smoke-tests/springboot-velocity/src/main/resources/templates/velocity-insecure.vm b/dd-smoke-tests/springboot-velocity/application/src/main/resources/templates/velocity-insecure.vm similarity index 100% rename from dd-smoke-tests/springboot-velocity/src/main/resources/templates/velocity-insecure.vm rename to dd-smoke-tests/springboot-velocity/application/src/main/resources/templates/velocity-insecure.vm diff --git a/dd-smoke-tests/springboot-velocity/src/main/resources/templates/velocity-secure.vm b/dd-smoke-tests/springboot-velocity/application/src/main/resources/templates/velocity-secure.vm similarity index 100% rename from dd-smoke-tests/springboot-velocity/src/main/resources/templates/velocity-secure.vm rename to dd-smoke-tests/springboot-velocity/application/src/main/resources/templates/velocity-secure.vm diff --git a/dd-smoke-tests/springboot-velocity/build.gradle b/dd-smoke-tests/springboot-velocity/build.gradle index 76881a53bc1..464cdabe158 100644 --- a/dd-smoke-tests/springboot-velocity/build.gradle +++ b/dd-smoke-tests/springboot-velocity/build.gradle @@ -1,34 +1,56 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - plugins { - id 'java' - id 'org.springframework.boot' version '2.7.15' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'dd-trace-java.smoke-test-app' id 'java-test-fixtures' } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/spring-boot-plugin.gradle" + description = 'SpringBoot Velocity Smoke Tests.' -dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE' - implementation group: 'org.apache.velocity', name: 'velocity', version: '1.5' - implementation(group: 'org.apache.velocity', name: 'velocity-tools', version: '1.3') { - exclude group: 'javax.servlet', module: 'servlet-api' +smokeTestApp { + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + application { + taskName = 'bootJar' + artifactPath = 'libs/springboot-velocity-smoketest.jar' + sysProperty = 'datadog.smoketest.springboot.shadowJar.path' } +} +dependencies { testImplementation project(':dd-smoke-tests') testImplementation(testFixtures(project(":dd-smoke-tests:iast-util"))) } +// XssController loads templates from the filesystem at "resources/main/templates" relative to +// the test JVM's working directory (this module's build dir). Mirror the nested app's +// processed resources so that path resolves at runtime. +def applicationResourcesProvider = layout.buildDirectory.dir("application/resources/main") +tasks.register('copyAppResources', Copy) { + dependsOn 'bootJar' + from applicationResourcesProvider + into layout.buildDirectory.dir("resources/main") +} + +// `java.gradle` applies the `java` plugin so an empty `jar` task is created with +// `build/resources/main` as one of its inputs. Wire the dependency so Gradle knows +// `copyAppResources` writes there. +tasks.named('jar') { + dependsOn 'copyAppResources' +} + tasks.withType(Test).configureEach { - dependsOn "bootJar" - def bootJarTask = tasks.named('bootJar', BootJar) - jvmArgumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get() - } - }) + dependsOn 'copyAppResources' +} + +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } } diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle index 75941ba0288..5dfbdb8415f 100644 --- a/dd-smoke-tests/wildfly/build.gradle +++ b/dd-smoke-tests/wildfly/build.gradle @@ -1,3 +1,9 @@ +import datadog.buildlogic.smoketest.NestedGradleBuild + +plugins { + id 'dd-trace-java.smoke-test-app' +} + ext { serverName = 'wildfly' //serverModule = 'servlet' @@ -49,32 +55,23 @@ dependencies { testImplementation project(':dd-smoke-tests') } -def appDir = "$projectDir/spring-ear" -def appBuildDir = "$buildDir/spring-ear" -def isWindows = System.getProperty("os.name").toLowerCase().contains("win") -def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' -// define the task that builds the quarkus project -tasks.register('earBuild', Exec) { - workingDir "$appDir" - environment += [ - "GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'", - "JAVA_HOME": getLazyJavaHomeFor(8) - ] - commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" - - outputs.cacheIf { true } - - outputs.dir(appBuildDir) - .withPropertyName("applicationEar") - - inputs.files(fileTree(appDir) { - include '**/*' - exclude '.gradle/**' - }) - .withPropertyName("application") - .withPathSensitivity(PathSensitivity.RELATIVE) - - dependsOn project(':dd-trace-api').tasks.named("jar") +def appBuildDir = layout.buildDirectory.dir("spring-ear") +evaluationDependsOn(':dd-trace-api') +def apiJarTask = project(':dd-trace-api').tasks.named('jar') + +// Run the nested EAR build through the Gradle Tooling API, pinned to Gradle 8.14.5 on a +// Java 8 daemon. The previous Exec-based form invoked the root `gradlew`, which is +// Gradle 9+ now and would not run under JAVA_HOME=8. +tasks.register('earBuild', NestedGradleBuild) { + applicationDir = layout.projectDirectory.dir("spring-ear") + applicationBuildDir = appBuildDir + gradleVersion = "8.14.5" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + tasksToRun = ['assemble'] + projectJar('apiJar', apiJarTask.flatMap { it.archiveFile }) + dependsOn apiJarTask } tasks.named("compileTestGroovy", GroovyCompile) { @@ -124,8 +121,8 @@ tasks.withType(Jar).configureEach { def wildflyDir = "${buildDir}/${serverName}-${serverVersion}" tasks.register("deploy", Copy) { - dependsOn 'unzip' - from "${appBuildDir}/libs/wildfly-spring-ear-smoketest.ear" + dependsOn 'unzip', 'earBuild' + from appBuildDir.map { it.file("libs/wildfly-spring-ear-smoketest.ear") } into "${wildflyDir}/standalone/deployments" } diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle index 98085e93c50..e7d4824b4c6 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -35,4 +35,12 @@ repositories { includeGroupAndSubgroups "org.springframework" } } + // Hosts gradle-tooling-api, used by build-logic:smoke-test to run nested + // Gradle builds for smoke-test applications pinned to older Gradle versions. + maven { + url = 'https://repo.gradle.org/gradle/libs-releases' + content { + includeGroup "org.gradle" + } + } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4cf193f638..4bdb2a9ebdc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=6f74b601422d6d6fc4e1f9a1ab6522f642c2fdcbc15ae33ebd30ba3d7198e854 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip +distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index bd5aaceffaa..70f0e7d024f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,16 @@ pluginManagement { } gradlePluginPortal() mavenCentral() + // Hosts gradle-tooling-api, a transitive dep of the build-logic:smoke-test + // plugin used to run nested Gradle builds for smoke-test applications. + maven { + url = uri("https://repo.gradle.org/gradle/libs-releases") + content { + includeGroup("org.gradle") + } + } } + includeBuild("build-logic") } plugins {