Skip to content

Commit 1128695

Browse files
committed
Add dependency to dd-instrument-java 0.0.2
1 parent c180b4f commit 1128695

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ dependencies {
4949
api group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.17'
5050
api libs.bytebuddy
5151
api libs.bytebuddyagent
52+
api libs.instrumentjava
5253
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
5354
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
5455

dd-java-agent/instrumentation/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ subprojects { Project subProj ->
5757
annotationProcessor libs.autoservice.processor
5858
compileOnly libs.autoservice.annotation
5959

60+
// Some frameworks use an old copy of ASM, test with '-all' variant to mimic the agent's class-loader isolation
61+
testImplementation variantOf(libs.instrumentjava) { classifier("all") }
62+
6063
// Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation
6164
testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')
6265
// FIXME: we should enable this, but currently this fails tests for google http client

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ junit5 = "5.12.2"
1212
junit-platform = "1.12.2"
1313
logback = "1.2.13"
1414
bytebuddy = "1.17.7"
15+
instrumentjava = "0.0.2"
1516
scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+)
1617
scala211 = "2.11.12"
1718
scala212 = "2.12.18"
@@ -46,6 +47,7 @@ okhttp = { module = "com.datadoghq.okhttp3:okhttp", version.ref = "okhttp" }
4647
okio = { module = "com.datadoghq.okio:okio", version.ref = "okio" }
4748
bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
4849
bytebuddyagent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
50+
instrumentjava = { module = "com.datadoghq:dd-instrument-java", version.ref = "instrumentjava" }
4951
autoservice-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
5052
autoservice-annotation = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice" }
5153
commons-math = { module = "org.apache.commons:commons-math3", version.ref = "commons" }

0 commit comments

Comments
 (0)