Skip to content

Commit 5360be3

Browse files
cbeauchesnecbeauchesne
authored
Merge branch 'master' into cbeauchesne/final_status
2 parents c4e35f7 + 35cee76 commit 5360be3

File tree

29 files changed

+459
-423
lines changed

29 files changed

+459
-423
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ out/
6060

6161
# Others #
6262
##########
63+
/dumps
6364
/logs/*
6465
/bin
6566
/out

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ commons-io:commons-io:2.20.0=spotbugs
5252
de.thetaphi:forbiddenapis:3.10=compileClasspath
5353
io.github.java-diff-utils:java-diff-utils:4.12=testRuntimeClasspath
5454
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
55+
io.micrometer:micrometer-commons:1.12.0=testRuntimeClasspath
56+
io.micrometer:micrometer-observation:1.12.0=testRuntimeClasspath
5557
jakarta.annotation:jakarta.annotation-api:1.3.5=testCompileClasspath,testRuntimeClasspath
5658
jaxen:jaxen:2.0.0=spotbugs
5759
junit:junit:4.12=testCompileClasspath,testRuntimeClasspath
@@ -157,12 +159,16 @@ org.springframework.boot:spring-boot-starter-web:2.3.5.RELEASE=testCompileClassp
157159
org.springframework.boot:spring-boot-starter:2.3.5.RELEASE=testCompileClasspath,testRuntimeClasspath
158160
org.springframework.boot:spring-boot:2.3.5.RELEASE=testCompileClasspath,testRuntimeClasspath
159161
org.springframework:spring-aop:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
160-
org.springframework:spring-beans:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
162+
org.springframework:spring-beans:5.2.10.RELEASE=testCompileClasspath
163+
org.springframework:spring-beans:6.1.0=testRuntimeClasspath
161164
org.springframework:spring-context:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
162-
org.springframework:spring-core:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
165+
org.springframework:spring-core:5.2.10.RELEASE=testCompileClasspath
166+
org.springframework:spring-core:6.1.0=testRuntimeClasspath
163167
org.springframework:spring-expression:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
164-
org.springframework:spring-jcl:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
165-
org.springframework:spring-web:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
168+
org.springframework:spring-jcl:5.2.10.RELEASE=testCompileClasspath
169+
org.springframework:spring-jcl:6.1.0=testRuntimeClasspath
170+
org.springframework:spring-web:5.2.10.RELEASE=testCompileClasspath
171+
org.springframework:spring-web:6.1.0=testRuntimeClasspath
166172
org.springframework:spring-webmvc:5.2.10.RELEASE=testCompileClasspath,testRuntimeClasspath
167173
org.xmlresolver:xmlresolver:5.3.3=spotbugs
168174
org.yaml:snakeyaml:1.26=testCompileClasspath,testRuntimeClasspath

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,t
77
ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
88
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10+
com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1011
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1112
com.datadoghq:java-dogstatsd-client:4.4.3=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
1213
com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath

‎dd-java-agent/ddprof-lib/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
55
ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
66
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7-
com.datadoghq:ddprof:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7+
com.datadoghq:ddprof:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
88
com.github.javaparser:javaparser-core:3.25.6=codenarc
99
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
1010
com.github.spotbugs:spotbugs:4.9.8=spotbugs

‎dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ org.apache.bcel:bcel:6.11.0=spotbugs
6262
org.apache.commons:commons-lang3:3.19.0=spotbugs
6363
org.apache.commons:commons-text:1.14.0=spotbugs
6464
org.apache.httpcomponents.core5:httpcore5:5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
65-
org.apache.httpcomponents.core5:httpcore5:5.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
org.apache.httpcomponents.core5:httpcore5:5.4.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6666
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
6767
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
6868
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath

‎dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -156,57 +156,57 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD
156156
org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
157157
org.xmlresolver:xmlresolver:5.3.3=spotbugs
158158
software.amazon.awssdk:annotations:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
159-
software.amazon.awssdk:annotations:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
159+
software.amazon.awssdk:annotations:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
160160
software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath
161-
software.amazon.awssdk:apache-client:2.42.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
161+
software.amazon.awssdk:apache-client:2.42.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
162162
software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
163-
software.amazon.awssdk:auth:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
163+
software.amazon.awssdk:auth:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
164164
software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
165-
software.amazon.awssdk:aws-core:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
165+
software.amazon.awssdk:aws-core:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
166166
software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
167-
software.amazon.awssdk:aws-json-protocol:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
167+
software.amazon.awssdk:aws-json-protocol:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
168168
software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
169-
software.amazon.awssdk:checksums-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
169+
software.amazon.awssdk:checksums-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
170170
software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
171-
software.amazon.awssdk:checksums:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
171+
software.amazon.awssdk:checksums:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
172172
software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
173-
software.amazon.awssdk:dynamodb:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
173+
software.amazon.awssdk:dynamodb:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
174174
software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
175-
software.amazon.awssdk:endpoints-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
175+
software.amazon.awssdk:endpoints-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
176176
software.amazon.awssdk:http-auth-aws-eventstream:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
177-
software.amazon.awssdk:http-auth-aws-eventstream:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
177+
software.amazon.awssdk:http-auth-aws-eventstream:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
178178
software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
179-
software.amazon.awssdk:http-auth-aws:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
179+
software.amazon.awssdk:http-auth-aws:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
180180
software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
181-
software.amazon.awssdk:http-auth-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
181+
software.amazon.awssdk:http-auth-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
182182
software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
183-
software.amazon.awssdk:http-auth:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
183+
software.amazon.awssdk:http-auth:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
184184
software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
185-
software.amazon.awssdk:http-client-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
185+
software.amazon.awssdk:http-client-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
186186
software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
187-
software.amazon.awssdk:identity-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
187+
software.amazon.awssdk:identity-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
188188
software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
189-
software.amazon.awssdk:json-utils:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
189+
software.amazon.awssdk:json-utils:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
190190
software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
191-
software.amazon.awssdk:metrics-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
191+
software.amazon.awssdk:metrics-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
192192
software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath
193-
software.amazon.awssdk:netty-nio-client:2.42.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
193+
software.amazon.awssdk:netty-nio-client:2.42.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
194194
software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
195-
software.amazon.awssdk:profiles:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
195+
software.amazon.awssdk:profiles:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
196196
software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
197-
software.amazon.awssdk:protocol-core:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
197+
software.amazon.awssdk:protocol-core:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
198198
software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
199-
software.amazon.awssdk:regions:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
199+
software.amazon.awssdk:regions:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
200200
software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
201-
software.amazon.awssdk:retries-spi:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
201+
software.amazon.awssdk:retries-spi:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
202202
software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
203-
software.amazon.awssdk:retries:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
203+
software.amazon.awssdk:retries:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
204204
software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
205-
software.amazon.awssdk:sdk-core:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
205+
software.amazon.awssdk:sdk-core:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
206206
software.amazon.awssdk:third-party-jackson-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
207-
software.amazon.awssdk:third-party-jackson-core:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
208-
software.amazon.awssdk:utils-lite:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
207+
software.amazon.awssdk:third-party-jackson-core:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
208+
software.amazon.awssdk:utils-lite:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
209209
software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
210-
software.amazon.awssdk:utils:2.42.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
210+
software.amazon.awssdk:utils:2.42.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
211211
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
212212
empty=spotbugsPlugins

0 commit comments

Comments
 (0)