add UT

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/MasterLogFilterTest.java

@@ -0,0 +1,103 @@
+package org.apache.dolphinscheduler.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+import java.util.Map;
+
+
+public class MasterLogFilterTest {
+
+    @Test
+    public void decide() {
+        MasterLogFilter masterLogFilter = new MasterLogFilter();
+
+
+        FilterReply filterReply = masterLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return Constants.THREAD_NAME_MASTER_SERVER;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "master insert into queue success, task : shell2";
+//                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "master insert into queue success, task : shell2";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverterTest.java

@@ -17,13 +17,19 @@
 package org.apache.dolphinscheduler.common.log;
 
 
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.SensitiveLogUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
 
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -36,26 +42,106 @@ public class SensitiveDataConverterTest {
      */
     private final Pattern pwdPattern = Pattern.compile(Constants.DATASOURCE_PASSWORD_REGEX);
 
+    private final String logMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
+            "\"database\":\"carbond\"," +
+            "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
+            "\"user\":\"view\"," +
+            "\"password\":\"view1\"}";
+
+    private final String maskLogMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
+            "\"database\":\"carbond\"," +
+            "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
+            "\"user\":\"view\"," +
+            "\"password\":\"******\"}";
+    @Test
+    public void convert() {
+        SensitiveDataConverter sensitiveDataConverter = new SensitiveDataConverter();
+        String result = sensitiveDataConverter.convert(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return null;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return null;
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return logMsg;
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
+
+    }
 
     /**
      * mask sensitive logMsg - sql task datasource password
      */
     @Test
     public void testPwdLogMsgConverter() {
-
-        String logMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
-                "\"database\":\"carbond\"," +
-                "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
-                "\"user\":\"view\"," +
-                "\"password\":\"view1\"}";
-
-        String maskLogMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
-                "\"database\":\"carbond\"," +
-                "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
-                "\"user\":\"view\"," +
-                "\"password\":\"******\"}";
-
-
         logger.info("parameter : {}", logMsg);
         logger.info("parameter : {}", passwordHandler(pwdPattern, logMsg));
 
@@ -89,4 +175,5 @@ public class SensitiveDataConverterTest {
     }
 
 
+
 }

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminatorTest.java

@@ -0,0 +1,139 @@
+package org.apache.dolphinscheduler.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class TaskLogDiscriminatorTest {
+
+    /**
+     * log base
+     */
+    private String logBase = "logs";
+
+    TaskLogDiscriminator taskLogDiscriminator;
+
+    @Before
+    public void before(){
+        taskLogDiscriminator = new TaskLogDiscriminator();
+        taskLogDiscriminator.setLogBase("logs");
+        taskLogDiscriminator.setKey("123");
+    }
+
+    @Test
+    public void getDiscriminatingValue() {
+       String result = taskLogDiscriminator.getDiscriminatingValue(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return null;
+            }
+
+            @Override
+            public Level getLevel() {
+                return null;
+            }
+
+            @Override
+            public String getMessage() {
+                return null;
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return null;
+            }
+
+            @Override
+            public String getLoggerName() {
+                return "[taskAppId=TASK-1-1-1";
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+        Assert.assertEquals("1/1/", result);
+    }
+
+    @Test
+    public void start() {
+        taskLogDiscriminator.start();
+        Assert.assertEquals(true, taskLogDiscriminator.isStarted());
+    }
+
+    @Test
+    public void getKey() {
+        Assert.assertEquals("123", taskLogDiscriminator.getKey());
+    }
+
+    @Test
+    public void setKey() {
+
+        taskLogDiscriminator.setKey("123");
+    }
+
+    @Test
+    public void getLogBase() {
+        Assert.assertEquals("logs", taskLogDiscriminator.getLogBase());
+    }
+
+    @Test
+    public void setLogBase() {
+       taskLogDiscriminator.setLogBase("logs");
+    }
+}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogFilterTest.java

@@ -0,0 +1,104 @@
+package org.apache.dolphinscheduler.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+
+public class TaskLogFilterTest {
+
+    @Test
+    public void decide() {
+        TaskLogFilter taskLogFilter = new TaskLogFilter();
+
+
+        FilterReply filterReply = taskLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return LoggerUtils.TASK_LOGGER_THREAD_NAME;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "raw script : echo 222";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "raw script : echo 222";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/WorkerLogFilterTest.java

@@ -0,0 +1,103 @@
+package org.apache.dolphinscheduler.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+
+public class WorkerLogFilterTest {
+
+    @Test
+    public void decide() {
+        WorkerLogFilter workerLogFilter = new WorkerLogFilter();
+
+
+        FilterReply filterReply = workerLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return Constants.THREAD_NAME_WORKER_SERVER;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/LoggerUtilsTest.java

@@ -0,0 +1,27 @@
+package org.apache.dolphinscheduler.common.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class LoggerUtilsTest {
+    private Logger logger = LoggerFactory.getLogger(LoggerUtilsTest.class);
+
+    @Test
+    public void buildTaskId() {
+
+      String taskId = LoggerUtils.buildTaskId(LoggerUtils.TASK_LOGGER_INFO_PREFIX,79,4084,15210);
+
+      Assert.assertEquals(" - [taskAppId=TASK-79-4084-15210]", taskId);
+    }
+
+    @Test
+    public void getAppIds() {
+       List<String> appIdList =  LoggerUtils.getAppIds("Running job: application_1_1",logger);
+       Assert.assertEquals("application_1_1", appIdList.get(0));
+
+    }
+}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java

@@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.common.utils;
 
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.SensitiveLogUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

pom.xml

@@ -674,6 +674,7 @@
                 <configuration>
                     <includes>
                         <include>**/common/utils/*.java</include>
+                        <include>**/common/log/*.java</include>
                         <include>**/common/threadutils/*.java</include>
                         <include>**/common/graph/*.java</include>
                         <include>**/common/queue/*.java</include>