Swap meaning of includes and excludes (#6959)

Author: ojung

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

@@ -25,11 +25,11 @@ public class ThirdPartyLibraries {
 
   private ThirdPartyLibraries() {}
 
-  public Set<String> getExcludes(Config config) {
+  public Set<String> getThirdPartyLibraries(Config config) {
     try (InputStream inputStream = this.getClass().getResourceAsStream(FILE_NAME)) {
       InternalConfig defaults = readConfig(inputStream);
       Set<String> excludes =
-          config.getThirdPartyExcludes().stream()
+          config.getThirdPartyIncludes().stream()
               .filter(s -> !s.isEmpty())
               .collect(Collectors.toSet());
       excludes.addAll(defaults.getPrefixes());
@@ -40,8 +40,8 @@ public Set<String> getExcludes(Config config) {
     }
   }
 
-  public Set<String> getIncludes(Config config) {
-    return config.getThirdPartyIncludes().stream()
+  public Set<String> getThirdPartyExcludes(Config config) {
+    return config.getThirdPartyExcludes().stream()
         .filter(s -> !s.isEmpty())
         .collect(Collectors.toSet());
   }

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

@@ -14,8 +14,8 @@ public class ClassNameFiltering {
 
   public ClassNameFiltering(Config config) {
     this(
-        ThirdPartyLibraries.INSTANCE.getExcludes(config),
-        ThirdPartyLibraries.INSTANCE.getIncludes(config));
+        ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(config),
+        ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(config));
   }
 
   public ClassNameFiltering(Set<String> excludes) {

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

@@ -23,40 +23,46 @@ void setUp() {
 
   @Test
   void testGetExcludesContainsDefaultExclude() {
-    assertTrue(ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig).contains("java."));
+    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
   }
 
   @Test
   void testGetExcludesWithExplicitExclude() {
 
-    when(mockConfig.getThirdPartyExcludes())
+    when(mockConfig.getThirdPartyIncludes())
         .thenReturn(Collections.singleton("com.datadog.debugger"));
     assertTrue(
-        ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig).contains("com.datadog.debugger"));
+        ThirdPartyLibraries.INSTANCE
+            .getThirdPartyLibraries(mockConfig)
+            .contains("com.datadog.debugger"));
   }
 
   @Test
   void testGetExcludesWithExplicitExcludeAndExplicitInclude() {
-    when(mockConfig.getThirdPartyExcludes())
-        .thenReturn(Collections.singleton("com.datadog.debugger"));
     when(mockConfig.getThirdPartyIncludes())
         .thenReturn(Collections.singleton("com.datadog.debugger"));
+    when(mockConfig.getThirdPartyExcludes())
+        .thenReturn(Collections.singleton("com.datadog.debugger"));
     assertTrue(
-        ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig).contains("com.datadog.debugger"));
+        ThirdPartyLibraries.INSTANCE
+            .getThirdPartyLibraries(mockConfig)
+            .contains("com.datadog.debugger"));
     assertTrue(
-        ThirdPartyLibraries.INSTANCE.getIncludes(mockConfig).contains("com.datadog.debugger"));
+        ThirdPartyLibraries.INSTANCE
+            .getThirdPartyExcludes(mockConfig)
+            .contains("com.datadog.debugger"));
   }
 
   @Test
   void testGetExcludesWithoutExplicitConfig() {
-    assertNotNull(ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig));
-    assertFalse(ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig).isEmpty());
+    assertNotNull(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig));
+    assertFalse(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).isEmpty());
   }
 
   @Test
   void testGetExcludesWithIncludeOverridingDefaultExclude() {
-    when(mockConfig.getThirdPartyIncludes()).thenReturn(Collections.singleton("java."));
-    assertTrue(ThirdPartyLibraries.INSTANCE.getExcludes(mockConfig).contains("java."));
-    assertTrue(ThirdPartyLibraries.INSTANCE.getIncludes(mockConfig).contains("java."));
+    when(mockConfig.getThirdPartyExcludes()).thenReturn(Collections.singleton("java."));
+    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(mockConfig).contains("java."));
+    assertTrue(ThirdPartyLibraries.INSTANCE.getThirdPartyExcludes(mockConfig).contains("java."));
   }
 }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeManagerTest.java

@@ -53,8 +53,8 @@ void instrumentSingleFrame() {
   @Test
   void filterAllFrames() {
     Config config = mock(Config.class);
-    when(config.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyExcludes())
+    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+    when(config.getThirdPartyIncludes())
         .thenReturn(
             Stream.of(
                     ",",

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

@@ -76,8 +76,8 @@ public void removeSymDBConfig() throws Exception {
 
   @Test
   public void noIncludesFilterOutDatadogClass() {
-    when(config.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
-    when(config.getThirdPartyExcludes()).thenReturn(Collections.singleton("com.datadog.debugger."));
+    when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
+    when(config.getThirdPartyIncludes()).thenReturn(Collections.singleton("com.datadog.debugger."));
     SymDBEnablement symDBEnablement =
         new SymDBEnablement(
             instr, config, new SymbolAggregator(symbolSink, 1), new ClassNameFiltering(config));

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java

@@ -91,7 +91,7 @@ public void testExcludeDefaults(String input) {
     when(config.getThirdPartyExcludes()).thenReturn(Collections.emptySet());
     when(config.getThirdPartyIncludes()).thenReturn(Collections.emptySet());
     ClassNameFiltering classNameFiltering =
-        new ClassNameFiltering(ThirdPartyLibraries.INSTANCE.getExcludes(config));
+        new ClassNameFiltering(ThirdPartyLibraries.INSTANCE.getThirdPartyLibraries(config));
     assertTrue(classNameFiltering.isExcluded(input));
   }
 }