Skip to content

Commit 3d4d244

Browse files
committed
Agent first batch
1 parent 61c2d97 commit 3d4d244

File tree

9 files changed

+34
-19
lines changed

9 files changed

+34
-19
lines changed

dd-java-agent/agent-bootstrap/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ dependencies {
4848
main_java11CompileOnly sourceSets.main.output
4949
}
5050

51-
jar {
51+
tasks.named("jar", Jar) {
5252
from sourceSets.main_java11.output
5353
}
5454

55-
forbiddenApisMain_java11 {
55+
tasks.named("forbiddenApisMain_java11") {
5656
failOnMissingClasses = false
5757
}
5858

dd-java-agent/agent-builder/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sourceSets {
1919
}
2020
}
2121

22-
compileMain_java11Java.configure {
22+
tasks.named("compileMain_java11Java", JavaCompile) {
2323
setJavaVersion(it, 11)
2424
sourceCompatibility = JavaVersion.VERSION_1_8
2525
targetCompatibility = JavaVersion.VERSION_1_8
@@ -31,11 +31,11 @@ dependencies {
3131
runtimeOnly sourceSets.main_java11.output
3232
}
3333

34-
jar {
34+
tasks.named("jar", Jar) {
3535
from sourceSets.main_java11.output
3636
}
3737

38-
forbiddenApisMain_java11 {
38+
tasks.named("forbiddenApisMain_java11") {
3939
failOnMissingClasses = false
4040
}
4141

dd-java-agent/agent-ci-visibility/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
buildscript {
24
repositories {
35
mavenLocal()
@@ -57,10 +59,10 @@ dependencies {
5759
testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
5860
}
5961

60-
shadowJar {
62+
tasks.named("shadowJar", ShadowJar) {
6163
dependencies deps.excludeShared
6264
}
6365

64-
jar {
66+
tasks.named("jar", Jar) {
6567
archiveClassifier = 'unbundled'
6668
}

dd-java-agent/agent-debugger/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -62,14 +64,14 @@ dependencies {
6264
testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
6365
}
6466

65-
shadowJar {
67+
tasks.named("shadowJar", ShadowJar) {
6668
dependencies deps.excludeShared
6769
dependencies {
6870
exclude(project(':dd-java-agent:agent-debugger:debugger-bootstrap'))
6971
}
7072
}
7173

72-
jar {
74+
tasks.named("jar", Jar) {
7375
archiveClassifier = 'unbundled'
7476
from sourceSets.main.output
7577
}

dd-java-agent/agent-iast/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
12
import net.ltgt.gradle.errorprone.CheckSeverity
23

34
plugins {
@@ -74,11 +75,11 @@ dependencies {
7475
errorprone('com.google.errorprone:error_prone_core:2.23.0')
7576
}
7677

77-
shadowJar {
78+
tasks.named("shadowJar", ShadowJar) {
7879
dependencies deps.excludeShared
7980
}
8081

81-
jar {
82+
tasks.named("jar", Jar) {
8283
archiveClassifier = 'unbundled'
8384
}
8485

dd-java-agent/agent-jmxfetch/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
import java.nio.file.Files
24
import java.nio.file.attribute.BasicFileAttributes
35
import java.util.stream.Collectors
@@ -23,7 +25,7 @@ dependencies {
2325
api project(':dd-java-agent:agent-bootstrap')
2426
}
2527

26-
shadowJar {
28+
tasks.named("shadowJar", ShadowJar) {
2729
dependencies deps.excludeShared
2830
}
2931

@@ -99,7 +101,7 @@ tasks.register('copyMetricConfigs', CopyMetricConfigsTask) {
99101
outputDirectory = file("$buildDir/integrations-core-resources")
100102
}
101103

102-
processResources {
104+
tasks.named("processResources", ProcessResources) {
103105
dependsOn 'copyMetricConfigs'
104106
from("$buildDir/integrations-core-resources")
105107
}

dd-java-agent/agent-llmobs/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
buildscript {
24
repositories {
35
mavenCentral()
@@ -30,10 +32,10 @@ dependencies {
3032
testImplementation project(':dd-java-agent:testing')
3133
}
3234

33-
shadowJar {
35+
tasks.named("shadowJar", ShadowJar) {
3436
dependencies deps.excludeShared
3537
}
3638

37-
jar {
39+
tasks.named("jar", Jar) {
3840
archiveClassifier = 'unbundled'
3941
}

dd-java-agent/agent-logs-intake/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -15,10 +17,10 @@ dependencies {
1517
implementation project(':communication')
1618
}
1719

18-
shadowJar {
20+
tasks.named("shadowJar", ShadowJar) {
1921
dependencies deps.excludeShared
2022
}
2123

22-
jar {
24+
tasks.named("jar", Jar) {
2325
archiveClassifier = 'unbundled'
2426
}

dd-java-agent/agent-otel/otel-bootstrap/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -31,6 +33,7 @@ forbiddenApis {
3133
failOnMissingClasses = false
3234
ignoreFailures = true
3335
}
36+
3437
spotbugs {
3538
onlyAnalyze = ['none']
3639
}
@@ -61,11 +64,12 @@ tasks.register('unpackJars', Copy) {
6164
}
6265
into compileJava.destinationDirectory
6366
}
67+
6468
tasks.named('compileJava') {
6569
dependsOn 'unpackJars'
6670
}
6771

68-
shadowJar {
72+
tasks.named("shadowJar", ShadowJar) {
6973
dependencies deps.excludeShared
7074

7175
include '*.jar'
@@ -104,6 +108,6 @@ shadowJar {
104108
relocate 'datadog.opentelemetry.shim', 'datadog.trace.bootstrap.otel.shim'
105109
}
106110

107-
jar {
111+
tasks.named("jar", Jar) {
108112
archiveClassifier = 'unbundled'
109113
}

0 commit comments

Comments
 (0)