Rename debugger config to dynamic instrumentation (#8332)

* Rename debugger config to dynamic instrumentation

Originally the config parameter was debuggerXXX. when the product was
rolled out we use the term dynamic instrumentation. Now that we will
introduce the live debugger in itself, it's confusing to keep debugger
everywhere.
First step is to rename dynamic instrumentation config tokens to
reflect the fact that they are belonging to Dynamic Instrumentation
part of the product

* missed one

Author: jpbempel

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -100,7 +100,8 @@ private enum AgentFeature {
         propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED), false),
     USM(propertyNameToSystemPropertyName(UsmConfig.USM_ENABLED), false),
     TELEMETRY(propertyNameToSystemPropertyName(GeneralConfig.TELEMETRY_ENABLED), true),
-    DEBUGGER(propertyNameToSystemPropertyName(DebuggerConfig.DEBUGGER_ENABLED), false),
+    DEBUGGER(
+        propertyNameToSystemPropertyName(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED), false),
     EXCEPTION_DEBUGGING(
         propertyNameToSystemPropertyName(DebuggerConfig.EXCEPTION_REPLAY_ENABLED), false),
     SPAN_ORIGIN(

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

@@ -307,7 +307,8 @@ public static void evalContext(
       // only freeze the context when we have at lest one snapshot probe, and we should send
       // snapshot
       if (needFreeze) {
-        Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
+        Duration timeout =
+            Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS);
         context.freeze(new TimeoutChecker(timeout));
       }
     } catch (Exception ex) {

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java

@@ -117,11 +117,11 @@ static void initKeywords() {
      * based on sentry list: https://github.com/getsentry/sentry-python/blob/fefb454287b771ac31db4e30fa459d9be2f977b8/sentry_sdk/scrubber.py#L17-L58
      */
     KEYWORDS.addAll(PREDEFINED_KEYWORDS);
-    KEYWORDS.removeAll(Config.get().getDebuggerRedactionExcludedIdentifiers());
+    KEYWORDS.removeAll(Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers());
   }
 
   public static void addUserDefinedKeywords(Config config) {
-    String redactedIdentifiers = config.getDebuggerRedactedIdentifiers();
+    String redactedIdentifiers = config.getDynamicInstrumentationRedactedIdentifiers();
     if (redactedIdentifiers == null) {
       return;
     }
@@ -132,7 +132,7 @@ public static void addUserDefinedKeywords(Config config) {
   }
 
   public static void addUserDefinedTypes(Config config) {
-    String redactedTypes = config.getDebuggerRedactedTypes();
+    String redactedTypes = config.getDynamicInstrumentationRedactedTypes();
     if (redactedTypes == null) {
       return;
     }

dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java

@@ -28,7 +28,7 @@ public void basic() {
   @Test
   public void userDefinedKeywords() {
     Config config = Config.get();
-    setFieldInConfig(config, "debuggerRedactedIdentifiers", "_MotDePasse,$Passwort");
+    setFieldInConfig(config, "dynamicInstrumentationRedactedIdentifiers", "_MotDePasse,$Passwort");
     try {
       Redaction.addUserDefinedKeywords(config);
       assertTrue(Redaction.isRedactedKeyword("mot-de-passe"));
@@ -41,7 +41,8 @@ public void userDefinedKeywords() {
   @Test
   public void userDefinedTypes() {
     Config config = Config.get();
-    setFieldInConfig(config, "debuggerRedactedTypes", "java.security.Security,javax.security.*");
+    setFieldInConfig(
+        config, "dynamicInstrumentationRedactedTypes", "java.security.Security,javax.security.*");
     try {
       Redaction.addUserDefinedTypes(Config.get());
       assertTrue(Redaction.isRedactedType("java.security.Security"));
@@ -55,12 +56,15 @@ public void userDefinedTypes() {
   public void exclusions() {
     Config config = Config.get();
     setFieldInConfig(
-        config, "debuggerRedactionExcludedIdentifiers", new HashSet<>(Arrays.asList("password")));
+        config,
+        "dynamicInstrumentationRedactionExcludedIdentifiers",
+        new HashSet<>(Arrays.asList("password")));
     Redaction.initKeywords();
     try {
       assertFalse(Redaction.isRedactedKeyword("password"));
     } finally {
-      setFieldInConfig(config, "debuggerRedactionExcludedIdentifiers", Collections.emptySet());
+      setFieldInConfig(
+          config, "dynamicInstrumentationRedactionExcludedIdentifiers", Collections.emptySet());
       Redaction.initKeywords();
     }
   }

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java

@@ -86,7 +86,7 @@ void redactedType() {
     Config config = Config.get();
     setFieldInConfig(
         config,
-        "debuggerRedactedTypes",
+        "dynamicInstrumentationRedactedTypes",
         "com.datadog.debugger.el.expressions.GetMemberExpressionTest*");
     try {
       Redaction.addUserDefinedTypes(Config.get());

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java

@@ -110,7 +110,7 @@ void redactedType() {
     Config config = Config.get();
     setFieldInConfig(
         config,
-        "debuggerRedactedTypes",
+        "dynamicInstrumentationRedactedTypes",
         "com.datadog.debugger.el.expressions.IndexExpressionTest*");
     try {
       Redaction.addUserDefinedTypes(Config.get());

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java

@@ -125,7 +125,8 @@ public void redacted() {
   @Test
   public void redactedType() {
     Config config = Config.get();
-    setFieldInConfig(config, "debuggerRedactedTypes", "com.datadog.debugger.el.expressions.*");
+    setFieldInConfig(
+        config, "dynamicInstrumentationRedactedTypes", "com.datadog.debugger.el.expressions.*");
     try {
       Redaction.addUserDefinedTypes(Config.get());
       ValueRefExpression valueRef = new ValueRefExpression("store");

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java

@@ -103,12 +103,12 @@ public static synchronized void run(
       LOGGER.info("Starting Code Origin for spans");
       DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater));
     }
-    if (config.isDebuggerInstrumentTheWorld()) {
+    if (config.isDynamicInstrumentationInstrumentTheWorld()) {
       setupInstrumentTheWorldTransformer(
           config, instrumentation, debuggerSink, statsdMetricForwarder);
     }
     // Dynamic Instrumentation
-    if (config.isDebuggerEnabled()) {
+    if (config.isDynamicInstrumentationEnabled()) {
       startDynamicInstrumentation(
           instrumentation, sco, config, configurationUpdater, debuggerSink, classNameFilter);
     }
@@ -137,10 +137,11 @@ private static void startDynamicInstrumentation(
       DebuggerSink debuggerSink,
       ClassNameFilter classNameFilter) {
     LOGGER.info("Starting Dynamic Instrumentation");
-    String probeFileLocation = config.getDebuggerProbeFileLocation();
+    String probeFileLocation = config.getDynamicInstrumentationProbeFile();
     if (probeFileLocation != null) {
       Path probeFilePath = Paths.get(probeFileLocation);
-      loadFromFile(probeFilePath, configurationUpdater, config.getDebuggerMaxPayloadSize());
+      loadFromFile(
+          probeFilePath, configurationUpdater, config.getDynamicInstrumentationMaxPayloadSize());
       return;
     }
     configurationPoller = sco.configurationPoller(config);

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

@@ -119,7 +119,7 @@ public DebuggerTransformer(
     this.denyListHelper = new DenyListHelper(configuration.getDenyList());
     this.listener = listener;
     this.debuggerSink = debuggerSink;
-    this.instrumentTheWorld = config.isDebuggerInstrumentTheWorld();
+    this.instrumentTheWorld = config.isDynamicInstrumentationInstrumentTheWorld();
     if (this.instrumentTheWorld) {
       instrumentTheWorldProbes = new ConcurrentHashMap<>();
       excludeTrie = new Trie();
@@ -129,9 +129,15 @@ public DebuggerTransformer(
       includeClasses = new HashSet<>();
       includeMethods = new HashSet<>();
       processITWFiles(
-          config.getDebuggerExcludeFiles(), excludeTrie, excludeClasses, excludeMethods);
+          config.getDynamicInstrumentationExcludeFiles(),
+          excludeTrie,
+          excludeClasses,
+          excludeMethods);
       processITWFiles(
-          config.getDebuggerIncludeFiles(), includeTrie, includeClasses, includeMethods);
+          config.getDynamicInstrumentationIncludeFiles(),
+          includeTrie,
+          includeClasses,
+          includeMethods);
     } else {
       instrumentTheWorldProbes = null;
       excludeTrie = null;
@@ -445,7 +451,7 @@ private byte[] writeClassFile(
   }
 
   private void verifyByteCode(String classFilePath, byte[] classFile) {
-    if (!config.isDebuggerVerifyByteCode()) {
+    if (!config.isDynamicInstrumentationVerifyByteCode()) {
       return;
     }
     StringWriter stringWriter = new StringWriter();
@@ -831,7 +837,7 @@ private MethodNode matchSourceFile(
   }
 
   private void dumpInstrumentedClassFile(String className, byte[] data) {
-    if (config.isDebuggerClassFileDumpEnabled()) {
+    if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
       log.debug("Generated bytecode len: {}", data.length);
       Path classFilePath = dumpClassFile(className, data);
       if (classFilePath != null) {
@@ -841,7 +847,7 @@ private void dumpInstrumentedClassFile(String className, byte[] data) {
   }
 
   private void dumpOriginalClassFile(String className, byte[] classfileBuffer) {
-    if (config.isDebuggerClassFileDumpEnabled()) {
+    if (config.isDynamicInstrumentationClassFileDumpEnabled()) {
       Path classFilePath = dumpClassFile(className + "_orig", classfileBuffer);
       if (classFilePath != null) {
         log.debug("Original class saved as: {}", classFilePath.toString());

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

@@ -115,7 +115,7 @@ private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where whe
 
     // i think this check is unnecessary at this point time but leaving for now to be safe
     if (installed == null) {
-      if (Config.get().isDebuggerEnabled()) {
+      if (Config.get().isDynamicInstrumentationEnabled()) {
         registerLogProbe(probe);
       }
       installProbes();

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

@@ -415,7 +415,8 @@ private void instrumentMethodEnter() {
       throwableListVar = declareThrowableList(insnList);
     }
     unscopedLocalVars = Collections.emptyList();
-    if (Config.get().isDebuggerHoistLocalVarsEnabled() && language == JvmLanguage.JAVA) {
+    if (Config.get().isDynamicInstrumentationHoistLocalVarsEnabled()
+        && language == JvmLanguage.JAVA) {
       // for now, only hoist local vars for Java
       unscopedLocalVars = initAndHoistLocalVars(insnList);
     }
@@ -909,14 +910,15 @@ private void collectLocalVariables(AbstractInsnNode location, InsnList insnList)
     }
 
     if (methodNode.localVariables == null || methodNode.localVariables.isEmpty()) {
-      if (!Config.get().isDebuggerInstrumentTheWorld()) {
+      if (!Config.get().isDynamicInstrumentationInstrumentTheWorld()) {
         reportWarning("Missing local variable debug info");
       }
       // no local variables info - bail out
       return;
     }
     Collection<LocalVariableNode> localVarNodes;
-    boolean isLocalVarHoistingEnabled = Config.get().isDebuggerHoistLocalVarsEnabled();
+    boolean isLocalVarHoistingEnabled =
+        Config.get().isDynamicInstrumentationHoistLocalVarsEnabled();
     if (definition.isLineProbe() || !isLocalVarHoistingEnabled) {
       localVarNodes = methodNode.localVariables;
     } else {
@@ -1134,7 +1136,7 @@ private static List<FieldNode> extractStaticFields(
         }
       }
     }
-    if (!Config.get().isDebuggerInstrumentTheWorld()) {
+    if (!Config.get().isDynamicInstrumentationInstrumentTheWorld()) {
       // Collects inherited static fields only if the ITW mode is not enabled
       // because it can lead to LinkageError: attempted duplicate class definition
       // for example, when a probe is located in method overridden in enum element

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

@@ -707,7 +707,8 @@ public void commit(CapturedContext lineContext, int line) {
     if (shouldCommit) {
       if (isCaptureSnapshot()) {
         // freeze context just before commit because line probes have only one context
-        Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
+        Duration timeout =
+            Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS);
         lineContext.freeze(new TimeoutChecker(timeout));
         snapshot.addLine(lineContext, line);
       }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java

@@ -62,7 +62,7 @@ public DebuggerSink(
     this.probeStatusSink = probeStatusSink;
     this.snapshotSink = snapshotSink;
     this.symbolSink = symbolSink;
-    this.uploadFlushInterval = config.getDebuggerUploadFlushInterval();
+    this.uploadFlushInterval = config.getDynamicInstrumentationUploadFlushInterval();
   }
 
   public void start() {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java

@@ -55,10 +55,10 @@ public ProbeStatusSink(Config config, String diagnosticsEndpoint, boolean useMul
     this.diagnosticUploader = diagnosticUploader;
     this.useMultiPart = useMultiPart;
     this.messageBuilder = new Builder(config);
-    this.interval = Duration.ofSeconds(config.getDebuggerDiagnosticsInterval());
-    this.batchSize = config.getDebuggerUploadBatchSize();
+    this.interval = Duration.ofSeconds(config.getDynamicInstrumentationDiagnosticsInterval());
+    this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
     this.queue = new ArrayBlockingQueue<>(2 * this.batchSize);
-    this.isInstrumentTheWorld = config.isDebuggerInstrumentTheWorld();
+    this.isInstrumentTheWorld = config.isDynamicInstrumentationInstrumentTheWorld();
   }
 
   public void stop() {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java

@@ -48,7 +48,7 @@ public class SnapshotSink {
 
   public SnapshotSink(Config config, String tags, BatchUploader snapshotUploader) {
     this.serviceName = TagsHelper.sanitize(config.getServiceName());
-    this.batchSize = config.getDebuggerUploadBatchSize();
+    this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
     this.tags = tags;
     this.snapshotUploader = snapshotUploader;
   }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java

@@ -128,7 +128,7 @@ public BatchUploader(Config config, String endpoint, RetryPolicy retryPolicy) {
       RetryPolicy retryPolicy,
       String containerId,
       String entityId) {
-    instrumentTheWorld = config.isDebuggerInstrumentTheWorld();
+    instrumentTheWorld = config.isDynamicInstrumentationInstrumentTheWorld();
     if (endpoint == null || endpoint.length() == 0) {
       throw new IllegalArgumentException("Endpoint url is empty");
     }
@@ -148,7 +148,7 @@ public BatchUploader(Config config, String endpoint, RetryPolicy retryPolicy) {
     this.retryPolicy = retryPolicy;
     this.containerId = containerId;
     this.entityId = entityId;
-    Duration requestTimeout = Duration.ofSeconds(config.getDebuggerUploadTimeout());
+    Duration requestTimeout = Duration.ofSeconds(config.getDynamicInstrumentationUploadTimeout());
     client =
         OkHttpUtils.buildHttpClient(
             config,

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/DebuggerMetrics.java

@@ -14,7 +14,7 @@ public class DebuggerMetrics implements StatsDClient {
   private final StatsDClient statsd;
 
   private DebuggerMetrics(Config config) {
-    if (config.isDebuggerMetricsEnabled()) {
+    if (config.isDynamicInstrumentationMetricsEnabled()) {
 
       statsd =
           DDAgentStatsDClientManager.statsDClientManager()

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java

@@ -11,7 +11,8 @@
 public class ValueScriptHelper {
   public static void serializeValue(
       StringBuilder sb, String expr, Object value, CapturedContext.Status status, Limits limits) {
-    Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
+    Duration timeout =
+        Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS);
     TimeoutChecker timeoutChecker = new TimeoutChecker(timeout);
     SerializerWithLimits serializer =
         new SerializerWithLimits(new StringTokenWriter(sb, status.getErrors()), timeoutChecker);