Do not ignore caught exceptions in CI Visibility code (#6671)

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/CILocalGitInfoBuilder.java

@@ -44,7 +44,8 @@ private Path getGitPath(String repositoryPath) {
         }
       }
     } catch (Exception e) {
-      LOGGER.debug("Error while getting Git folder in " + repositoryPath, e);
+      LOGGER.debug("Error while getting Git folder in {}", repositoryPath, e);
+      LOGGER.warn("Error while getting Git folder");
     }
     return Paths.get(repositoryPath, gitFolderName);
   }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitClientGitInfoBuilder.java

@@ -54,7 +54,8 @@ public GitInfo build(@Nullable String repositoryPath) {
       return new GitInfo(remoteUrl, branch, tag, commitInfo);
 
     } catch (Exception e) {
-      LOGGER.debug("Error while getting Git data from " + repositoryPath, e);
+      LOGGER.debug("Error while getting Git data from {}", repositoryPath, e);
+      LOGGER.warn("Error while getting Git data by executing shell commands");
       return GitInfo.NOOP;
     }
   }

dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java

@@ -19,9 +19,13 @@
 import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.ParentRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class JUnit4Utils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(JUnit4Utils.class);
+
   private static final String SYNCHRONIZED_LISTENER =
       "org.junit.runner.notification.SynchronizedRunListener";
 
@@ -127,6 +131,8 @@ public static Method getTestMethod(final Description description) {
     try {
       return testClass.getMethod(methodName);
     } catch (NoSuchMethodException e) {
+      LOGGER.debug("Could not get method named {} in class {}", methodName, testClass, e);
+      LOGGER.warn("Could not get test method", e);
       return null;
     }
   }

dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java

@@ -13,12 +13,16 @@
 import org.junit.platform.engine.TestTag;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.spockframework.runtime.SpockNode;
 import org.spockframework.runtime.model.FeatureMetadata;
 import org.spockframework.runtime.model.SpecElementInfo;
 
 public class SpockUtils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(SpockUtils.class);
+
   private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
       new datadog.trace.util.MethodHandles(ClassLoaderUtils.getDefaultClassLoader());
 
@@ -50,7 +54,7 @@ public static Collection<TestTag> getTags(SpockNode<?> spockNode) {
       return junitPlatformTestTags;
 
     } catch (Throwable throwable) {
-      // ignore
+      LOGGER.warn("Could not get tags from a spock node", throwable);
       return Collections.emptyList();
     }
   }
@@ -79,7 +83,7 @@ public static Method getTestMethod(MethodSource methodSource) {
       }
 
     } catch (Throwable e) {
-      // ignore
+      LOGGER.warn("Could not get test method from method source", e);
     }
     return null;
   }

dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java

@@ -18,6 +18,8 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * !!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!! Do not use or refer to any classes from {@code
@@ -28,6 +30,8 @@
  */
 public abstract class JUnitPlatformUtils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(JUnitPlatformUtils.class);
+
   private JUnitPlatformUtils() {}
 
   private static final MethodHandles METHOD_HANDLES =
@@ -72,6 +76,8 @@ public static Method getTestMethod(MethodSource methodSource) {
               testClass, methodName, methodSource.getMethodParameterTypes())
           .orElse(null);
     } catch (JUnitException e) {
+      LOGGER.debug("Could not find method {} in class {}", methodName, testClass, e);
+      LOGGER.warn("Could not find test method");
       return null;
     }
   }

dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java

@@ -246,6 +246,8 @@ private String getEffectiveJvm(Mojo mojo) {
       }
 
     } catch (Exception e) {
+      LOGGER.debug("Error while getting effective JVM for mojo {}", mojo, e);
+      LOGGER.warn("Error while getting effective JVM");
       return null;
     }
   }

dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java

@@ -48,11 +48,8 @@ public static Class<?> getClass(Option<String> className) {
       return CLASS_LOADER.loadClass(className.get());
     } catch (Exception e) {
       log.debug("Could not load class {}", className, e);
+      log.warn("Could not load a Scalatest class");
       return null;
     }
   }
-
-  public static void test(Object invokeWithFixture) {
-    System.out.println("tdest"); // FIXME remove - scala.Function1
-  }
 }

dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java

@@ -11,6 +11,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testng.IClass;
 import org.testng.ITestClass;
 import org.testng.ITestContext;
@@ -25,6 +27,8 @@
 
 public abstract class TestNGUtils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(TestNGUtils.class);
+
   private static final datadog.trace.util.MethodHandles METHOD_HANDLES =
       new datadog.trace.util.MethodHandles(TestNG.class.getClassLoader());
 
@@ -161,6 +165,7 @@ public static boolean isParallelized(ITestClass testClass) {
       return parallel != null
           && ("methods".equals(parallel.toString()) || "tests".equals(parallel.toString()));
     } catch (Throwable e) {
+      LOGGER.warn("Error while checking if a test class is paralellized");
       return false;
     }
   }