PR clean up

Author: evanchooly

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java

@@ -86,7 +86,6 @@ public String captureCodeOrigin(Method method, boolean entry) {
       probe = createProbe(fingerprint, entry, Where.of(method));
       LOG.debug("Creating probe for method {}", fingerprint);
     }
-
     return probe.getId();
   }
 

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java

@@ -61,6 +61,7 @@ public String getTypeName() {
 
   @Override
   public String toString() {
-    return "MethodInfo{" + "classNode=" + classNode.name + ", methodNode=" + methodNode.desc + '}';
+    return String.format(
+        "MethodInfo{classNode=%s, methodNode=%s}", classNode.name, methodNode.desc);
   }
 }

dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy

@@ -66,7 +66,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
     super.configurePreAgent()
 
     injectSysConfig("dd.kafka.e2e.duration.enabled", "true")
-    //    codeOriginSetup()
   }
 
   public static final LinkedHashMap<String, String> PRODUCER_PATHWAY_EDGE_TAGS
@@ -228,12 +227,10 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
     int produceTraceIdx = nTraces - 1
     TEST_WRITER.waitForTraces(nTraces)
     def traces = (Arrays.asList(TEST_WRITER.toArray()) as List<List<DDSpan>>)
-    //    println("###########  traces = " + traces)
     Collections.sort(traces, new SortKafkaTraces())
     assertTraces(nTraces, new SortKafkaTraces()) {
       if (hasQueueSpan()) {
         trace(2) {
-          //          println("@@@@@@@@@@ span = " + span(1))
           consumerSpan(it, consumerProperties, span(1))
           queueSpan(it, trace(produceTraceIdx)[2])
         }

dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaCodeOriginForkedTest.groovy

@@ -43,8 +43,6 @@ class KafkaCodeOriginForkedTest extends VersionedNamingTestBase {
     codeOriginSetup()
   }
 
-  public static final LinkedHashMap<String, String> PRODUCER_PATHWAY_EDGE_TAGS
-
   // filter out Kafka poll, since the function is called in a loop, giving inconsistent results
   final ListWriter.Filter dropKafkaPoll = new ListWriter.Filter() {
     @Override
@@ -84,13 +82,6 @@ class KafkaCodeOriginForkedTest extends VersionedNamingTestBase {
     }
   }
 
-  static {
-    PRODUCER_PATHWAY_EDGE_TAGS = new LinkedHashMap<>(3)
-    PRODUCER_PATHWAY_EDGE_TAGS.put("direction", "out")
-    PRODUCER_PATHWAY_EDGE_TAGS.put("topic", SHARED_TOPIC)
-    PRODUCER_PATHWAY_EDGE_TAGS.put("type", "kafka")
-  }
-
   def setup() {
     TEST_WRITER.setFilter(dropKafkaPoll)
   }