more logs

Author: aboitreaud

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleCheck.java

@@ -31,8 +31,32 @@ public boolean matches(ClassLoader classLoader) {
     boolean muzzleMatches = muzzle().matches(classLoader);
     if (muzzleMatches) {
       InstrumenterState.applyInstrumentation(classLoader, instrumentationId);
+      if (instrumentationClass.contains("spark") || instrumentationClass.contains("Spark")) {
+        System.err.println(
+            "[DD-SPARK-DEBUG] MuzzleCheck PASSED: "
+                + InstrumenterState.describe(instrumentationId)
+                + " classloader="
+                + classLoader);
+      }
     } else {
       InstrumenterState.blockInstrumentation(classLoader, instrumentationId);
+      if (instrumentationClass.contains("spark") || instrumentationClass.contains("Spark")) {
+        final List<Reference.Mismatch> mismatches =
+            muzzle.getMismatchedReferenceSources(classLoader);
+        System.err.println(
+            "[DD-SPARK-DEBUG] MuzzleCheck FAILED: "
+                + InstrumenterState.describe(instrumentationId)
+                + " classloader="
+                + classLoader);
+        for (final Reference.Mismatch mismatch : mismatches) {
+          System.err.println(
+              "[DD-SPARK-DEBUG] MuzzleCheck mismatch: "
+                  + InstrumenterState.describe(instrumentationId)
+                  + " muzzle.mismatch=\""
+                  + mismatch
+                  + "\"");
+        }
+      }
       if (log.isDebugEnabled()) {
         final List<Reference.Mismatch> mismatches =
             muzzle.getMismatchedReferenceSources(classLoader);

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java

@@ -163,6 +163,19 @@ public static void enter(@Advice.Argument(1) int exitCode, @Advice.Argument(2) S
   }
 
   public static class SparkSqlFailureAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void enter(@Advice.Argument(0) String sqlText) {
+      System.err.println(
+          "[DD-SPARK-DEBUG] SparkSqlFailureAdvice.enter: thread="
+              + Thread.currentThread().getName()
+              + ", sql="
+              + (sqlText != null && sqlText.length() > 200
+                  ? sqlText.substring(0, 200) + "..."
+                  : sqlText)
+              + ", listenerNull="
+              + (AbstractDatadogSparkListener.listener == null));
+    }
+
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
     public static void exit(@Advice.Thrown Throwable throwable) {
       if (throwable != null) {
@@ -181,6 +194,11 @@ public static void exit(@Advice.Thrown Throwable throwable) {
           System.err.println(
               "[DD-SPARK-DEBUG] SparkSqlFailureAdvice.exit: listener is null, cannot record SQL failure");
         }
+      } else {
+        System.err.println(
+            "[DD-SPARK-DEBUG] SparkSqlFailureAdvice.exit: thread="
+                + Thread.currentThread().getName()
+                + ", success (no throwable)");
       }
     }
   }