Skip to content

Support armeria grpc 1.32.3 #8606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 24, 2025
Merged

Support armeria grpc 1.32.3 #8606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b684d38
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
b47246d
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
82a408c
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
08e5812
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
04a8b1b
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
0c40782
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
b122803
chore: Update Gradle dependencies
github-actions[bot] Mar 23, 2025
a1db70d
Use java11 for axis2 latestDep
amarziali Mar 24, 2025
e4bff47
Bump JUnit 5 versions to fix a bug in the framework
nikita-tkachenko-datadog Mar 24, 2025
0356799
exclude testing class from coverage
amarziali Mar 24, 2025
f86dbb5
Support armeria grpc 1.32.3
amarziali Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/apache-httpcore-5/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
org.apache.httpcomponents.core5:httpcore5:5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
org.apache.httpcomponents.core5:httpcore5:5.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath
Expand Down
109 changes: 54 additions & 55 deletions dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions ...java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ public String[] helperClassNames() {
public void methodAdvice(MethodTransformer transformer) {
transformer.applyAdvice(
isConstructor().and(takesArgument(4, named("io.grpc.MethodDescriptor"))),
getClass().getName() + "$CaptureCall");
getClass().getName() + "$CaptureCallPos4");
// from 1.32.3
transformer.applyAdvice(
isConstructor().and(takesArgument(2, named("io.grpc.MethodDescriptor"))),
getClass().getName() + "$CaptureCallPos2");
transformer.applyAdvice(named("start").and(isMethod()), getClass().getName() + "$Start");
transformer.applyAdvice(named("cancel").and(isMethod()), getClass().getName() + "$Cancel");
transformer.applyAdvice(
Expand All @@ -100,7 +104,7 @@ public void methodAdvice(MethodTransformer transformer) {
}
}

public static final class CaptureCall {
public static final class CaptureCallPos4 {
@Advice.OnMethodExit
public static void capture(
@Advice.This ClientCall<?, ?> call, @Advice.Argument(4) MethodDescriptor<?, ?> method) {
Expand All @@ -111,6 +115,17 @@ public static void capture(
}
}

public static final class CaptureCallPos2 {
@Advice.OnMethodExit
public static void capture(
@Advice.This ClientCall<?, ?> call, @Advice.Argument(2) MethodDescriptor<?, ?> method) {
AgentSpan span = DECORATE.startCall(method);
if (null != span) {
InstrumentationContext.get(ClientCall.class, AgentSpan.class).put(call, span);
}
}
}

public static final class Start {
@Advice.OnMethodEnter
public static <T> AgentScope before(
Expand Down
85 changes: 43 additions & 42 deletions dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

234 changes: 234 additions & 0 deletions dd-java-agent/instrumentation/aws-java-dynamodb-2.0/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,83 +189,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim
org.xmlresolver:xmlresolver:4.4.3=spotbugs
software.amazon.awssdk:annotations:2.27.19=compileClasspath
software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:annotations:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:annotations:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath
software.amazon.awssdk:apache-client:2.30.31=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:apache-client:2.31.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:auth:2.27.19=compileClasspath
software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:auth:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:auth:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-core:2.27.19=compileClasspath
software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath
software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath
software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums:2.27.19=compileClasspath
software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath
software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:eventbridge:2.27.19=compileClasspath
software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:eventbridge:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:eventbridge:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth:2.27.19=compileClasspath
software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath
software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:identity-spi:2.27.19=compileClasspath
software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:identity-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:identity-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:json-utils:2.27.19=compileClasspath
software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:json-utils:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:json-utils:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath
software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.30.31=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.31.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:profiles:2.27.19=compileClasspath
software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:profiles:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:profiles:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:protocol-core:2.27.19=compileClasspath
software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:protocol-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:protocol-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:regions:2.27.19=compileClasspath
software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:regions:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:regions:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries-spi:2.27.19=compileClasspath
software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries-spi:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries-spi:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries:2.27.19=compileClasspath
software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sdk-core:2.27.19=compileClasspath
software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sdk-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sdk-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath
software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:utils:2.27.19=compileClasspath
software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:utils:2.30.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:utils:2.31.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
xml-apis:xml-apis:1.4.01=spotbugs
empty=spotbugsPlugins
Loading
Loading