rebase cleanups

Author: evanchooly

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java

@@ -343,11 +343,7 @@ public static LogProbe.Builder createProbeBuilder(
   }
 
   protected TestSnapshotListener installProbes(Configuration configuration) {
-    config = Config.get();
-    setFieldInConfig(config, "debuggerEnabled", true);
-    setFieldInConfig(config, "debuggerClassFileDumpEnabled", true);
-    setFieldInConfig(config, "debuggerVerifyByteCode", false);
-    setFieldInConfig(config, "debuggerCodeOriginMaxUserFrames", 20);
+    config = getConfig();
     instrumentationListener = new MockInstrumentationListener();
     probeStatusSink = mock(ProbeStatusSink.class);
 
@@ -384,15 +380,12 @@ protected TestSnapshotListener installProbes(Configuration configuration) {
     return listener;
   }
 
-  public static Config mockConfig() {
-    Config config = mock(Config.class);
-    when(config.isDebuggerEnabled()).thenReturn(true);
-    when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true);
-    when(config.isDebuggerVerifyByteCode()).thenReturn(false);
-    when(config.getFinalDebuggerSnapshotUrl())
-        .thenReturn("http://localhost:8126/debugger/v1/input");
-    when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input");
-    when(config.getDebuggerCodeOriginMaxUserFrames()).thenReturn(20);
+  public static Config getConfig() {
+    Config config = Config.get();
+    setFieldInConfig(config, "debuggerEnabled", true);
+    setFieldInConfig(config, "debuggerClassFileDumpEnabled", true);
+    setFieldInConfig(config, "debuggerVerifyByteCode", false);
+    setFieldInConfig(config, "debuggerCodeOriginMaxUserFrames", 20);
 
     return config;
   }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java

@@ -1,6 +1,6 @@
 package com.datadog.debugger.probe;
 
-import static com.datadog.debugger.agent.CapturingTestBase.mockConfig;
+import static com.datadog.debugger.agent.CapturingTestBase.getConfig;
 import static com.datadog.debugger.util.LogProbeTestHelper.parseTemplate;
 import static java.lang.String.format;
 import static java.lang.Thread.currentThread;
@@ -80,7 +80,7 @@ public void noDebugSession() {
   }
 
   private boolean fillSnapshot(DebugSessionStatus status) {
-    DebuggerAgentHelper.injectSink(new DebuggerSink(mockConfig(), mock(ProbeStatusSink.class)));
+    DebuggerAgentHelper.injectSink(new DebuggerSink(getConfig(), mock(ProbeStatusSink.class)));
     TracerAPI tracer =
         CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build();
     AgentTracer.registerIfAbsent(tracer);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java

@@ -68,11 +68,7 @@ public void cooldown() throws IOException, URISyntaxException {
               "()",
               null,
               new Sampling(10, 10.0));
-      installProbes(
-          Configuration.builder()
-              .setService(SERVICE_NAME)
-              .add(probe1)
-              .build());
+      installProbes(Configuration.builder().setService(SERVICE_NAME).add(probe1).build());
       Class<?> testClass = compileAndLoadClass(className);
       int runs = 10000;
       for (int i = 0; i < runs; i++) {
@@ -124,11 +120,7 @@ public void sampling() throws IOException, URISyntaxException {
               "()",
               null,
               new Sampling(10.0));
-      Configuration config =
-          Configuration.builder()
-              .setService(SERVICE_NAME)
-              .add(probe1)
-              .build();
+      Configuration config = Configuration.builder().setService(SERVICE_NAME).add(probe1).build();
       installProbes(config);
       Class<?> testClass = compileAndLoadClass(className);
       for (int i = 0; i < 100; i++) {