Skip to content

Commit 75dd719

Browse files
jandro996jandro996
authored
Merge branch 'master' into alejandro.gonzalez/APPSEC-57044-3
2 parents fdf454f + 51813bd commit 75dd719

File tree

68 files changed

+1908
-980
lines changed

Some content is hidden

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

68 files changed

+1908
-980
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
7272
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
7373
org.apache.httpcomponents.core5:httpcore5:5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
7474
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
75-
org.apache.httpcomponents.core5:httpcore5:5.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
75+
org.apache.httpcomponents.core5:httpcore5:5.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7676
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
7777
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
7878
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath

‎dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile‎

Lines changed: 54 additions & 55 deletions
Large diffs are not rendered by default.

‎dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ public String[] helperClassNames() {
7979
public void methodAdvice(MethodTransformer transformer) {
8080
transformer.applyAdvice(
8181
isConstructor().and(takesArgument(4, named("io.grpc.MethodDescriptor"))),
82-
getClass().getName() + "$CaptureCall");
82+
getClass().getName() + "$CaptureCallPos4");
83+
// from 1.32.3
84+
transformer.applyAdvice(
85+
isConstructor().and(takesArgument(2, named("io.grpc.MethodDescriptor"))),
86+
getClass().getName() + "$CaptureCallPos2");
8387
transformer.applyAdvice(named("start").and(isMethod()), getClass().getName() + "$Start");
8488
transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
8589
transformer.applyAdvice(
@@ -100,7 +104,7 @@ public void methodAdvice(MethodTransformer transformer) {
100104
}
101105
}
102106

103-
public static final class CaptureCall {
107+
public static final class CaptureCallPos4 {
104108
@Advice.OnMethodExit
105109
public static void capture(
106110
@Advice.This ClientCall<?, ?> call, @Advice.Argument(4) MethodDescriptor<?, ?> method) {
@@ -111,6 +115,17 @@ public static void capture(
111115
}
112116
}
113117

118+
public static final class CaptureCallPos2 {
119+
@Advice.OnMethodExit
120+
public static void capture(
121+
@Advice.This ClientCall<?, ?> call, @Advice.Argument(2) MethodDescriptor<?, ?> method) {
122+
AgentSpan span = DECORATE.startCall(method);
123+
if (null != span) {
124+
InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
125+
}
126+
}
127+
}
128+
114129
public static final class Start {
115130
@Advice.OnMethodEnter
116131
public static <T> AgentScope before(

‎dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile‎

Lines changed: 43 additions & 42 deletions
Large diffs are not rendered by default.

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

Lines changed: 234 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -189,83 +189,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim
189189
org.xmlresolver:xmlresolver:4.4.3=spotbugs
190190
software.amazon.awssdk:annotations:2.27.19=compileClasspath
191191
software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath
192-
software.amazon.awssdk:annotations:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
192+
software.amazon.awssdk:annotations:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
193193
software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath
194-
software.amazon.awssdk:apache-client:2.30.31=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
194+
software.amazon.awssdk:apache-client:2.31.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
195195
software.amazon.awssdk:auth:2.27.19=compileClasspath
196196
software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath
197-
software.amazon.awssdk:auth:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
197+
software.amazon.awssdk:auth:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
198198
software.amazon.awssdk:aws-core:2.27.19=compileClasspath
199199
software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath
200-
software.amazon.awssdk:aws-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
200+
software.amazon.awssdk:aws-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
201201
software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath
202202
software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath
203-
software.amazon.awssdk:aws-json-protocol:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
203+
software.amazon.awssdk:aws-json-protocol:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
204204
software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
205205
software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath
206206
software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
207-
software.amazon.awssdk:checksums-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
207+
software.amazon.awssdk:checksums-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
208208
software.amazon.awssdk:checksums:2.27.19=compileClasspath
209209
software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath
210-
software.amazon.awssdk:checksums:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
210+
software.amazon.awssdk:checksums:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
211211
software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath
212212
software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
213-
software.amazon.awssdk:endpoints-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
213+
software.amazon.awssdk:endpoints-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
214214
software.amazon.awssdk:eventbridge:2.27.19=compileClasspath
215215
software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath
216-
software.amazon.awssdk:eventbridge:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
216+
software.amazon.awssdk:eventbridge:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
217217
software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath
218218
software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath
219-
software.amazon.awssdk:http-auth-aws-eventstream:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
219+
software.amazon.awssdk:http-auth-aws-eventstream:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
220220
software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath
221221
software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath
222-
software.amazon.awssdk:http-auth-aws:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
222+
software.amazon.awssdk:http-auth-aws:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
223223
software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath
224224
software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
225-
software.amazon.awssdk:http-auth-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
225+
software.amazon.awssdk:http-auth-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
226226
software.amazon.awssdk:http-auth:2.27.19=compileClasspath
227227
software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath
228-
software.amazon.awssdk:http-auth:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
228+
software.amazon.awssdk:http-auth:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
229229
software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath
230230
software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
231-
software.amazon.awssdk:http-client-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
231+
software.amazon.awssdk:http-client-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
232232
software.amazon.awssdk:identity-spi:2.27.19=compileClasspath
233233
software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
234-
software.amazon.awssdk:identity-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
234+
software.amazon.awssdk:identity-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
235235
software.amazon.awssdk:json-utils:2.27.19=compileClasspath
236236
software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath
237-
software.amazon.awssdk:json-utils:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
237+
software.amazon.awssdk:json-utils:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
238238
software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath
239239
software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
240-
software.amazon.awssdk:metrics-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
240+
software.amazon.awssdk:metrics-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
241241
software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath
242-
software.amazon.awssdk:netty-nio-client:2.30.31=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
242+
software.amazon.awssdk:netty-nio-client:2.31.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
243243
software.amazon.awssdk:profiles:2.27.19=compileClasspath
244244
software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath
245-
software.amazon.awssdk:profiles:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
245+
software.amazon.awssdk:profiles:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
246246
software.amazon.awssdk:protocol-core:2.27.19=compileClasspath
247247
software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath
248-
software.amazon.awssdk:protocol-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
248+
software.amazon.awssdk:protocol-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
249249
software.amazon.awssdk:regions:2.27.19=compileClasspath
250250
software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath
251-
software.amazon.awssdk:regions:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
251+
software.amazon.awssdk:regions:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
252252
software.amazon.awssdk:retries-spi:2.27.19=compileClasspath
253253
software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
254-
software.amazon.awssdk:retries-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
254+
software.amazon.awssdk:retries-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
255255
software.amazon.awssdk:retries:2.27.19=compileClasspath
256256
software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath
257-
software.amazon.awssdk:retries:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
257+
software.amazon.awssdk:retries:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
258258
software.amazon.awssdk:sdk-core:2.27.19=compileClasspath
259259
software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath
260-
software.amazon.awssdk:sdk-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
260+
software.amazon.awssdk:sdk-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
261261
software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
262262
software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
263263
software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath
264264
software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath
265-
software.amazon.awssdk:third-party-jackson-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
265+
software.amazon.awssdk:third-party-jackson-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
266266
software.amazon.awssdk:utils:2.27.19=compileClasspath
267267
software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath
268-
software.amazon.awssdk:utils:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
268+
software.amazon.awssdk:utils:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
269269
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
270270
xml-apis:xml-apis:1.4.01=spotbugs
271271
empty=spotbugsPlugins

0 commit comments

Comments
 (0)