wrap advice in a try/catch

evanchooly · evanchooly · commit 3276467f1e15 · 2024-11-27T10:35:14.000-05:00
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java
@@ -50,16 +50,20 @@ public static class BuildAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
-      Class<?> serviceClass = serviceImpl.getClass();
-      Class<?> superclass = serviceClass.getSuperclass();
-      if (superclass != null) {
-        for (Method method : superclass.getDeclaredMethods()) {
-          try {
-            entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
-          } catch (Throwable e) {
-            // service method not overridden on the impl.  skipping instrumentation.
+      try {
+        Class<?> serviceClass = serviceImpl.getClass();
+        Class<?> superclass = serviceClass.getSuperclass();
+        if (superclass != null) {
+          for (Method method : superclass.getDeclaredMethods()) {
+            try {
+              entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
+            } catch (Throwable e) {
+              // service method not overridden on the impl.  skipping instrumentation.
+            }
           }
         }
+      } catch (Throwable e) {
+        // this should be logged somehow
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -50,16 +50,20 @@ public static class BuildAdvice {`
`50`	`50`
`51`	`51`	`@Advice.OnMethodEnter(suppress = Throwable.class)`
`52`	`52`	`public static void onEnter(@Advice.Argument(0) Object serviceImpl) {`
`53`		`- Class<?> serviceClass = serviceImpl.getClass();`
`54`		`- Class<?> superclass = serviceClass.getSuperclass();`
`55`		`- if (superclass != null) {`
`56`		`- for (Method method : superclass.getDeclaredMethods()) {`
`57`		`- try {`
`58`		`- entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));`
`59`		`- } catch (Throwable e) {`
`60`		`- // service method not overridden on the impl. skipping instrumentation.`
	`53`	`+ try {`
	`54`	`+ Class<?> serviceClass = serviceImpl.getClass();`
	`55`	`+ Class<?> superclass = serviceClass.getSuperclass();`
	`56`	`+ if (superclass != null) {`
	`57`	`+ for (Method method : superclass.getDeclaredMethods()) {`
	`58`	`+ try {`
	`59`	`+ entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));`
	`60`	`+ } catch (Throwable e) {`
	`61`	`+ // service method not overridden on the impl. skipping instrumentation.`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`	`}`
	`65`	`+ } catch (Throwable e) {`
	`66`	`+ // this should be logged somehow`
`63`	`67`	`}`
`64`	`68`	`}`
`65`	`69`	`}`