Skip to content

Commit 5436979

Browse files
sarahchen6sarahchen6
committed
Update instrumentations K-Z
1 parent 005135f commit 5436979

File tree

57 files changed

+241
-182
lines changed

Some content is hidden

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

57 files changed

+241
-182
lines changed

‎dd-java-agent/instrumentation/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ plugins {
3131
apply from: "$rootDir/gradle/java.gradle"
3232

3333

34-
tasks.register("latestDepTest")
34+
tasks.register("latestDepTest", Test)
3535

3636
Project parent_project = project
3737
subprojects { Project subProj ->
@@ -130,7 +130,7 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep
130130
}
131131

132132

133-
tasks.named('shadowJar') {
133+
tasks.named('shadowJar', ShadowJar) {
134134
duplicatesStrategy = DuplicatesStrategy.FAIL
135135
dependencies {
136136
// the tracer is now in a separate shadow jar

‎dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
6767
}
6868

69-
iastLatestDepTest3.configure {
69+
tasks.named("iastLatestDepTest3", Test) {
7070
javaLauncher = getJavaLauncherFor(17)
7171
jvmArgs = ['--add-opens', 'java.base/java.util=ALL-UNNAMED']
7272
}

‎dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,22 @@ apply from: "$rootDir/gradle/java.gradle"
1616
addTestSuiteForDir('latestDepTest', 'test')
1717
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
1818

19-
[compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each {
20-
it.configure {
19+
["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each { name ->
20+
tasks.named(name, JavaCompile) {
2121
setJavaVersion(it, 17)
2222
sourceCompatibility = JavaVersion.VERSION_1_8
2323
targetCompatibility = JavaVersion.VERSION_1_8
2424
}
2525
}
26+
2627
tasks.withType(JavaCompile).each {
2728
it.configure {
2829
setJavaVersion(it, 17)
2930
sourceCompatibility = JavaVersion.VERSION_1_8
3031
targetCompatibility = JavaVersion.VERSION_1_8
3132
}
3233
}
34+
3335
tasks.withType(GroovyCompile) {
3436
javaLauncher = getJavaLauncherFor(17)
3537
}

‎dd-java-agent/instrumentation/karate/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ sourceSets {
8181
}
8282
}
8383

84-
tasks.named("compileLatestDepTestJava") {
84+
tasks.named("compileLatestDepTestJava", JavaCompile) {
8585
setJavaVersion(it, 11)
8686
sourceCompatibility = JavaVersion.VERSION_1_8
8787
targetCompatibility = JavaVersion.VERSION_1_8

‎dd-java-agent/instrumentation/kotlin-coroutines/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ apply from: "$rootDir/gradle/test-with-kotlin.gradle"
2626

2727
addTestSuite('latestDepTest')
2828

29-
tasks.named("compileTestFixturesGroovy") {
29+
tasks.named("compileTestFixturesGroovy", GroovyCompile) {
3030
classpath += files(compileTestFixturesKotlin.destinationDirectory)
3131
}
3232

33-
tasks.named("compileTestGroovy") {
33+
tasks.named("compileTestGroovy", GroovyCompile) {
3434
classpath += files(compileTestKotlin.destinationDirectory)
3535
}
3636

37-
tasks.named("compileLatestDepTestGroovy") {
37+
tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
3838
classpath += files(compileLatestDepTestKotlin.destinationDirectory)
3939
}
4040

‎dd-java-agent/instrumentation/liberty-20/build.gradle‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ dependencies {
4848
// because using testFixtures() causes some early evaluation of dependencies
4949
webappRuntimeOnly libs.groovy
5050
}
51-
compileWebappJava.dependsOn ':dd-java-agent:instrumentation:servlet:request-3:testFixturesJar'
51+
52+
tasks.named("compileWebappJava", JavaCompile) {
53+
dependsOn(":dd-java-agent:instrumentation:servlet:request-3:testFixturesJar")
54+
}
5255

5356
configurations.testRuntimeOnly {
5457
exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -86,19 +89,12 @@ tasks.register('installOpenLibertyDeps', Copy) {
8689
into extractDir
8790
outputs.file ext.serverXmlFile
8891
}
89-
[test, forkedTest]*.dependsOn webappClasses, installOpenLibertyDeps
90-
[test, forkedTest].each {
91-
it.configure {
92-
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
93-
}
94-
}
9592

9693
tasks.register('webappCopyJars', Sync) {
9794
from configurations.webappRuntimeClasspath.findAll { it.name.endsWith('.jar') }
9895
into project.layout.buildDirectory.dir("$relAppDir/WEB-INF/lib")
9996
dependsOn ':dd-java-agent:instrumentation:servlet:request-3:testFixturesJar'
10097
}
101-
[test, forkedTest]*.dependsOn webappCopyJars
10298

10399
tasks.register('filterLogbackClassic', Sync) {
104100
ext.filteredLogbackDir = project.layout.buildDirectory.dir('filteredLogback')
@@ -108,4 +104,13 @@ tasks.register('filterLogbackClassic', Sync) {
108104
exclude 'META-INF/**'
109105
into ext.filteredLogbackDir
110106
}
111-
[test, forkedTest]*.dependsOn filterLogbackClassic
107+
108+
tasks.named("test", Test) {
109+
dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic)
110+
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
111+
}
112+
113+
tasks.named("forkedTest", Test) {
114+
dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic)
115+
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
116+
}

‎dd-java-agent/instrumentation/liberty-23/build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ dependencies {
5454
// because using testFixtures() causes some early evaluation of dependencies
5555
webappRuntimeOnly libs.groovy
5656
}
57-
compileWebappJava.dependsOn ':dd-java-agent:instrumentation:servlet:request-5:testFixturesJar'
57+
58+
tasks.named("compileWebappJava", JavaCompile) {
59+
dependsOn(":dd-java-agent:instrumentation:servlet:request-5:testFixturesJar")
60+
}
5861

5962
configurations.testRuntimeOnly {
6063
exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -98,19 +101,12 @@ tasks.register('installOpenLibertyDeps', Copy) {
98101
into extractDir
99102
outputs.file ext.serverXmlFile
100103
}
101-
[test, forkedTest]*.dependsOn webappClasses, installOpenLibertyDeps
102-
[test, forkedTest].each {
103-
it.configure {
104-
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
105-
}
106-
}
107104

108105
tasks.register('webappCopyJars', Sync) {
109106
from configurations.webappRuntimeClasspath.findAll { it.name.endsWith('.jar') }
110107
into project.layout.buildDirectory.dir("$relAppDir/WEB-INF/lib")
111108
dependsOn ':dd-java-agent:instrumentation:servlet:request-5:testFixturesJar'
112109
}
113-
[test, forkedTest]*.dependsOn webappCopyJars
114110

115111
def filterLogbackClassicTask = tasks.register('filterLogbackClassic', Sync) {
116112
ext.filteredLogbackDir = project.layout.buildDirectory.dir('filteredLogback')
@@ -147,8 +143,13 @@ def shadowJarTask = tasks.named("shadowJar", ShadowJar) {
147143
include "wlp/dev/*.jar"
148144
}
149145
}
150-
["test", "forkedTest"].each {
151-
tasks.named(it) {
152-
dependsOn(filterLogbackClassicTask, shadowJarTask)
153-
}
146+
147+
tasks.named("test", Test) {
148+
dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic, shadowJarTask)
149+
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
150+
}
151+
152+
tasks.named("forkedTest", Test) {
153+
dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic, shadowJarTask)
154+
jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"]
154155
}

‎dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ apply from: "$rootDir/gradle/java.gradle"
1414

1515
addTestSuiteForDir('latestDepTest', 'test')
1616

17-
[compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each {
18-
it.configure {
17+
["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each { name ->
18+
tasks.named(name, JavaCompile) {
1919
setJavaVersion(it, 17)
2020
sourceCompatibility = JavaVersion.VERSION_1_8
2121
targetCompatibility = JavaVersion.VERSION_1_8
2222
}
2323
}
2424

25-
[compileTestGroovy, compileLatestDepTestGroovy].each {
26-
it.configure {
25+
["compileTestGroovy", "compileLatestDepTestGroovy"].each { name ->
26+
tasks.named(name, GroovyCompile) {
2727
javaLauncher = getJavaLauncherFor(17)
2828
}
2929
}

‎dd-java-agent/instrumentation/mule-4.5/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,34 +100,34 @@ sourceSets {
100100
}
101101
}
102102

103-
compileMain_java11Java.configure {
103+
tasks.named("compileMain_java11Java", JavaCompile) {
104104
setJavaVersion(it, 11)
105105
sourceCompatibility = JavaVersion.VERSION_1_8
106106
targetCompatibility = JavaVersion.VERSION_1_8
107107
}
108108

109-
jar {
109+
tasks.named("jar", Jar) {
110110
from sourceSets.main_java11.output
111111
}
112112

113-
forbiddenApisMain_java11 {
113+
tasks.named("forbiddenApisMain_java11") {
114114
failOnMissingClasses = false
115115
}
116116

117-
tasks.named("compileTestGroovy") {
117+
tasks.named("compileTestGroovy", GroovyCompile) {
118118
dependsOn 'mvnPackage', 'extractMuleServices'
119119
}
120120

121-
tasks.named("compileMule46ForkedTestGroovy") {
121+
tasks.named("compileMule46ForkedTestGroovy", GroovyCompile) {
122122
dependsOn 'mvnPackage', 'extractMule46Services'
123123
}
124124

125-
tasks.named("compileLatestDepForkedTestGroovy") {
125+
tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) {
126126
dependsOn 'mvnPackage', 'extractLatestMuleServices'
127127
setJavaVersion(it, 17)
128128
}
129129

130-
tasks.named("compileLatestDepForkedTestJava") {
130+
tasks.named("compileLatestDepForkedTestJava", JavaCompile) {
131131
setJavaVersion(it, 17)
132132
}
133133

‎dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ dependencies {
2121
latestDepTestImplementation group: 'io.netty', name: 'netty-buffer', version: '+'
2222
}
2323

24-
tasks.named("latestDepTest") {
24+
tasks.named("latestDepTest", Test) {
2525
dependsOn "latestDep4Test"
2626
}

0 commit comments

Comments
 (0)