capa-cloud · dgzpg · Dec 2, 2021 · Dec 2, 2021 · Dec 2, 2021 · Dec 2, 2021
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -31,7 +31,7 @@
     <name>capa-sdk-examples</name>
 
     <properties>
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.14.1</log4j.version>
         <logback.version>1.1.7</logback.version>
         <slf4j-api.version>1.7.32</slf4j-api.version>
     </properties>
@@ -67,7 +67,7 @@
             <version>${log4j.version}</version>
         </dependency>
         <!-- logback -->
-        <!-- <dependency>
+         <!--<dependency>
              <groupId>ch.qos.logback</groupId>
              <artifactId>logback-classic</artifactId>
              <version>${logback.version}</version>

diff --git a/...loud/capa/examples/telemetry/DemoLog.java → ...up/rxcloud/capa/examples/log/DemoLog.java b/...loud/capa/examples/telemetry/DemoLog.java → ...up/rxcloud/capa/examples/log/DemoLog.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.examples.telemetry;
+package group.rxcloud.capa.examples.log;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/examples/src/main/resources/xml/logback.xml b/examples/src/main/resources/xml/logback.xml
@@ -17,19 +17,9 @@
   -->
 <configuration>
     <!--Log-->
-    <appender name="Log" class="group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent">
+    <appender name="Log" class="group.rxcloud.capa.component.log.CapaLogbackAppenderAgent">
     </appender>
 
-    <logger name="com.ctrip.ibu.market.e2c" level="INFO" additivity="false">
-        <!--        <appender-ref ref="STDOUT"/>-->
-        <appender-ref ref="Log"/>
-    </logger>
-
-    <logger name="com.ctrip.ibu.telescope.mock.support" level="INFO" additivity="false">
-        <!--        <appender-ref ref="STDOUT"/>-->
-        <appender-ref ref="Log"/>
-    </logger>
-
     <root level="INFO">
         <appender-ref ref="Log"/>
     </root>

diff --git a/pom.xml b/pom.xml
@@ -44,6 +44,10 @@
             <name>reckless11</name>
             <email>reckless0511@gmail.com</email>
         </developer>
+        <developer>
+            <name>dgzpg</name>
+            <email>1711145024@qq.com</email>
+        </developer>
     </developers>
 
     <scm>

diff --git a/sdk-component/pom.xml b/sdk-component/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <okhttp.version>4.9.1</okhttp.version>
         <kotlin-stdlib.version>1.4.10</kotlin-stdlib.version>
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.14.1</log4j.version>
         <logback.version>1.1.7</logback.version>
         <guava-version>19.0</guava-version>
         <commons-lang3-version>3.11</commons-lang3-version>

diff --git a/...ent/log/agent/CapaLog4jAppenderAgent.java → ...component/log/CapaLog4jAppenderAgent.java b/...ent/log/agent/CapaLog4jAppenderAgent.java → ...component/log/CapaLog4jAppenderAgent.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
-import group.rxcloud.capa.component.log.enums.CapaLogLevel;
-import group.rxcloud.capa.component.log.manager.LogManager;
 import group.rxcloud.capa.infrastructure.CapaClassLoader;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.Filter;
@@ -30,7 +28,6 @@
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 
 import java.io.Serializable;
-import java.util.Optional;
 
 /**
  * The abstract log4j appender. Extend this and provide your specific impl.
@@ -66,7 +63,7 @@ public CapaLog4jAppenderAgent(String name,
                                   Filter filter,
                                   Layout<? extends Serializable> layout,
                                   boolean ignoreExceptions) {
-        super(name, filter, layout, ignoreExceptions);
+        super(name, filter, layout, ignoreExceptions, null);
     }
 
     /**
@@ -100,12 +97,7 @@ public static CapaLog4jAppender buildCapaLog4jAppender() {
 
     @Override
     public void append(LogEvent event) {
-        if (event != null && event.getLevel() != null) {
-            Optional<CapaLogLevel> capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name());
-            if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) {
-                logAppender.appendLog(event);
-            }
-        }
+        logAppender.append(event);
     }
 
     /**
@@ -118,6 +110,6 @@ public interface CapaLog4jAppender {
          *
          * @param event The log event.
          */
-        void appendLog(LogEvent event);
+        void append(LogEvent event);
     }
 }
diff --git a/...t/log/agent/CapaLogbackAppenderAgent.java → ...mponent/log/CapaLogbackAppenderAgent.java b/...t/log/agent/CapaLogbackAppenderAgent.java → ...mponent/log/CapaLogbackAppenderAgent.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
-import group.rxcloud.capa.component.log.enums.CapaLogLevel;
-import group.rxcloud.capa.component.log.manager.LogManager;
 import group.rxcloud.capa.infrastructure.CapaClassLoader;
 
-import java.util.Optional;
-
 /**
  * The agent of the logback impl.
  */
@@ -64,12 +60,7 @@ public static CapaLogbackAppender buildCapaLogbackAppender() {
      */
     @Override
     protected void append(ILoggingEvent event) {
-        if (event != null && event.getLevel() != null) {
-            Optional<CapaLogLevel> capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr);
-            if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) {
-                logbackAppender.appendLog(event);
-            }
-        }
+        logbackAppender.append(event);
     }
 
     /**
@@ -82,6 +73,7 @@ public interface CapaLogbackAppender {
          *
          * @param event The log event.
          */
-        void appendLog(ILoggingEvent event);
+        void append(ILoggingEvent event);
     }
 }
+
diff --git a/.../src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java b/.../src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java
diff --git a/...log/agent/CapaLog4jAppenderAgentTest.java → ...onent/log/CapaLog4jAppenderAgentTest.java b/...log/agent/CapaLog4jAppenderAgentTest.java → ...onent/log/CapaLog4jAppenderAgentTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;

