PR clean ups

Author: evanchooly

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/SpanOriginInfo.java

@@ -10,9 +10,7 @@
 
 public class SpanOriginInfo {
   public static void entry(AgentSpan span, Method method) {
-    if (InstrumenterConfig.get().isSpanOriginEnabled()
-        // i hate this too but need it for testing
-        || "true".equals(System.getProperty("dd.trace.span.origin.enabled"))) {
+    if (InstrumenterConfig.get().isSpanOriginEnabled()) {
       String signature =
           stream(method.getParameterTypes())
               .map(Class::getName)
@@ -22,9 +20,7 @@ public static void entry(AgentSpan span, Method method) {
   }
 
   public static void exit(AgentSpan span) {
-    if (InstrumenterConfig.get().isSpanOriginEnabled()
-        // i hate this too but need it for testing
-        || "true".equals(System.getProperty("dd.trace.span.origin.enabled"))) {
+    if (InstrumenterConfig.get().isSpanOriginEnabled()) {
       span.getLocalRootSpan().setMetaStruct(captureSnapshot(null), span);
     }
   }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/Fingerprinter.java

@@ -4,30 +4,33 @@
 
 import com.datadog.debugger.util.ClassNameFiltering;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Computes a fingerprint of an exception based on its stacktrace and exception type. */
 public class Fingerprinter {
   private static final Logger LOGGER = LoggerFactory.getLogger(Fingerprinter.class);
+  private static MessageDigest digest;
+
+  static {
+    try {
+      digest = MessageDigest.getInstance("SHA-256");
+    } catch (Throwable e) {
+      LOGGER.debug("Unable to find digest algorithm SHA-256", e);
+    }
+  }
 
   // compute fingerprint of the Throwable based on the stacktrace and exception type
   public static String fingerprint(Throwable t, ClassNameFiltering classNameFiltering) {
+    if (digest == null) {
+      return null;
+    }
     t = getInnerMostThrowable(t);
     if (t == null) {
       LOGGER.debug("Unable to find root cause of exception");
       return null;
     }
     Class<? extends Throwable> clazz = t.getClass();
-    MessageDigest digest;
-    try {
-      // TODO avoid lookup a new instance every time
-      digest = MessageDigest.getInstance("SHA-256");
-    } catch (NoSuchAlgorithmException e) {
-      LOGGER.debug("Unable to find digest algorithm SHA-256", e);
-      return null;
-    }
     String typeName = clazz.getTypeName();
     digest.update(typeName.getBytes());
     StackTraceElement[] stackTrace = t.getStackTrace();
@@ -38,19 +41,15 @@ public static String fingerprint(Throwable t, ClassNameFiltering classNameFilter
       }
       digest.update(stackTraceElement.toString().getBytes());
     }
-    byte[] bytes = digest.digest();
-    return bytesToHex(bytes);
+    return bytesToHex(digest.digest());
   }
 
   public static String fingerprint(StackTraceElement element) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      digest.update(element.toString().getBytes());
-      return bytesToHex(digest.digest());
-    } catch (NoSuchAlgorithmException e) {
-      LOGGER.debug("Unable to find digest algorithm SHA-256", e);
+    if (digest == null) {
       return null;
     }
+    digest.update(element.toString().getBytes());
+    return bytesToHex(digest.digest());
   }
 
   // convert byte[] to hex string

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/code_origin/SpanDebuggerTest.java

@@ -28,15 +28,14 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI;
 import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
 import datadog.trace.core.CoreTracer;
+import datadog.trace.test.util.DDSpecification;
 import datadog.trace.util.AgentTaskScheduler;
 import java.util.Arrays;
 import java.util.HashSet;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class SpanDebuggerTest {
+public class SpanDebuggerTest extends DDSpecification {
   private ClassNameFiltering classNameFiltering;
 
   private ConfigurationUpdater configurationUpdater;
@@ -48,18 +47,9 @@ public class SpanDebuggerTest {
   private DefaultSpanDebugger spanDebugger;
   private TracerAPI tracerAPI;
 
-  @BeforeAll
-  public static void enableCodeOrigin() {
-    System.setProperty("dd.trace.span.origin.enabled", "true");
-  }
-
-  @AfterAll
-  public static void disableCodeOrigin() {
-    System.setProperty("dd.trace.span.origin.enabled", "false");
-  }
-
   @BeforeEach
   public void setUp() {
+    injectSysConfig("dd.trace.span.origin.enabled", "true");
     AgentTracer.registerIfAbsent(CoreTracer.builder().build());
     tracerAPI = AgentTracer.get();
     configurationUpdater = mock(ConfigurationUpdater.class);

dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java

@@ -138,7 +138,7 @@ public PTags(
         int samplingPriority,
         CharSequence origin,
         CharSequence lastParentId) {
-      assert tagPairs == null || tagPairs.size() % DEBUG_PROPAGATION_DEFAULT == 0;
+      assert tagPairs == null || tagPairs.size() % 2 == 0;
       this.factory = factory;
       this.tagPairs = tagPairs;
       this.canChangeDecisionMaker = decisionMakerTagValue == null;