Skip to content

Look in another location for grpc service methods #8468

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
evanchooly merged 3 commits into from
Feb 28, 2025
Merged

Look in another location for grpc service methods #8468

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c43f93c
if the service aren't found on the ImplBase, look for an AsyncService…
evanchooly Feb 27, 2025
3911b6d
inline the method. I should have known better. :)
evanchooly Feb 27, 2025
c0f1a8f
remove the lambda
evanchooly Feb 28, 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
25 changes: 22 additions & 3 deletions ...rc/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.Platform;
import java.lang.reflect.Method;
import java.util.Arrays;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
Expand Down Expand Up @@ -52,9 +53,19 @@ public static class BuildAdvice {
public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
try {
Class<?> serviceClass = serviceImpl.getClass();
Class<?> superclass = serviceClass.getSuperclass();
if (superclass != null) {
for (Method method : superclass.getDeclaredMethods()) {
Class<?> superClass = findImplBase(serviceClass);
if (superClass != null) {
Method[] declaredMethods = superClass.getDeclaredMethods();
// bindService() would be the only method in this case and it's irrelevant
if (declaredMethods.length == 1) {
declaredMethods =
Arrays.stream(serviceClass.getInterfaces())
.filter(i -> i.getSimpleName().equals("AsyncService"))
.findFirst()
.orElse(superClass)
.getDeclaredMethods();
}
for (Method method : declaredMethods) {
try {
entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
} catch (Throwable e) {
Expand All @@ -66,5 +77,13 @@ public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
// this should be logged somehow
}
}

public static Class<?> findImplBase(Class<?> serviceClass) {
Class<?> superclass = serviceClass.getSuperclass();
while (superclass != null && !superclass.getSimpleName().endsWith("ImplBase")) {
superclass = superclass.getSuperclass();
}
return superclass;
}
}
}