Split the log collector into log4j1 and log4j2; Avoid the jackson module in log collector.

Author: Davidhua1996

pom.xml

@@ -53,7 +53,7 @@
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>
         <gson.version>2.8.5</gson.version>
-        <fasterxml.jackson.version>2.11.3</fasterxml.jackson.version>
+        <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
         <math3.version>3.1.1</math3.version>
         <httpclient.version>4.5.4</httpclient.version>
         <httpmime.version>4.5.4</httpmime.version>

…log/flink-streamis-log-collector/pom.xml …tor/flink-streamis-log-collector/pom.xmlstreamis-jobmanager/streamis-job-log/flink-streamis-log-collector/pom.xml renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/pom.xml streamis-jobmanager/streamis-job-log/flink-streamis-log-collector/pom.xml renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/pom.xml

@@ -1,6 +1,7 @@
 package com.webank.wedatasphere.streamis.jobmanager.log.collector.flink;
 
 import com.webank.wedatasphere.streamis.jobmanager.log.collector.config.StreamisLogAppenderConfig;
+import com.webank.wedatasphere.streamis.jobmanager.log.collector.log4j2.StreamisLog4j2AppenderConfig;
 import com.webank.wedatasphere.streamis.jobmanager.plugin.StreamisConfigAutowired;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.configuration.Configuration;
@@ -49,17 +50,19 @@ public StreamisLogAppenderConfig logAppenderConfig(StreamisLogAppenderConfig.Bui
             gateway += this.configuration.getString(LOG_COLLECT_PATH, "/");
             builder.setRpcAddress(gateway);
         }
-        List<String> filterStrategies = this.configuration.get(LOG_FILTER_STRATEGIES);
-        for(String filterStrategy : filterStrategies){
-            if ("LevelMatch".equals(filterStrategy)){
-                builder.withFilter(LevelMatchFilter.newBuilder().setOnMatch(Filter.Result.ACCEPT).setOnMismatch(Filter.Result.DENY)
-                        .setLevel(Level.getLevel(this.configuration.getString(LOG_FILTER_LEVEL_MATCH))).build());
-            }else if ("ThresholdFilter".equals(filterStrategy)){
-                builder.withFilter(ThresholdFilter.createFilter(Level
-                        .getLevel(this.configuration.getString(LOG_FILTER_THRESHOLD_MATCH)), Filter.Result.ACCEPT, Filter.Result.DENY));
-            }else if ("RegexMatch".equals(filterStrategy)){
-                builder.withFilter(RegexFilter.createFilter( this.configuration.getString(LOG_FILTER_REGEX),
-                        null, true, Filter.Result.ACCEPT, Filter.Result.DENY));
+        if (builder instanceof StreamisLog4j2AppenderConfig.Builder) {
+            List<String> filterStrategies = this.configuration.get(LOG_FILTER_STRATEGIES);
+            for (String filterStrategy : filterStrategies) {
+                if ("LevelMatch".equals(filterStrategy)) {
+                    ((StreamisLog4j2AppenderConfig.Builder)builder).withFilter(LevelMatchFilter.newBuilder().setOnMatch(Filter.Result.ACCEPT).setOnMismatch(Filter.Result.DENY)
+                            .setLevel(Level.getLevel(this.configuration.getString(LOG_FILTER_LEVEL_MATCH))).build());
+                } else if ("ThresholdFilter".equals(filterStrategy)) {
+                    ((StreamisLog4j2AppenderConfig.Builder)builder).withFilter(ThresholdFilter.createFilter(Level
+                            .getLevel(this.configuration.getString(LOG_FILTER_THRESHOLD_MATCH)), Filter.Result.ACCEPT, Filter.Result.DENY));
+                } else if ("RegexMatch".equals(filterStrategy)) {
+                    ((StreamisLog4j2AppenderConfig.Builder)builder).withFilter(RegexFilter.createFilter(this.configuration.getString(LOG_FILTER_REGEX),
+                            null, true, Filter.Result.ACCEPT, Filter.Result.DENY));
+                }
             }
         }
         String hadoopUser = EnvironmentInformation.getHadoopUser();

…-collector/src/main/assembly/package.xml …-collector/src/main/assembly/package.xmlstreamis-jobmanager/streamis-job-log/flink-streamis-log-collector/src/main/assembly/package.xml renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/src/main/assembly/package.xml streamis-jobmanager/streamis-job-log/flink-streamis-log-collector/src/main/assembly/package.xml renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/src/main/assembly/package.xml

@@ -4,7 +4,6 @@
 import org.apache.flink.configuration.GlobalConfiguration;
 import org.junit.Test;
 
-import java.io.File;
 import java.util.Enumeration;
 import java.util.Objects;
 import java.util.Properties;

…/flink/FlinkStreamisConfigAutowired.java …/flink/FlinkStreamisConfigAutowired.javastreamis-jobmanager/streamis-job-log/flink-streamis-log-collector/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/flink/FlinkStreamisConfigAutowired.java renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/flink/FlinkStreamisConfigAutowired.java streamis-jobmanager/streamis-job-log/flink-streamis-log-collector/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/flink/FlinkStreamisConfigAutowired.java renamed to streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/collector/flink/FlinkStreamisConfigAutowired.java

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>streamis-job-log</artifactId>
+        <groupId>com.webank.wedatasphere.streamis</groupId>
+        <version>0.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>streamis-job-log-collector-core</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <httpclient.version>4.5.13</httpclient.version>
+        <httpmine.version>4.5.4</httpmine.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.streamis</groupId>
+            <artifactId>streamis-job-log-common</artifactId>
+            <version>${streamis.version}</version>
+        </dependency>
+        <!--http client module-->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>${httpmine.version}</version>
+        </dependency>
+    </dependencies>
+</project>