Skip to content

Commit e0a335c

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
authored
Split Gradle instrumentations into different modules (#7523)
1 parent 01d9133 commit e0a335c

22 files changed

Lines changed: 268 additions & 51 deletions

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries-java
2626
dd-java-agent/instrumentation/scalatest/ @DataDog/ci-app-libraries-java
2727
dd-java-agent/instrumentation/selenium/ @DataDog/ci-app-libraries-java
2828
dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries-java
29-
dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries-java
29+
dd-java-agent/instrumentation/gradle-3.0/ @DataDog/ci-app-libraries-java
30+
dd-java-agent/instrumentation/gradle-8.3/ @DataDog/ci-app-libraries-java
3031
dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java
3132
dd-smoke-tests/gradle/ @DataDog/ci-app-libraries-java
3233
dd-smoke-tests/maven/ @DataDog/ci-app-libraries-java

dd-java-agent/instrumentation/gradle/build.gradle renamed to dd-java-agent/instrumentation/gradle-3.0/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/gradle/gradle.lockfile renamed to dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java renamed to dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java

File renamed without changes.

dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java renamed to dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy renamed to dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy

File renamed without changes.

dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy renamed to dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy

File renamed without changes.

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apply from: "$rootDir/gradle/java.gradle"
2+
3+
repositories {
4+
maven {
5+
url "https://repo.gradle.org/artifactory/libs-releases-local"
6+
}
7+
}
8+
9+
dependencies {
10+
compileOnly gradleApi()
11+
}
12+
13+
forbiddenApisMain {
14+
failOnMissingClasses = false
15+
}

‎dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
5+
cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
6+
ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
7+
ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
8+
com.beust:jcommander:1.78=testRuntimeClasspath
9+
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10+
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11+
com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13+
com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
14+
com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
15+
com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
16+
com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
17+
com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
18+
com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
19+
com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
20+
com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
21+
com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
22+
com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
23+
com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
24+
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
25+
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
26+
com.github.spotbugs:spotbugs:4.7.3=spotbugs
27+
com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
28+
com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
29+
com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
30+
com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
31+
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
32+
com.google.code.gson:gson:2.9.1=spotbugs
33+
com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
34+
com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
35+
com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
36+
com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
37+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
38+
com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
39+
com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
40+
com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41+
com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
42+
com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
43+
com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
44+
com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
45+
commons-codec:commons-codec:1.15=spotbugs
46+
commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
47+
commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
48+
de.thetaphi:forbiddenapis:3.1=compileClasspath
49+
info.picocli:picocli:4.6.3=testRuntimeClasspath
50+
io.sqreen:libsqreen:10.1.0=testRuntimeClasspath
51+
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
52+
jaxen:jaxen:1.2.0=spotbugs
53+
jline:jline:2.14.6=testRuntimeClasspath
54+
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
55+
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
56+
net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
57+
net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
58+
net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
59+
net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
60+
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
61+
net.sf.saxon:Saxon-HE:11.4=spotbugs
62+
org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
63+
org.apache.ant:ant-antlr:1.9.15=codenarc
64+
org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
65+
org.apache.ant:ant-junit:1.9.15=codenarc
66+
org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
67+
org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
68+
org.apache.bcel:bcel:6.5.0=spotbugs
69+
org.apache.commons:commons-lang3:3.12.0=spotbugs
70+
org.apache.commons:commons-text:1.10.0=spotbugs
71+
org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
72+
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
73+
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
74+
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
75+
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
76+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
77+
org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
78+
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
79+
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
80+
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
81+
org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
82+
org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
83+
org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
84+
org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
85+
org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
86+
org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
87+
org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
88+
org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
89+
org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
90+
org.codehaus.groovy:groovy-json:2.5.14=codenarc
91+
org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
92+
org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
93+
org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
94+
org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
95+
org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
96+
org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
97+
org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
98+
org.codehaus.groovy:groovy-templates:2.5.14=codenarc
99+
org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
100+
org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
101+
org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
102+
org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
103+
org.codehaus.groovy:groovy-xml:2.5.14=codenarc
104+
org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
105+
org.codehaus.groovy:groovy:2.5.14=codenarc
106+
org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
107+
org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
108+
org.codenarc:CodeNarc:2.2.0=codenarc
109+
org.dom4j:dom4j:2.1.3=spotbugs
110+
org.eclipse.jetty:jetty-http:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
111+
org.eclipse.jetty:jetty-io:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
112+
org.eclipse.jetty:jetty-server:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
113+
org.eclipse.jetty:jetty-util:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
114+
org.gmetrics:GMetrics:1.1=codenarc
115+
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
116+
org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
117+
org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
118+
org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
119+
org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
120+
org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
121+
org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
122+
org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
123+
org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
124+
org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
125+
org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
126+
org.junit:junit-bom:5.9.1=spotbugs
127+
org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
128+
org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
129+
org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
130+
org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
131+
org.ow2.asm:asm-analysis:9.4=spotbugs
132+
org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
133+
org.ow2.asm:asm-commons:9.4=spotbugs
134+
org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
135+
org.ow2.asm:asm-tree:9.4=spotbugs
136+
org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
137+
org.ow2.asm:asm-util:9.4=spotbugs
138+
org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
139+
org.ow2.asm:asm:9.4=spotbugs
140+
org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
141+
org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
142+
org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
143+
org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
144+
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
145+
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
146+
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
147+
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
148+
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
149+
org.testng:testng:7.5=testRuntimeClasspath
150+
org.webjars:jquery:3.5.1=testRuntimeClasspath
151+
org.xmlresolver:xmlresolver:4.4.3=spotbugs
152+
xml-apis:xml-apis:1.4.01=spotbugs
153+
empty=spotbugsPlugins

dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java renamed to dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java

File renamed without changes.

0 commit comments

Comments
 (0)