Skip to content

Commit d21a1aa

Browse files
bric3bric3
committed
Merge remote-tracking branch 'origin/master' into andrea.marziali/jetty
2 parents 1b67b9b + 1772b5b commit d21a1aa

File tree

371 files changed

+2068
-1499
lines changed

Some content is hidden

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

371 files changed

+2068
-1499
lines changed

‎.github/workflows/analyze-changes.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
2424
with:
2525
submodules: 'recursive'
26-
2726
- name: Cache Gradle dependencies
2827
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2928
with:
@@ -41,6 +40,8 @@ jobs:
4140
build-mode: 'manual'
4241

4342
- name: Build dd-trace-java for creating the CodeQL database
43+
env:
44+
ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
4445
run: |
4546
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
4647
JAVA_HOME=$JAVA_HOME_8_X64 \
@@ -85,6 +86,8 @@ jobs:
8586
rm -rf "${MVN_LOCAL_REPO}/com/datadoghq"
8687
8788
- name: Build and publish artifacts locally
89+
env:
90+
ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
8891
run: |
8992
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
9093
JAVA_HOME=$JAVA_HOME_8_X64 \

‎buildSrc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ dependencies {
6262
implementation("com.github.zafarkhaja:java-semver:0.10.2")
6363

6464
implementation("com.google.guava", "guava", "20.0")
65-
implementation("org.ow2.asm", "asm", "9.9")
66-
implementation("org.ow2.asm", "asm-tree", "9.9")
65+
implementation(libs.asm)
66+
implementation(libs.asm.tree)
6767

6868
implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.2"))
6969
implementation("com.fasterxml.jackson.core:jackson-databind")

‎buildSrc/call-site-instrumentation-plugin/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ dependencies {
3232
compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")
3333

3434
implementation("org.freemarker", "freemarker", "2.3.30")
35-
implementation("org.ow2.asm", "asm", "9.9")
36-
implementation("org.ow2.asm", "asm-tree", "9.9")
35+
implementation(libs.asm)
36+
implementation(libs.asm.tree)
3737
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
3838

3939
testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")

‎dd-java-agent/agent-aiguard/gradle.lockfile‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
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=runtimeClasspath,testRuntimeClasspath
5+
cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath
6+
ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
7+
ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
8+
com.beust:jcommander:1.78=testRuntimeClasspath
9+
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10+
com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11+
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
13+
com.fasterxml.jackson.core:jackson-annotations:2.20=testCompileClasspath,testRuntimeClasspath
14+
com.fasterxml.jackson.core:jackson-core:2.20.0=testCompileClasspath,testRuntimeClasspath
15+
com.fasterxml.jackson.core:jackson-databind:2.20.0=testCompileClasspath,testRuntimeClasspath
16+
com.fasterxml.jackson:jackson-bom:2.20.0=testCompileClasspath,testRuntimeClasspath
17+
com.github.javaparser:javaparser-core:3.25.6=codenarc,testCompileClasspath,testRuntimeClasspath
18+
com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
19+
com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath
20+
com.github.jnr:jnr-constants:0.10.4=runtimeClasspath,testRuntimeClasspath
21+
com.github.jnr:jnr-enxio:0.32.17=runtimeClasspath,testRuntimeClasspath
22+
com.github.jnr:jnr-ffi:2.2.16=runtimeClasspath,testRuntimeClasspath
23+
com.github.jnr:jnr-posix:3.1.19=runtimeClasspath,testRuntimeClasspath
24+
com.github.jnr:jnr-unixsocket:0.38.22=runtimeClasspath,testRuntimeClasspath
25+
com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath
26+
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
27+
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
28+
com.github.spotbugs:spotbugs:4.7.3=spotbugs
29+
com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
30+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
31+
com.google.code.gson:gson:2.9.1=spotbugs
32+
com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
33+
com.squareup.okio:okio:1.17.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
34+
com.thoughtworks.qdox:qdox:1.12.1=codenarc,testRuntimeClasspath
35+
com.vaadin.external.google:android-json:0.0.20131108.vaadin1=testCompileClasspath,testRuntimeClasspath
36+
commons-codec:commons-codec:1.15=spotbugs
37+
commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
38+
commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
39+
de.thetaphi:forbiddenapis:3.8=compileClasspath
40+
info.picocli:picocli:4.6.3=testRuntimeClasspath
41+
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
42+
jaxen:jaxen:1.2.0=spotbugs
43+
jline:jline:2.14.6=testRuntimeClasspath
44+
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
45+
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
46+
net.bytebuddy:byte-buddy-agent:1.17.5=testCompileClasspath,testRuntimeClasspath
47+
net.bytebuddy:byte-buddy:1.17.5=testCompileClasspath,testRuntimeClasspath
48+
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
49+
net.sf.saxon:Saxon-HE:11.4=spotbugs
50+
org.apache.ant:ant-antlr:1.10.14=codenarc
51+
org.apache.ant:ant-antlr:1.10.15=testRuntimeClasspath
52+
org.apache.ant:ant-junit:1.10.14=codenarc
53+
org.apache.ant:ant-junit:1.10.15=testRuntimeClasspath
54+
org.apache.ant:ant-launcher:1.10.15=testRuntimeClasspath
55+
org.apache.ant:ant:1.10.15=testCompileClasspath,testRuntimeClasspath
56+
org.apache.bcel:bcel:6.5.0=spotbugs
57+
org.apache.commons:commons-lang3:3.12.0=spotbugs
58+
org.apache.commons:commons-text:1.10.0=spotbugs
59+
org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
60+
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
61+
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
62+
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
63+
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
64+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
65+
org.codehaus.groovy:groovy-all:3.0.24=testCompileClasspath,testRuntimeClasspath
66+
org.codehaus.groovy:groovy-ant:3.0.23=codenarc
67+
org.codehaus.groovy:groovy-ant:3.0.24=testCompileClasspath,testRuntimeClasspath
68+
org.codehaus.groovy:groovy-astbuilder:3.0.24=testCompileClasspath,testRuntimeClasspath
69+
org.codehaus.groovy:groovy-cli-picocli:3.0.24=testCompileClasspath,testRuntimeClasspath
70+
org.codehaus.groovy:groovy-console:3.0.24=testCompileClasspath,testRuntimeClasspath
71+
org.codehaus.groovy:groovy-datetime:3.0.24=testCompileClasspath,testRuntimeClasspath
72+
org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
73+
org.codehaus.groovy:groovy-docgenerator:3.0.24=testCompileClasspath,testRuntimeClasspath
74+
org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
75+
org.codehaus.groovy:groovy-groovydoc:3.0.24=testCompileClasspath,testRuntimeClasspath
76+
org.codehaus.groovy:groovy-groovysh:3.0.24=testCompileClasspath,testRuntimeClasspath
77+
org.codehaus.groovy:groovy-jmx:3.0.24=testCompileClasspath,testRuntimeClasspath
78+
org.codehaus.groovy:groovy-json:3.0.23=codenarc
79+
org.codehaus.groovy:groovy-json:3.0.24=testCompileClasspath,testRuntimeClasspath
80+
org.codehaus.groovy:groovy-jsr223:3.0.24=testCompileClasspath,testRuntimeClasspath
81+
org.codehaus.groovy:groovy-macro:3.0.24=testCompileClasspath,testRuntimeClasspath
82+
org.codehaus.groovy:groovy-nio:3.0.24=testCompileClasspath,testRuntimeClasspath
83+
org.codehaus.groovy:groovy-servlet:3.0.24=testCompileClasspath,testRuntimeClasspath
84+
org.codehaus.groovy:groovy-sql:3.0.24=testCompileClasspath,testRuntimeClasspath
85+
org.codehaus.groovy:groovy-swing:3.0.24=testCompileClasspath,testRuntimeClasspath
86+
org.codehaus.groovy:groovy-templates:3.0.23=codenarc
87+
org.codehaus.groovy:groovy-templates:3.0.24=testCompileClasspath,testRuntimeClasspath
88+
org.codehaus.groovy:groovy-test-junit5:3.0.24=testCompileClasspath,testRuntimeClasspath
89+
org.codehaus.groovy:groovy-test:3.0.24=testCompileClasspath,testRuntimeClasspath
90+
org.codehaus.groovy:groovy-testng:3.0.24=testCompileClasspath,testRuntimeClasspath
91+
org.codehaus.groovy:groovy-xml:3.0.23=codenarc
92+
org.codehaus.groovy:groovy-xml:3.0.24=testCompileClasspath,testRuntimeClasspath
93+
org.codehaus.groovy:groovy:3.0.23=codenarc
94+
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
95+
org.codenarc:CodeNarc:3.6.0=codenarc
96+
org.dom4j:dom4j:2.1.3=spotbugs
97+
org.gmetrics:GMetrics:2.1.0=codenarc
98+
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
99+
org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
100+
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
101+
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
102+
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
103+
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
104+
org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath,testRuntimeClasspath
105+
org.junit.jupiter:junit-jupiter-engine:5.12.2=testRuntimeClasspath
106+
org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath,testRuntimeClasspath
107+
org.junit.jupiter:junit-jupiter:5.12.2=testCompileClasspath,testRuntimeClasspath
108+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntimeClasspath
109+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testRuntimeClasspath
110+
org.junit.platform:junit-platform-launcher:1.12.2=testRuntimeClasspath
111+
org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath
112+
org.junit:junit-bom:5.9.1=spotbugs
113+
org.mockito:mockito-core:4.4.0=testRuntimeClasspath
114+
org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
115+
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
116+
org.ow2.asm:asm-analysis:9.2=runtimeClasspath,testRuntimeClasspath
117+
org.ow2.asm:asm-analysis:9.4=spotbugs
118+
org.ow2.asm:asm-commons:9.2=runtimeClasspath,testRuntimeClasspath
119+
org.ow2.asm:asm-commons:9.4=spotbugs
120+
org.ow2.asm:asm-commons:9.8=jacocoAnt
121+
org.ow2.asm:asm-tree:9.2=runtimeClasspath,testRuntimeClasspath
122+
org.ow2.asm:asm-tree:9.4=spotbugs
123+
org.ow2.asm:asm-tree:9.8=jacocoAnt
124+
org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
125+
org.ow2.asm:asm-util:9.4=spotbugs
126+
org.ow2.asm:asm:9.2=runtimeClasspath,testRuntimeClasspath
127+
org.ow2.asm:asm:9.4=spotbugs
128+
org.ow2.asm:asm:9.8=jacocoAnt
129+
org.skyscreamer:jsonassert:1.5.3=testCompileClasspath,testRuntimeClasspath
130+
org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
131+
org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
132+
org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
133+
org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath
134+
org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
135+
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
136+
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
137+
org.snakeyaml:snakeyaml-engine:2.9=runtimeClasspath,testRuntimeClasspath
138+
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
139+
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
140+
org.spockframework:spock-junit4:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
141+
org.testng:testng:7.5.1=testRuntimeClasspath
142+
org.webjars:jquery:3.5.1=testRuntimeClasspath
143+
org.xmlresolver:xmlresolver:4.4.3=spotbugs
144+
xml-apis:xml-apis:1.4.01=spotbugs
145+
empty=annotationProcessor,shadow,spotbugsPlugins,testAnnotationProcessor

‎dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,16 @@ org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileCla
140140
org.ow2.asm:asm-analysis:9.2=runtimeClasspath,testRuntimeClasspath
141141
org.ow2.asm:asm-analysis:9.4=spotbugs
142142
org.ow2.asm:asm-commons:9.4=spotbugs
143-
org.ow2.asm:asm-commons:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
143+
org.ow2.asm:asm-commons:9.8=jacocoAnt
144+
org.ow2.asm:asm-commons:9.9=runtimeClasspath,testRuntimeClasspath
144145
org.ow2.asm:asm-tree:9.4=spotbugs
145-
org.ow2.asm:asm-tree:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
146+
org.ow2.asm:asm-tree:9.8=jacocoAnt
147+
org.ow2.asm:asm-tree:9.9=runtimeClasspath,testRuntimeClasspath
146148
org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
147149
org.ow2.asm:asm-util:9.4=spotbugs
148150
org.ow2.asm:asm:9.4=spotbugs
149-
org.ow2.asm:asm:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
151+
org.ow2.asm:asm:9.8=jacocoAnt
152+
org.ow2.asm:asm:9.9=runtimeClasspath,testRuntimeClasspath
150153
org.pitest:pitest-command-line:1.9.11=pitest
151154
org.pitest:pitest-entry:1.9.11=pitest
152155
org.pitest:pitest:1.9.11=pitest

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,16 @@ org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileCla
140140
org.ow2.asm:asm-analysis:9.2=runtimeClasspath,testRuntimeClasspath
141141
org.ow2.asm:asm-analysis:9.4=spotbugs
142142
org.ow2.asm:asm-commons:9.4=spotbugs
143-
org.ow2.asm:asm-commons:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
143+
org.ow2.asm:asm-commons:9.8=jacocoAnt
144+
org.ow2.asm:asm-commons:9.9=runtimeClasspath,testRuntimeClasspath
144145
org.ow2.asm:asm-tree:9.4=spotbugs
145-
org.ow2.asm:asm-tree:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
146+
org.ow2.asm:asm-tree:9.8=jacocoAnt
147+
org.ow2.asm:asm-tree:9.9=runtimeClasspath,testRuntimeClasspath
146148
org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
147149
org.ow2.asm:asm-util:9.4=spotbugs
148150
org.ow2.asm:asm:9.4=spotbugs
149-
org.ow2.asm:asm:9.8=jacocoAnt,runtimeClasspath,testRuntimeClasspath
151+
org.ow2.asm:asm:9.8=jacocoAnt
152+
org.ow2.asm:asm:9.9=runtimeClasspath,testRuntimeClasspath
150153
org.pitest:pitest-command-line:1.9.11=pitest
151154
org.pitest:pitest-entry:1.9.11=pitest
152155
org.pitest:pitest:1.9.11=pitest

‎dd-java-agent/agent-ci-visibility/gradle.lockfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,16 @@ org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testFixturesApiDependencies
193193
org.ow2.asm:asm-analysis:9.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
194194
org.ow2.asm:asm-analysis:9.4=spotbugs
195195
org.ow2.asm:asm-commons:9.4=spotbugs
196-
org.ow2.asm:asm-commons:9.8=compileClasspath,implementationDependenciesMetadata,jacocoAnt,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
196+
org.ow2.asm:asm-commons:9.8=jacocoAnt,testFixturesRuntimeClasspath
197+
org.ow2.asm:asm-commons:9.9=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
197198
org.ow2.asm:asm-tree:9.4=spotbugs
198-
org.ow2.asm:asm-tree:9.8=compileClasspath,implementationDependenciesMetadata,jacocoAnt,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
199+
org.ow2.asm:asm-tree:9.8=jacocoAnt,testFixturesRuntimeClasspath
200+
org.ow2.asm:asm-tree:9.9=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
199201
org.ow2.asm:asm-util:9.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
200202
org.ow2.asm:asm-util:9.4=spotbugs
201203
org.ow2.asm:asm:9.4=spotbugs
202-
org.ow2.asm:asm:9.8=compileClasspath,implementationDependenciesMetadata,jacocoAnt,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
204+
org.ow2.asm:asm:9.8=jacocoAnt,testFixturesRuntimeClasspath
205+
org.ow2.asm:asm:9.9=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
203206
org.pitest:pitest-command-line:1.9.11=pitest
204207
org.pitest:pitest-entry:1.9.11=pitest
205208
org.pitest:pitest:1.9.11=pitest

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ dependencies {
4444
implementation libs.dogstatsd
4545
implementation libs.moshi
4646

47+
testImplementation libs.asm.util
4748
testImplementation libs.bundles.junit5
48-
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: libs.versions.asm.get()
49-
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: libs.versions.junit5.get()
50-
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
49+
testImplementation libs.junit.jupiter.params
5150
testImplementation libs.bundles.mockito
5251
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
5352
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
@@ -56,10 +55,13 @@ dependencies {
5655
testImplementation group: 'org.jooq', name: 'joor-java-8', version: '0.9.13'
5756
testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-compiler-embeddable', version: "2.1.21"
5857
testImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "1.0.0"
58+
59+
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
5960
testImplementation project(':dd-trace-core')
6061
testImplementation project(':dd-java-agent:agent-builder')
6162
testImplementation project(':remote-config:remote-config-core')
6263
testImplementation project(':utils:test-utils')
64+
6365
testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
6466
testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
6567
}

‎dd-java-agent/agent-debugger/gradle.lockfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,20 @@ org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
156156
org.ow2.asm:asm-analysis:7.1=compileClasspath
157157
org.ow2.asm:asm-analysis:9.2=runtimeClasspath
158158
org.ow2.asm:asm-analysis:9.4=spotbugs
159-
org.ow2.asm:asm-analysis:9.8=testCompileClasspath,testRuntimeClasspath
159+
org.ow2.asm:asm-analysis:9.9=testCompileClasspath,testRuntimeClasspath
160160
org.ow2.asm:asm-commons:9.4=spotbugs
161-
org.ow2.asm:asm-commons:9.8=compileClasspath,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
161+
org.ow2.asm:asm-commons:9.8=jacocoAnt
162+
org.ow2.asm:asm-commons:9.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
162163
org.ow2.asm:asm-tree:9.4=spotbugs
163-
org.ow2.asm:asm-tree:9.8=compileClasspath,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
164+
org.ow2.asm:asm-tree:9.8=jacocoAnt
165+
org.ow2.asm:asm-tree:9.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
164166
org.ow2.asm:asm-util:7.1=compileClasspath
165167
org.ow2.asm:asm-util:9.2=runtimeClasspath
166168
org.ow2.asm:asm-util:9.4=spotbugs
167-
org.ow2.asm:asm-util:9.8=testCompileClasspath,testRuntimeClasspath
169+
org.ow2.asm:asm-util:9.9=testCompileClasspath,testRuntimeClasspath
168170
org.ow2.asm:asm:9.4=spotbugs
169-
org.ow2.asm:asm:9.8=compileClasspath,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
171+
org.ow2.asm:asm:9.8=jacocoAnt
172+
org.ow2.asm:asm:9.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
170173
org.pitest:pitest-command-line:1.9.11=pitest
171174
org.pitest:pitest-entry:1.9.11=pitest
172175
org.pitest:pitest:1.9.11=pitest

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.datadog.debugger.uploader.BatchUploader;
2525
import com.datadog.debugger.util.ClassFileLines;
2626
import com.datadog.debugger.util.DebuggerMetrics;
27-
import com.datadog.debugger.util.ExceptionHelper;
2827
import datadog.environment.SystemProperties;
2928
import datadog.trace.agent.tooling.AgentStrategies;
3029
import datadog.trace.api.Config;
@@ -1009,7 +1008,7 @@ protected String getCommonSuperClass(String type1, String type2) {
10091008
}
10101009
return common.getInternalName();
10111010
} catch (Exception ex) {
1012-
ExceptionHelper.logException(LOGGER, ex, "getCommonSuperClass failed: ");
1011+
LOGGER.debug("getCommonSuperClass failed: ", ex);
10131012
return tpDatadogClassLoader.describe("java.lang.Object").resolve().getInternalName();
10141013
}
10151014
}

0 commit comments

Comments
 (0)