diff --git a/...g/agent/CapaLogbackAppenderAgentTest.java → ...ent/log/CapaLogbackAppenderAgentTest.java b/...g/agent/CapaLogbackAppenderAgentTest.java → ...ent/log/CapaLogbackAppenderAgentTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import org.junit.jupiter.api.Assertions;
@@ -34,6 +34,6 @@ void testAppend() {
         CapaLogbackAppenderAgent.CapaLogbackAppender capaLogbackAppender = CapaLogbackAppenderAgent.buildCapaLogbackAppender();
         ILoggingEvent logEvent = Mockito.mock(ILoggingEvent.class);
         Mockito.when(logEvent.getFormattedMessage()).thenReturn("TEST");
-        capaLogbackAppender.appendLog(logEvent);
+        capaLogbackAppender.append(logEvent);
     }
 }
diff --git a/...nent/log/agent/TestCapaLog4jAppender.java → .../component/log/TestCapaLog4jAppender.java b/...nent/log/agent/TestCapaLog4jAppender.java → .../component/log/TestCapaLog4jAppender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
 import org.apache.logging.log4j.core.LogEvent;
 
@@ -24,7 +24,7 @@
 public class TestCapaLog4jAppender implements CapaLog4jAppenderAgent.CapaLog4jAppender {
 
     @Override
-    public void appendLog(LogEvent event) {
+    public void append(LogEvent event) {
         System.out.println("test log log4j and content is " + event.getMessage().getFormattedMessage());
     }
 }
diff --git a/...nt/log/agent/TestCapaLogbackAppender.java → ...omponent/log/TestCapaLogbackAppender.java b/...nt/log/agent/TestCapaLogbackAppender.java → ...omponent/log/TestCapaLogbackAppender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.component.log.agent;
+package group.rxcloud.capa.component.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
@@ -27,7 +27,7 @@ public TestCapaLogbackAppender() {
     }
 
     @Override
-    public void appendLog(ILoggingEvent event) {
+    public void append(ILoggingEvent event) {
         System.out.println("test logback log and content is " + event.getFormattedMessage());
     }
 }

diff --git a/sdk-component/src/test/resources/capa-component-log.properties b/sdk-component/src/test/resources/capa-component-log.properties
@@ -1,2 +1,2 @@
-group.rxcloud.capa.component.log.agent.CapaLog4jAppenderAgent$CapaLog4jAppender=group.rxcloud.capa.component.log.agent.TestCapaLog4jAppender
-group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent$CapaLogbackAppender=group.rxcloud.capa.component.log.agent.TestCapaLogbackAppender
+group.rxcloud.capa.component.log.CapaLog4jAppenderAgent$CapaLog4jAppender=group.rxcloud.capa.component.log.TestCapaLog4jAppender
+group.rxcloud.capa.component.log.CapaLogbackAppenderAgent$CapaLogbackAppender=group.rxcloud.capa.component.log.TestCapaLogbackAppender
diff --git a/...tructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java b/...tructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java
@@ -58,6 +58,10 @@ public String get(String key) {
         return merged.get(key);
     }
 
+    public Map<String, String> getMerged(){
+        return merged;
+    }
+
     private void subscribeConfigurationByAppId(ConfigurationHooks configurationHooks, String appId, int index) {
         String storeName = configurationHooks.registryStoreNames().get(0);
 

diff --git a/sdk-spi-demo/pom.xml b/sdk-spi-demo/pom.xml
@@ -31,7 +31,7 @@
     <name>capa-sdk-spi-demo</name>
 
     <properties>
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.14.1</log4j.version>
         <logback.version>1.1.7</logback.version>
     </properties>
 

diff --git a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/log/DemoLog4jAppender.java b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/log/DemoLog4jAppender.java
@@ -16,10 +16,10 @@
  */
 package group.rxcloud.capa.spi.demo.log;
 
-import group.rxcloud.capa.component.log.agent.CapaLog4jAppenderAgent;
+import group.rxcloud.capa.spi.log.CapaLog4jAppenderSpi;
 import org.apache.logging.log4j.core.LogEvent;
 
-public class DemoLog4jAppender implements CapaLog4jAppenderAgent.CapaLog4jAppender {
+public class DemoLog4jAppender extends CapaLog4jAppenderSpi {
 
     @Override
     public void appendLog(LogEvent event) {

diff --git a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/log/DemoLogbackAppender.java b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/log/DemoLogbackAppender.java
@@ -17,9 +17,9 @@
 package group.rxcloud.capa.spi.demo.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent;
+import group.rxcloud.capa.spi.log.CapaLogbackAppenderSpi;
 
-public class DemoLogbackAppender implements CapaLogbackAppenderAgent.CapaLogbackAppender {
+public class DemoLogbackAppender extends CapaLogbackAppenderSpi {
 
     public DemoLogbackAppender() {
     }

diff --git a/sdk-spi-demo/src/main/resources/capa-component-log.properties b/sdk-spi-demo/src/main/resources/capa-component-log.properties
@@ -1,3 +1,3 @@
 # log component
-group.rxcloud.capa.component.log.agent.CapaLog4jAppenderAgent$CapaLog4jAppender=group.rxcloud.capa.spi.demo.log.DemoLog4jAppender
-group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent$CapaLogbackAppender=group.rxcloud.capa.spi.demo.log.DemoLogbackAppender
+group.rxcloud.capa.component.log.CapaLog4jAppenderAgent$CapaLog4jAppender=group.rxcloud.capa.spi.demo.log.DemoLog4jAppender
+group.rxcloud.capa.component.log.CapaLogbackAppenderAgent$CapaLogbackAppender=group.rxcloud.capa.spi.demo.log.DemoLogbackAppender