Remove COMMON_PREFIX from MockLogAppender (elastic#96331)

So that logger names go through as they are in MockLogAppender.

Author: kingherc

test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java

@@ -386,9 +386,6 @@ public InternalTestCluster(
         if (Strings.hasLength(System.getProperty("tests.es.logger.level"))) {
             builder.put("logger.level", System.getProperty("tests.es.logger.level"));
         }
-        if (Strings.hasLength(System.getProperty("es.logger.prefix"))) {
-            builder.put("logger.prefix", System.getProperty("es.logger.prefix"));
-        }
         // Default the watermarks to absurdly low to prevent the tests
         // from failing on nodes without enough disk space
         builder.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), "1b");

test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java

@@ -33,8 +33,6 @@
  */
 public class MockLogAppender extends AbstractAppender {
 
-    private static final String COMMON_PREFIX = System.getProperty("es.logger.prefix", "org.elasticsearch.");
-
     private final List<WrappedLoggingExpectation> expectations;
 
     public MockLogAppender() {
@@ -79,7 +77,7 @@ public abstract static class AbstractEventExpectation implements LoggingExpectat
 
         public AbstractEventExpectation(String name, String logger, Level level, String message) {
             this.name = name;
-            this.logger = getLoggerName(logger);
+            this.logger = logger;
             this.level = level;
             this.message = message;
             this.saw = false;
@@ -210,13 +208,6 @@ public void assertMatched() {
 
     }
 
-    private static String getLoggerName(String name) {
-        if (name.startsWith("org.elasticsearch.")) {
-            name = name.substring("org.elasticsearch.".length());
-        }
-        return COMMON_PREFIX + name;
-    }
-
     /**
      * A wrapper around {@link LoggingExpectation} to detect if the assertMatched method has been called
      */

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java

@@ -68,8 +68,6 @@ public class WatcherScheduleEngineBenchmark {
         .build();
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("es.logger.prefix", "");
-
         String[] engines = new String[] { "ticker", "scheduler" };
         int numWatches = 2000;
         int benchTime = 60000;