Rename debugger symbol to symbol database

debuggerSymbol -> SymbolDatabase
make it less tight to debugger
Remove unused config DD_SYMBOL_DATABASE_INCLUDES (should be third
party includes)

Author: jpbempel

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

@@ -146,15 +146,15 @@ private static void startDynamicInstrumentation(
     }
     configurationPoller = sco.configurationPoller(config);
     if (configurationPoller != null) {
-      if (config.isDebuggerSymbolEnabled()) {
+      if (config.isSymbolDatabaseEnabled()) {
         symDBEnablement =
             new SymDBEnablement(
                 instrumentation,
                 config,
                 new SymbolAggregator(
-                    debuggerSink.getSymbolSink(), config.getDebuggerSymbolFlushThreshold()),
+                    debuggerSink.getSymbolSink(), config.getSymbolDatabaseFlushThreshold()),
                 classNameFilter);
-        if (config.isDebuggerSymbolForceUpload()) {
+        if (config.isSymbolDatabaseForceUpload()) {
           symDBEnablement.startSymbolExtraction();
         }
       }
@@ -249,7 +249,7 @@ private static void subscribeConfigurationPoller(
     LOGGER.debug("Subscribing to Live Debugging...");
     configurationPoller.addListener(
         Product.LIVE_DEBUGGING, new DebuggerProductChangesListener(config, configurationUpdater));
-    if (symDBEnablement != null && !config.isDebuggerSymbolForceUpload()) {
+    if (symDBEnablement != null && !config.isSymbolDatabaseForceUpload()) {
       LOGGER.debug("Subscribing to Symbol DB...");
       configurationPoller.addListener(Product.LIVE_DEBUGGING_SYMBOL_DB, symDBEnablement);
     }

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

@@ -63,7 +63,7 @@ public SymbolSink(Config config) {
     this.version = TagsHelper.sanitize(config.getVersion());
     this.symbolUploader = symbolUploader;
     this.maxPayloadSize = maxPayloadSize;
-    this.isCompressed = config.isDebuggerSymbolCompressed();
+    this.isCompressed = config.isSymbolDatabaseCompressed();
     byte[] eventContent =
         String.format(
                 EVENT_FORMAT, TagsHelper.sanitize(config.getServiceName()), config.getRuntimeId())

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/SymbolSinkTest.java

@@ -23,7 +23,7 @@ public void testSimpleFlush() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
     symbolSink.addScope(Scope.builder(ScopeType.JAR, null, 0, 0).build());
     symbolSink.flush();
@@ -47,7 +47,7 @@ public void testMultiScopeFlush() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
     symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
     symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar2.jar", 0, 0).build());
@@ -64,7 +64,7 @@ public void testQueueFull() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, MAX_SYMDB_UPLOAD_SIZE);
     for (int i = 0; i < SymbolSink.CAPACITY; i++) {
       symbolSink.addScope(Scope.builder(ScopeType.JAR, "jar1.jar", 0, 0).build());
@@ -88,7 +88,7 @@ public void splitByJarScopes() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
     final int NUM_JAR_SCOPES = 10;
     for (int i = 0; i < NUM_JAR_SCOPES; i++) {
@@ -111,7 +111,7 @@ public void splitTootManyJarScopes() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 2048);
     final int NUM_JAR_SCOPES = 21;
     for (int i = 0; i < NUM_JAR_SCOPES; i++) {
@@ -136,7 +136,7 @@ public void splitByClassScopes() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1024);
     final int NUM_CLASS_SCOPES = 10;
     List<Scope> classScopes = new ArrayList<>();
@@ -178,7 +178,7 @@ public void splitByClassScopesImpossible() {
     SymbolUploaderMock symbolUploaderMock = new SymbolUploaderMock();
     Config config = mock(Config.class);
     when(config.getServiceName()).thenReturn("service1");
-    when(config.isDebuggerSymbolCompressed()).thenReturn(false);
+    when(config.isSymbolDatabaseCompressed()).thenReturn(false);
     SymbolSink symbolSink = new SymbolSink(config, symbolUploaderMock, 1);
     final int NUM_CLASS_SCOPES = 10;
     List<Scope> classScopes = new ArrayList<>();

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymDBEnablementTest.java

@@ -50,7 +50,7 @@ public void before() {
     when(instr.isModifiableClass(any())).thenReturn(true);
     config = mock(Config.class);
     when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger"));
-    when(config.isDebuggerSymbolEnabled()).thenReturn(true);
+    when(config.isSymbolDatabaseEnabled()).thenReturn(true);
     symbolSink = mock(SymbolSink.class);
   }
 

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -186,10 +186,10 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD = false;
   static final int DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = 100; // milliseconds
   static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED = false;
-  static final boolean DEFAULT_DEBUGGER_SYMBOL_ENABLED = true;
-  static final boolean DEFAULT_DEBUGGER_SYMBOL_FORCE_UPLOAD = false;
-  static final int DEFAULT_DEBUGGER_SYMBOL_FLUSH_THRESHOLD = 100; // nb of classes
-  static final boolean DEFAULT_DEBUGGER_SYMBOL_COMPRESSED = true;
+  static final boolean DEFAULT_SYMBOL_DATABASE_ENABLED = true;
+  static final boolean DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD = false;
+  static final int DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD = 100; // nb of classes
+  static final boolean DEFAULT_SYMBOL_DATABASE_COMPRESSED = true;
   static final boolean DEFAULT_DEBUGGER_EXCEPTION_ENABLED = false;
   static final int DEFAULT_DEBUGGER_MAX_EXCEPTION_PER_SECOND = 100;
   static final boolean DEFAULT_DEBUGGER_EXCEPTION_ONLY_LOCAL_ROOT = false;

dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java

@@ -40,11 +40,10 @@ public final class DebuggerConfig {
       "dynamic.instrumentation.redacted.types";
   public static final String DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED =
       "dynamic.instrumentation.hoist.localvars.enabled";
-  public static final String DEBUGGER_SYMBOL_ENABLED = "symbol.database.upload.enabled";
-  public static final String DEBUGGER_SYMBOL_FORCE_UPLOAD = "internal.force.symbol.database.upload";
-  public static final String DEBUGGER_SYMBOL_INCLUDES = "symbol.database.includes";
-  public static final String DEBUGGER_SYMBOL_FLUSH_THRESHOLD = "symbol.database.flush.threshold";
-  public static final String DEBUGGER_SYMBOL_COMPRESSED = "symbol.database.compressed";
+  public static final String SYMBOL_DATABASE_ENABLED = "symbol.database.upload.enabled";
+  public static final String SYMBOL_DATABASE_FORCE_UPLOAD = "internal.force.symbol.database.upload";
+  public static final String SYMBOL_DATABASE_FLUSH_THRESHOLD = "symbol.database.flush.threshold";
+  public static final String SYMBOL_DATABASE_COMPRESSED = "symbol.database.compressed";
   public static final String DEBUGGER_EXCEPTION_ENABLED = "exception.debugging.enabled";
   public static final String EXCEPTION_REPLAY_ENABLED = "exception.replay.enabled";
   public static final String DEBUGGER_MAX_EXCEPTION_PER_SECOND =

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -406,11 +406,10 @@ public static String getHostName() {
   private final Set<String> dynamicInstrumentationRedactionExcludedIdentifiers;
   private final String dynamicInstrumentationRedactedTypes;
   private final boolean dynamicInstrumentationHoistLocalVarsEnabled;
-  private final boolean debuggerSymbolEnabled;
-  private final boolean debuggerSymbolForceUpload;
-  private final String debuggerSymbolIncludes;
-  private final int debuggerSymbolFlushThreshold;
-  private final boolean debuggerSymbolCompressed;
+  private final boolean symbolDatabaseEnabled;
+  private final boolean symbolDatabaseForceUpload;
+  private final int symbolDatabaseFlushThreshold;
+  private final boolean symbolDatabaseCompressed;
   private final boolean debuggerExceptionEnabled;
   private final int debuggerMaxExceptionPerSecond;
   @Deprecated private final boolean debuggerExceptionOnlyLocalRoot;
@@ -1610,17 +1609,16 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getBoolean(
             DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED,
             DEFAULT_DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED);
-    debuggerSymbolEnabled =
-        configProvider.getBoolean(DEBUGGER_SYMBOL_ENABLED, DEFAULT_DEBUGGER_SYMBOL_ENABLED);
-    debuggerSymbolForceUpload =
+    symbolDatabaseEnabled =
+        configProvider.getBoolean(SYMBOL_DATABASE_ENABLED, DEFAULT_SYMBOL_DATABASE_ENABLED);
+    symbolDatabaseForceUpload =
         configProvider.getBoolean(
-            DEBUGGER_SYMBOL_FORCE_UPLOAD, DEFAULT_DEBUGGER_SYMBOL_FORCE_UPLOAD);
-    debuggerSymbolIncludes = configProvider.getString(DEBUGGER_SYMBOL_INCLUDES, null);
-    debuggerSymbolFlushThreshold =
+            SYMBOL_DATABASE_FORCE_UPLOAD, DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD);
+    symbolDatabaseFlushThreshold =
         configProvider.getInteger(
-            DEBUGGER_SYMBOL_FLUSH_THRESHOLD, DEFAULT_DEBUGGER_SYMBOL_FLUSH_THRESHOLD);
-    debuggerSymbolCompressed =
-        configProvider.getBoolean(DEBUGGER_SYMBOL_COMPRESSED, DEFAULT_DEBUGGER_SYMBOL_COMPRESSED);
+            SYMBOL_DATABASE_FLUSH_THRESHOLD, DEFAULT_SYMBOL_DATABASE_FLUSH_THRESHOLD);
+    symbolDatabaseCompressed =
+        configProvider.getBoolean(SYMBOL_DATABASE_COMPRESSED, DEFAULT_SYMBOL_DATABASE_COMPRESSED);
     debuggerExceptionEnabled =
         configProvider.getBoolean(
             DEBUGGER_EXCEPTION_ENABLED,
@@ -3094,20 +3092,20 @@ public int getDynamicInstrumentationCaptureTimeout() {
     return dynamicInstrumentationCaptureTimeout;
   }
 
-  public boolean isDebuggerSymbolEnabled() {
-    return debuggerSymbolEnabled;
+  public boolean isSymbolDatabaseEnabled() {
+    return symbolDatabaseEnabled;
   }
 
-  public boolean isDebuggerSymbolForceUpload() {
-    return debuggerSymbolForceUpload;
+  public boolean isSymbolDatabaseForceUpload() {
+    return symbolDatabaseForceUpload;
   }
 
-  public int getDebuggerSymbolFlushThreshold() {
-    return debuggerSymbolFlushThreshold;
+  public int getSymbolDatabaseFlushThreshold() {
+    return symbolDatabaseFlushThreshold;
   }
 
-  public boolean isDebuggerSymbolCompressed() {
-    return debuggerSymbolCompressed;
+  public boolean isSymbolDatabaseCompressed() {
+    return symbolDatabaseCompressed;
   }
 
   public boolean isDebuggerExceptionEnabled() {
@@ -4517,13 +4515,15 @@ public String toString() {
         + ", debuggerRedactTypes="
         + dynamicInstrumentationRedactedTypes
         + ", debuggerSymbolEnabled="
-        + debuggerSymbolEnabled
+        + symbolDatabaseEnabled
         + ", debuggerSymbolForceUpload="
-        + debuggerSymbolForceUpload
+        + symbolDatabaseForceUpload
         + ", debuggerSymbolFlushThreshold="
-        + debuggerSymbolFlushThreshold
-        + ", debuggerSymbolIncludes="
-        + debuggerSymbolIncludes
+        + symbolDatabaseFlushThreshold
+        + ", thirdPartyIncludes="
+        + debuggerThirdPartyIncludes
+        + ", thirdPartyExcludes="
+        + debuggerThirdPartyExcludes
         + ", debuggerExceptionEnabled="
         + debuggerExceptionEnabled
         + ", debuggerCodeOriginEnabled="