Skip to content

Commit 72a7093

Browse files
amarzialiamarziali
authored
Merge branch 'master' into andrea.marziali/migrate-junit-ddtrace-ot
2 parents 298bcc6 + 7b18b2e commit 72a7093

65 files changed

Lines changed: 3396 additions & 1684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/GradleDistribution.kt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package datadog.buildlogic.smoketest
2+
3+
import java.net.URI
4+
5+
internal const val MASS_READ_URL_ENV = "MASS_READ_URL"
6+
7+
internal fun gradleDistributionUri(massReadUrl: String, gradleVersion: String): URI {
8+
val baseUrl = if (massReadUrl.endsWith("/")) massReadUrl else "$massReadUrl/"
9+
return URI.create(
10+
"${baseUrl}internal/artifact/services.gradle.org/distributions/gradle-$gradleVersion-bin.zip",
11+
)
12+
}

‎build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.gradle.api.tasks.InputFiles
1616
import org.gradle.api.tasks.Internal
1717
import org.gradle.api.tasks.CacheableTask
1818
import org.gradle.api.tasks.Nested
19+
import org.gradle.api.tasks.Optional
1920
import org.gradle.api.tasks.OutputDirectory
2021
import org.gradle.api.tasks.PathSensitive
2122
import org.gradle.api.tasks.PathSensitivity
@@ -47,6 +48,9 @@ abstract class NestedGradleBuild @Inject constructor(
4748

4849
init {
4950
gradleVersion.convention(DEFAULT_NESTED_GRADLE_VERSION)
51+
gradleDistributionBaseUrl.convention(
52+
project.providers.environmentVariable(MASS_READ_URL_ENV),
53+
)
5054
javaLauncher.convention(
5155
javaToolchains.launcherFor {
5256
languageVersion.set(JavaLanguageVersion.of(DEFAULT_NESTED_JAVA_VERSION))
@@ -69,6 +73,14 @@ abstract class NestedGradleBuild @Inject constructor(
6973
@get:Input
7074
abstract val gradleVersion: Property<String>
7175

76+
/**
77+
* Optional base URL for Gradle distribution downloads. CI sets this to MASS so nested builds
78+
* download through the pull-through cache instead of directly from services.gradle.org.
79+
*/
80+
@get:Input
81+
@get:Optional
82+
abstract val gradleDistributionBaseUrl: Property<String>
83+
7284
@get:Nested
7385
abstract val javaLauncher: Property<JavaLauncher>
7486

@@ -137,8 +149,17 @@ abstract class NestedGradleBuild @Inject constructor(
137149
}
138150

139151
val connector = GradleConnector.newConnector()
140-
.useGradleVersion(gradleVersion.get())
141152
.forProjectDirectory(appDir)
153+
.apply {
154+
val distributionBaseUrl = gradleDistributionBaseUrl.orNull
155+
if (distributionBaseUrl.isNullOrBlank()) {
156+
useGradleVersion(gradleVersion.get())
157+
} else {
158+
useDistribution(
159+
gradleDistributionUri(distributionBaseUrl, gradleVersion.get()),
160+
)
161+
}
162+
}
142163

143164
val extraEnv = environment.get()
144165
val mergedEnv: Map<String, String>? =

‎build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ abstract class SmokeTestAppExtension @Inject constructor(
4040
*/
4141
abstract val gradleVersion: Property<String>
4242

43+
/**
44+
* Optional base URL for Gradle distribution downloads. Defaults to the CI-provided MASS read
45+
* URL when present, so Tooling API downloads go through the pull-through cache.
46+
*/
47+
abstract val gradleDistributionBaseUrl: Property<String>
48+
4349
/**
4450
* JDK used by the nested daemon. Defaults to a [DEFAULT_NESTED_JAVA_VERSION] toolchain;
4551
* override to pin a different JDK if the nested application's plugin chain requires it.
@@ -63,6 +69,9 @@ abstract class SmokeTestAppExtension @Inject constructor(
6369
applicationDir.convention(project.layout.projectDirectory.dir("application"))
6470
applicationBuildDir.convention(project.layout.buildDirectory.dir("application"))
6571
gradleVersion.convention(DEFAULT_NESTED_GRADLE_VERSION)
72+
gradleDistributionBaseUrl.convention(
73+
project.providers.environmentVariable(MASS_READ_URL_ENV),
74+
)
6675
javaLauncher.convention(
6776
javaToolchains.launcherFor {
6877
languageVersion.set(JavaLanguageVersion.of(DEFAULT_NESTED_JAVA_VERSION))
@@ -94,6 +103,7 @@ abstract class SmokeTestAppExtension @Inject constructor(
94103
applicationDir.set(this@SmokeTestAppExtension.applicationDir)
95104
applicationBuildDir.set(this@SmokeTestAppExtension.applicationBuildDir)
96105
gradleVersion.set(this@SmokeTestAppExtension.gradleVersion)
106+
gradleDistributionBaseUrl.set(this@SmokeTestAppExtension.gradleDistributionBaseUrl)
97107
javaLauncher.set(this@SmokeTestAppExtension.javaLauncher)
98108
tasksToRun.set(nestedTasks)
99109
buildArguments.set(spec.buildArguments)

‎build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,37 @@ class SmokeTestAppPluginTest {
6767
assertThat(extension.gradleVersion.get()).isEqualTo(DEFAULT_NESTED_GRADLE_VERSION)
6868
}
6969

70+
@Test
71+
fun `application task receives configured Gradle distribution base URL`() {
72+
val project = ProjectBuilder.builder().build()
73+
project.apply<JavaPlugin>()
74+
project.plugins.apply("dd-trace-java.smoke-test-app")
75+
76+
val extension = project.extensions.getByType<SmokeTestAppExtension>()
77+
extension.gradleDistributionBaseUrl.set("https://mass.example")
78+
extension.application {
79+
taskName.set("packageApp")
80+
artifactPath.set("libs/test.jar")
81+
sysProperty.set("test.path")
82+
}
83+
84+
val task = project.tasks.getByName("packageApp") as NestedGradleBuild
85+
86+
assertThat(task.gradleDistributionBaseUrl.get()).isEqualTo("https://mass.example")
87+
}
88+
89+
@Test
90+
fun `Gradle distribution URI routes through MASS artifact path`() {
91+
assertThat(gradleDistributionUri("https://mass.example", "8.14.5").toString())
92+
.isEqualTo(
93+
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.5-bin.zip",
94+
)
95+
assertThat(gradleDistributionUri("https://mass.example/", "8.14.5").toString())
96+
.isEqualTo(
97+
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.5-bin.zip",
98+
)
99+
}
100+
70101
@Test
71102
fun `extension defaults javaLauncher to a JDK 21 toolchain`() {
72103
// JavaToolchainService is contributed by the `java-base` plugin; apply something that

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private static Map<String, String> buildJvmArgMap(
100100

101101
protected List<String> buildJvmArguments(
102102
String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
103-
List<String> arguments = new ArrayList<>(Arrays.asList("-Xms256m", "-Xmx256m"));
103+
List<String> arguments = new ArrayList<>(Arrays.asList("-Xms256m", "-Xmx512m"));
104104

105105
arguments.add(preventJulPrefsFileLock());
106106

‎dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -154,57 +154,57 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD
154154
org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
155155
org.xmlresolver:xmlresolver:5.3.3=spotbugs
156156
software.amazon.awssdk:annotations:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
157-
software.amazon.awssdk:annotations:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
157+
software.amazon.awssdk:annotations:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
158158
software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath
159-
software.amazon.awssdk:apache-client:2.44.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
159+
software.amazon.awssdk:apache-client:2.44.12=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
160160
software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
161-
software.amazon.awssdk:auth:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
161+
software.amazon.awssdk:auth:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
162162
software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
163-
software.amazon.awssdk:aws-core:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
163+
software.amazon.awssdk:aws-core:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
164164
software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
165-
software.amazon.awssdk:aws-json-protocol:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
165+
software.amazon.awssdk:aws-json-protocol:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
166166
software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
167-
software.amazon.awssdk:checksums-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
167+
software.amazon.awssdk:checksums-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
168168
software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
169-
software.amazon.awssdk:checksums:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
169+
software.amazon.awssdk:checksums:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
170170
software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
171-
software.amazon.awssdk:dynamodb:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
171+
software.amazon.awssdk:dynamodb:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
172172
software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
173-
software.amazon.awssdk:endpoints-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
173+
software.amazon.awssdk:endpoints-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
174174
software.amazon.awssdk:http-auth-aws-eventstream:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
175-
software.amazon.awssdk:http-auth-aws-eventstream:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
175+
software.amazon.awssdk:http-auth-aws-eventstream:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
176176
software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
177-
software.amazon.awssdk:http-auth-aws:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
177+
software.amazon.awssdk:http-auth-aws:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
178178
software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
179-
software.amazon.awssdk:http-auth-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
179+
software.amazon.awssdk:http-auth-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
180180
software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
181-
software.amazon.awssdk:http-auth:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
181+
software.amazon.awssdk:http-auth:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
182182
software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
183-
software.amazon.awssdk:http-client-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
183+
software.amazon.awssdk:http-client-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
184184
software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
185-
software.amazon.awssdk:identity-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
185+
software.amazon.awssdk:identity-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
186186
software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
187-
software.amazon.awssdk:json-utils:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
187+
software.amazon.awssdk:json-utils:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
188188
software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
189-
software.amazon.awssdk:metrics-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
189+
software.amazon.awssdk:metrics-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
190190
software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath
191-
software.amazon.awssdk:netty-nio-client:2.44.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
191+
software.amazon.awssdk:netty-nio-client:2.44.12=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
192192
software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
193-
software.amazon.awssdk:profiles:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
193+
software.amazon.awssdk:profiles:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
194194
software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
195-
software.amazon.awssdk:protocol-core:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
195+
software.amazon.awssdk:protocol-core:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
196196
software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
197-
software.amazon.awssdk:regions:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
197+
software.amazon.awssdk:regions:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
198198
software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
199-
software.amazon.awssdk:retries-spi:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
199+
software.amazon.awssdk:retries-spi:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
200200
software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
201-
software.amazon.awssdk:retries:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
201+
software.amazon.awssdk:retries:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
202202
software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
203-
software.amazon.awssdk:sdk-core:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
203+
software.amazon.awssdk:sdk-core:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
204204
software.amazon.awssdk:third-party-jackson-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
205-
software.amazon.awssdk:third-party-jackson-core:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
206-
software.amazon.awssdk:utils-lite:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
205+
software.amazon.awssdk:third-party-jackson-core:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
206+
software.amazon.awssdk:utils-lite:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
207207
software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
208-
software.amazon.awssdk:utils:2.44.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
208+
software.amazon.awssdk:utils:2.44.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
209209
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
210210
empty=spotbugsPlugins

0 commit comments

Comments
 (0)