Skip to content

Commit 3b94a72

Browse files
authored
Regroup jdk related instrumentations (#9663)
* Regroup jdk related instrumentations * spotless * rename to java
1 parent 20dac8a commit 3b94a72

File tree

247 files changed

+46
-388
lines changed

Some content is hidden

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

247 files changed

+46
-388
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
/dd-java-agent/agent-profiling/ @DataDog/profiling-java
120120
/dd-java-agent/agent-crashtracking/ @DataDog/profiling-java
121121
/dd-java-agent/instrumentation/exception-profiling/ @DataDog/profiling-java
122-
/dd-java-agent/instrumentation/java-directbytebuffer/ @DataDog/profiling-java
122+
/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java
123123
/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java
124124
/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java
125125
/dd-trace-api/src/main/java/datadog/trace/api/profiling @DataDog/profiling-java

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dependencies {
6868
jmh project(':dd-trace-core')
6969
jmh project(':dd-java-agent:agent-builder')
7070
jmh project(':dd-java-agent:instrumentation:iast-instrumenter')
71-
jmh project(':dd-java-agent:instrumentation:java-lang')
71+
jmh project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')
7272

7373
compileOnly('org.jetbrains:annotations:24.0.0')
7474
errorprone('com.uber.nullaway:nullaway:0.10.15')

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ dependencies {
4141
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
4242
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
4343
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common'))
44-
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))
45-
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net'))
44+
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8'))
45+
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8'))
4646
iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
4747

4848
v41IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.1'

dd-java-agent/instrumentation/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ subprojects { Project subProj ->
8383
compileOnly libs.autoservice.annotation
8484

8585
// Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation
86-
testImplementation project(':dd-java-agent:instrumentation:java-concurrent')
87-
testImplementation project(':dd-java-agent:instrumentation:java-concurrent:java-completablefuture')
86+
testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')
8887
// FIXME: we should enable this, but currently this fails tests for google http client
8988
//testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
9089
testImplementation project(':dd-java-agent:instrumentation:classloading')

dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle

Lines changed: 0 additions & 21 deletions
This file was deleted.

dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/gradle.lockfile

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)