From 40c8b6e6cbeed642a98f67958dee6bf242490b13 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 2 Dec 2021 22:54:39 +0800 Subject: [PATCH 1/4] update log format --- examples/pom.xml | 10 ++++---- .../examples/{telemetry => log}/DemoLog.java | 2 +- .../resources/{log4j2.xml => logback.xml} | 23 +++++++---------- examples/src/main/resources/xml/logback.xml | 2 +- sdk-component/pom.xml | 2 +- .../{agent => }/CapaLog4jAppenderAgent.java | 12 ++++----- .../{agent => }/CapaLogbackAppenderAgent.java | 16 ++++++------ .../CapaLog4jAppenderAgentTest.java | 2 +- .../CapaLogbackAppenderAgentTest.java | 4 +-- .../{agent => }/TestCapaLog4jAppender.java | 4 +-- .../{agent => }/TestCapaLogbackAppender.java | 4 +-- .../resources/capa-component-log.properties | 4 +-- sdk-spi-demo/pom.xml | 2 +- .../capa/spi/demo/log/DemoLog4jAppender.java | 4 +-- .../spi/demo/log/DemoLogbackAppender.java | 4 +-- .../resources/capa-component-log.properties | 4 +-- sdk-spi/pom.xml | 17 +++++++------ .../capa/spi/log/CapaLog4jAppenderSpi.java | 23 +++++++++++++++++ .../capa/spi/log/CapaLogbackAppenderSpi.java | 25 +++++++++++++++++++ .../configuration/LogSwitchConfiguration.java | 2 +- .../capa/spi}/log/enums/CapaLogLevel.java | 2 +- .../capa/spi}/log/manager/LogManager.java | 6 ++--- 22 files changed, 108 insertions(+), 66 deletions(-) rename examples/src/main/java/group/rxcloud/capa/examples/{telemetry => log}/DemoLog.java (97%) rename examples/src/main/resources/{log4j2.xml => logback.xml} (65%) rename sdk-component/src/main/java/group/rxcloud/capa/component/log/{agent => }/CapaLog4jAppenderAgent.java (93%) rename sdk-component/src/main/java/group/rxcloud/capa/component/log/{agent => }/CapaLogbackAppenderAgent.java (87%) rename sdk-component/src/test/java/group/rxcloud/capa/component/log/{agent => }/CapaLog4jAppenderAgentTest.java (97%) rename sdk-component/src/test/java/group/rxcloud/capa/component/log/{agent => }/CapaLogbackAppenderAgentTest.java (94%) rename sdk-component/src/test/java/group/rxcloud/capa/component/log/{agent => }/TestCapaLog4jAppender.java (92%) rename sdk-component/src/test/java/group/rxcloud/capa/component/log/{agent => }/TestCapaLogbackAppender.java (92%) create mode 100644 sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java create mode 100644 sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java rename {sdk-component/src/main/java/group/rxcloud/capa/component => sdk-spi/src/main/java/group/rxcloud/capa/spi}/log/configuration/LogSwitchConfiguration.java (98%) rename {sdk-component/src/main/java/group/rxcloud/capa/component => sdk-spi/src/main/java/group/rxcloud/capa/spi}/log/enums/CapaLogLevel.java (97%) rename {sdk-component/src/main/java/group/rxcloud/capa/component => sdk-spi/src/main/java/group/rxcloud/capa/spi}/log/manager/LogManager.java (96%) diff --git a/examples/pom.xml b/examples/pom.xml index 6eed8d9..61176e1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -31,7 +31,7 @@ capa-sdk-examples - 2.8.2 + 2.14.1 1.1.7 1.7.32 @@ -61,17 +61,17 @@ - + - + org.projectlombok diff --git a/examples/src/main/java/group/rxcloud/capa/examples/telemetry/DemoLog.java b/examples/src/main/java/group/rxcloud/capa/examples/log/DemoLog.java similarity index 97% rename from examples/src/main/java/group/rxcloud/capa/examples/telemetry/DemoLog.java rename to examples/src/main/java/group/rxcloud/capa/examples/log/DemoLog.java index 93ef506..b64ac9d 100644 --- a/examples/src/main/java/group/rxcloud/capa/examples/telemetry/DemoLog.java +++ b/examples/src/main/java/group/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/log4j2.xml b/examples/src/main/resources/logback.xml similarity index 65% rename from examples/src/main/resources/log4j2.xml rename to examples/src/main/resources/logback.xml index 3587353..37a87f2 100644 --- a/examples/src/main/resources/log4j2.xml +++ b/examples/src/main/resources/logback.xml @@ -15,17 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/examples/src/main/resources/xml/logback.xml b/examples/src/main/resources/xml/logback.xml index 268d16c..c2ddd8a 100644 --- a/examples/src/main/resources/xml/logback.xml +++ b/examples/src/main/resources/xml/logback.xml @@ -17,7 +17,7 @@ --> - + diff --git a/sdk-component/pom.xml b/sdk-component/pom.xml index 608b900..0808c0c 100644 --- a/sdk-component/pom.xml +++ b/sdk-component/pom.xml @@ -33,7 +33,7 @@ 4.9.1 1.4.10 - 2.8.2 + 2.14.1 1.1.7 19.0 3.11 diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java similarity index 93% rename from sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgent.java rename to sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java index 2957661..7e31d3d 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/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. @@ -100,12 +97,13 @@ public static CapaLog4jAppender buildCapaLog4jAppender() { @Override public void append(LogEvent event) { - if (event != null && event.getLevel() != null) { + logAppender.append(event); + /* if (event != null && event.getLevel() != null) { Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name()); if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { logAppender.appendLog(event); } - } + }*/ } /** @@ -118,6 +116,6 @@ public interface CapaLog4jAppender { * * @param event The log event. */ - void appendLog(LogEvent event); + void append(LogEvent event); } } diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java similarity index 87% rename from sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgent.java rename to sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java index fb9d86a..b56048f 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/component/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,13 @@ public static CapaLogbackAppender buildCapaLogbackAppender() { */ @Override protected void append(ILoggingEvent event) { - if (event != null && event.getLevel() != null) { + logbackAppender.append(event); + /* if (event != null && event.getLevel() != null) { Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr); if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { - logbackAppender.appendLog(event); + logbackAppender.append(event); } - } + }*/ } /** @@ -82,6 +79,7 @@ public interface CapaLogbackAppender { * * @param event The log event. */ - void appendLog(ILoggingEvent event); + void append(ILoggingEvent event); } } + diff --git a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgentTest.java b/sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgentTest.java similarity index 97% rename from sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgentTest.java rename to sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgentTest.java index 2b1ab7d..2cacb81 100644 --- a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgentTest.java +++ b/sdk-component/src/test/java/group/rxcloud/capa/component/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/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgentTest.java b/sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgentTest.java similarity index 94% rename from sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgentTest.java rename to sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgentTest.java index e8f3759..d88b99f 100644 --- a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgentTest.java +++ b/sdk-component/src/test/java/group/rxcloud/capa/component/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); } } \ No newline at end of file diff --git a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLog4jAppender.java b/sdk-component/src/test/java/group/rxcloud/capa/component/log/TestCapaLog4jAppender.java similarity index 92% rename from sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLog4jAppender.java rename to sdk-component/src/test/java/group/rxcloud/capa/component/log/TestCapaLog4jAppender.java index 4dbdca6..8ecff55 100644 --- a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLog4jAppender.java +++ b/sdk-component/src/test/java/group/rxcloud/capa/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()); } } \ No newline at end of file diff --git a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLogbackAppender.java b/sdk-component/src/test/java/group/rxcloud/capa/component/log/TestCapaLogbackAppender.java similarity index 92% rename from sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLogbackAppender.java rename to sdk-component/src/test/java/group/rxcloud/capa/component/log/TestCapaLogbackAppender.java index 67f911f..322c3ca 100644 --- a/sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/TestCapaLogbackAppender.java +++ b/sdk-component/src/test/java/group/rxcloud/capa/component/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 index 17fc340..984eb51 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/sdk-spi-demo/pom.xml b/sdk-spi-demo/pom.xml index cdfaf90..8c3e393 100644 --- a/sdk-spi-demo/pom.xml +++ b/sdk-spi-demo/pom.xml @@ -31,7 +31,7 @@ capa-sdk-spi-demo - 2.8.2 + 2.14.1 1.1.7 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 index f94df0f..36de41d 100644 --- 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,13 +16,13 @@ */ package group.rxcloud.capa.spi.demo.log; -import group.rxcloud.capa.component.log.agent.CapaLog4jAppenderAgent; +import group.rxcloud.capa.component.log.CapaLog4jAppenderAgent; import org.apache.logging.log4j.core.LogEvent; public class DemoLog4jAppender 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/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 index 8e5ee40..32b2d1b 100644 --- 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,7 +17,7 @@ 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.component.log.CapaLogbackAppenderAgent; public class DemoLogbackAppender implements CapaLogbackAppenderAgent.CapaLogbackAppender { @@ -25,7 +25,7 @@ public DemoLogbackAppender() { } @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-spi-demo/src/main/resources/capa-component-log.properties b/sdk-spi-demo/src/main/resources/capa-component-log.properties index 795f59b..cf90031 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/sdk-spi/pom.xml b/sdk-spi/pom.xml index d77b534..5f34201 100644 --- a/sdk-spi/pom.xml +++ b/sdk-spi/pom.xml @@ -32,6 +32,7 @@ 2.14.1 + 1.1.7 @@ -54,23 +55,25 @@ - + org.apache.logging.log4j log4j-core ${log4j.version} - test + true + - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - test + ch.qos.logback + logback-classic + + true + ${logback.version} diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java new file mode 100644 index 0000000..a51ddec --- /dev/null +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java @@ -0,0 +1,23 @@ +package group.rxcloud.capa.spi.log; + +import group.rxcloud.capa.component.log.CapaLog4jAppenderAgent; +import group.rxcloud.capa.spi.log.enums.CapaLogLevel; +import group.rxcloud.capa.spi.log.manager.LogManager; +import org.apache.logging.log4j.core.LogEvent; + +import java.util.Optional; + +public abstract class CapaLog4jAppenderSpi implements CapaLog4jAppenderAgent.CapaLog4jAppender { + + @Override + public void append(LogEvent event) { + if (event != null && event.getLevel()!= null) { + Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name()); + if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { + this.appendLog(event); + } + } + } + + protected abstract void appendLog(LogEvent event); +} diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java new file mode 100644 index 0000000..58af9df --- /dev/null +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java @@ -0,0 +1,25 @@ +package group.rxcloud.capa.spi.log; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.UnsynchronizedAppenderBase; +import group.rxcloud.capa.component.log.CapaLogbackAppenderAgent; +import group.rxcloud.capa.spi.log.enums.CapaLogLevel; +import group.rxcloud.capa.spi.log.manager.LogManager; + +import java.util.Optional; + +public abstract class CapaLogbackAppenderSpi extends UnsynchronizedAppenderBase + implements CapaLogbackAppenderAgent.CapaLogbackAppender { + + @Override + public void append(ILoggingEvent event) { + if (event != null && event.getLevel() != null) { + Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr); + if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { + this.append(event); + } + } + } + + protected abstract void appendLog(ILoggingEvent event); +} diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java similarity index 98% rename from sdk-component/src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java rename to sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java index 9d8d3f2..849a6ea 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.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.configuration; +package group.rxcloud.capa.spi.log.configuration; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/enums/CapaLogLevel.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/enums/CapaLogLevel.java similarity index 97% rename from sdk-component/src/main/java/group/rxcloud/capa/component/log/enums/CapaLogLevel.java rename to sdk-spi/src/main/java/group/rxcloud/capa/spi/log/enums/CapaLogLevel.java index 099fac3..4c70c3d 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/enums/CapaLogLevel.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/enums/CapaLogLevel.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.enums; +package group.rxcloud.capa.spi.log.enums; import java.util.Arrays; import java.util.Optional; diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/manager/LogManager.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java similarity index 96% rename from sdk-component/src/main/java/group/rxcloud/capa/component/log/manager/LogManager.java rename to sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java index fba8605..c73822c 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/manager/LogManager.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package group.rxcloud.capa.component.log.manager; +package group.rxcloud.capa.spi.log.manager; -import group.rxcloud.capa.component.log.configuration.LogSwitchConfiguration; -import group.rxcloud.capa.component.log.enums.CapaLogLevel; +import group.rxcloud.capa.spi.log.configuration.LogSwitchConfiguration; +import group.rxcloud.capa.spi.log.enums.CapaLogLevel; import java.util.Map; From 58ebe7434b9e93c5c025ef71533cd983c207dca5 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 3 Dec 2021 00:15:44 +0800 Subject: [PATCH 2/4] add common configuration --- examples/pom.xml | 8 +- .../resources/{logback.xml => log4j2.xml} | 23 +++-- examples/src/main/resources/xml/logback.xml | 10 -- pom.xml | 4 + .../component/log/CapaLog4jAppenderAgent.java | 8 +- .../log/CapaLogbackAppenderAgent.java | 6 -- .../hook/MergedPropertiesConfig.java | 4 + .../capa/spi/demo/log/DemoLog4jAppender.java | 6 +- .../spi/demo/log/DemoLogbackAppender.java | 5 +- .../capa/spi/log/CapaLog4jAppenderSpi.java | 2 +- .../capa/spi/log/CapaLogbackAppenderSpi.java | 4 +- .../log/configuration/LogConfiguration.java | 79 ++++++++++++++++ .../configuration/LogSwitchConfiguration.java | 91 ------------------- .../capa/spi/log/manager/LogManager.java | 55 +++++------ 14 files changed, 139 insertions(+), 166 deletions(-) rename examples/src/main/resources/{logback.xml => log4j2.xml} (65%) create mode 100644 sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogConfiguration.java delete mode 100644 sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java diff --git a/examples/pom.xml b/examples/pom.xml index 61176e1..d17eec8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -61,17 +61,17 @@ - + - + org.projectlombok diff --git a/examples/src/main/resources/logback.xml b/examples/src/main/resources/log4j2.xml similarity index 65% rename from examples/src/main/resources/logback.xml rename to examples/src/main/resources/log4j2.xml index 37a87f2..3587353 100644 --- a/examples/src/main/resources/logback.xml +++ b/examples/src/main/resources/log4j2.xml @@ -15,12 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/src/main/resources/xml/logback.xml b/examples/src/main/resources/xml/logback.xml index c2ddd8a..37a87f2 100644 --- a/examples/src/main/resources/xml/logback.xml +++ b/examples/src/main/resources/xml/logback.xml @@ -20,16 +20,6 @@ - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 9f817f4..73611d8 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,10 @@ reckless11 reckless0511@gmail.com + + dgzpg + 1711145024@qq.com + diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java index 7e31d3d..e2602ef 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java @@ -63,7 +63,7 @@ public CapaLog4jAppenderAgent(String name, Filter filter, Layout layout, boolean ignoreExceptions) { - super(name, filter, layout, ignoreExceptions); + super(name, filter, layout, ignoreExceptions, null); } /** @@ -98,12 +98,6 @@ public static CapaLog4jAppender buildCapaLog4jAppender() { @Override public void append(LogEvent event) { logAppender.append(event); - /* if (event != null && event.getLevel() != null) { - Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name()); - if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { - logAppender.appendLog(event); - } - }*/ } /** diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java index b56048f..d2a21f9 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java @@ -61,12 +61,6 @@ public static CapaLogbackAppender buildCapaLogbackAppender() { @Override protected void append(ILoggingEvent event) { logbackAppender.append(event); - /* if (event != null && event.getLevel() != null) { - Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr); - if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { - logbackAppender.append(event); - } - }*/ } /** diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java index 91fd138..4e47d5c 100644 --- a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java +++ b/sdk-infrastructure/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 getMerged(){ + return merged; + } + private void subscribeConfigurationByAppId(ConfigurationHooks configurationHooks, String appId, int index) { String storeName = configurationHooks.registryStoreNames().get(0); 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 index 36de41d..a087c3c 100644 --- 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,13 +16,13 @@ */ package group.rxcloud.capa.spi.demo.log; -import group.rxcloud.capa.component.log.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 append(LogEvent event) { + public void appendLog(LogEvent event) { System.out.println("Test log log4j and content is " + event.getMessage().getFormattedMessage()); } } 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 index 32b2d1b..3267727 100644 --- 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 @@ -18,14 +18,15 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import group.rxcloud.capa.component.log.CapaLogbackAppenderAgent; +import group.rxcloud.capa.spi.log.CapaLogbackAppenderSpi; -public class DemoLogbackAppender implements CapaLogbackAppenderAgent.CapaLogbackAppender { +public class DemoLogbackAppender extends CapaLogbackAppenderSpi { public DemoLogbackAppender() { } @Override - public void append(ILoggingEvent event) { + public void appendLog(ILoggingEvent event) { System.out.println("Test logback log and content is " + event.getFormattedMessage()); } } diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java index a51ddec..ee106c6 100644 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java @@ -13,7 +13,7 @@ public abstract class CapaLog4jAppenderSpi implements CapaLog4jAppenderAgent.Cap public void append(LogEvent event) { if (event != null && event.getLevel()!= null) { Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name()); - if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { + if (capaLogLevel.isPresent() && LogManager.whetherLogsCanOutput(capaLogLevel.get())) { this.appendLog(event); } } diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java index 58af9df..9bf51fd 100644 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java @@ -15,8 +15,8 @@ public abstract class CapaLogbackAppenderSpi extends UnsynchronizedAppenderBase< public void append(ILoggingEvent event) { if (event != null && event.getLevel() != null) { Optional capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr); - if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) { - this.append(event); + if (capaLogLevel.isPresent() && LogManager.whetherLogsCanOutput(capaLogLevel.get())) { + this.appendLog(event); } } } diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogConfiguration.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogConfiguration.java new file mode 100644 index 0000000..5437d15 --- /dev/null +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogConfiguration.java @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package group.rxcloud.capa.spi.log.configuration; + +import group.rxcloud.capa.infrastructure.CapaProperties; +import group.rxcloud.capa.infrastructure.hook.MergedPropertiesConfig; +import group.rxcloud.capa.infrastructure.hook.Mixer; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.Meter; +import org.apache.commons.lang3.StringUtils; + +import java.util.Optional; + +/** + * Log switch configuration + */ +public class LogConfiguration { + /** + * Log switch config file name. + */ + private static final String LOG_CONFIGURATION_COMMON_FILE_NAME = "log-configuration.properties"; + private static MergedPropertiesConfig mergedPropertiesConfig; + + static { + Mixer.configurationHooksNullable().ifPresent(hooks -> { + String suffix = "log-common"; + try { + mergedPropertiesConfig = new MergedPropertiesConfig(LOG_CONFIGURATION_COMMON_FILE_NAME, + hooks.defaultConfigurationAppId(), + CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply(suffix).getProperty("appId")); + } catch (Throwable throwable) { + Mixer.telemetryHooksNullable().ifPresent(telemetryHooks -> { + Meter meter = telemetryHooks.buildMeter("CloudWatchLogs").block(); + LongCounter longCounter = meter.counterBuilder("LogsError").build(); + Optional longCounterOptional = Optional.ofNullable(longCounter); + longCounterOptional.ifPresent(counter -> { + longCounter.bind(Attributes.of(AttributeKey.stringKey("LogsConfigurationError"), throwable.getMessage())) + .add(1); + }); + }); + } + }); + } + + public static boolean containsKey(String key) { + try { + return mergedPropertiesConfig != null && mergedPropertiesConfig.containsKey(key); + } finally { + return false; + } + } + + public static String get(String key) { + try { + return mergedPropertiesConfig == null + ? StringUtils.EMPTY + : mergedPropertiesConfig.get(key); + } finally { + return StringUtils.EMPTY; + } + } +} + diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java deleted file mode 100644 index 849a6ea..0000000 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/configuration/LogSwitchConfiguration.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package group.rxcloud.capa.spi.log.configuration; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import group.rxcloud.capa.infrastructure.hook.ConfigurationHooks; -import group.rxcloud.capa.infrastructure.hook.Mixer; -import group.rxcloud.cloudruntimes.domain.core.configuration.SubConfigurationResp; -import group.rxcloud.cloudruntimes.utils.TypeRef; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import reactor.core.publisher.Flux; - -import java.util.Map; -import java.util.Optional; - -/** - * Log switch configuration - */ -public class LogSwitchConfiguration { - - /** - * Capa configuration hooks. - */ - private static final Optional configurationHooks; - /** - * Log switch config file name. - */ - private static final String LOGS_SWITCH_CONFIG_FILE_NAME = "log-level-switch.properties"; - /** - * Log switch config's value. - */ - private static Map logsSwitchConfig = Maps.newHashMap(); - - /** - * Init configuration hooks and subscribe configuration. - */ - static { - configurationHooks = Mixer.configurationHooksNullable(); - configurationHooks.ifPresent(configurationHooks -> { - subscribeConfiguration(configurationHooks); - }); - } - - /** - * Subscribe configuration. - * - * @param configurationHooks - */ - private static void subscribeConfiguration(ConfigurationHooks configurationHooks) { - String storeName = configurationHooks.registryStoreNames().get(0); - String appId = configurationHooks.defaultConfigurationAppId(); - Flux> configFlux = configurationHooks.subscribeConfiguration( - storeName, - appId, - Lists.newArrayList(LOGS_SWITCH_CONFIG_FILE_NAME), - null, - StringUtils.EMPTY, - StringUtils.EMPTY, - TypeRef.get(Map.class)); - configFlux.subscribe(resp -> { - if (CollectionUtils.isNotEmpty(resp.getItems())) { - logsSwitchConfig = resp.getItems().get(0).getContent(); - } - }); - } - - /** - * Get the log switch config's values. - * - * @return the log switch config's values. - */ - public static Map getLogsSwitchConfig() { - return logsSwitchConfig; - } -} diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java index c73822c..9a32b4f 100644 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java @@ -16,11 +16,9 @@ */ package group.rxcloud.capa.spi.log.manager; -import group.rxcloud.capa.spi.log.configuration.LogSwitchConfiguration; +import group.rxcloud.capa.spi.log.configuration.LogConfiguration; import group.rxcloud.capa.spi.log.enums.CapaLogLevel; -import java.util.Map; - /** * LogManager, to manage log output levels. */ @@ -75,48 +73,43 @@ public class LogManager { * @param capaLogLevel * @return If the log can be output, it is true, otherwise it is false. */ - public static Boolean whetherLogsCanBeOutput(CapaLogLevel capaLogLevel) { - Map logsSwitchConfigs = LogSwitchConfiguration.getLogsSwitchConfig(); - //no configuration instance or logs switch configuration, then follow the default logic. - if (logsSwitchConfigs == null - || logsSwitchConfigs.isEmpty() - || Boolean.FALSE.equals(logsSwitchConfigs.get(LOG_LEVEL_SWITCH_NAME))) { + public static Boolean whetherLogsCanOutput(CapaLogLevel capaLogLevel) { + if (!LogConfiguration.containsKey(LOG_LEVEL_SWITCH_NAME) || Boolean.FALSE.equals(LogConfiguration.get(LOG_LEVEL_SWITCH_NAME))) { return isLogsLevelClosedWithDefault(capaLogLevel); } - switch (capaLogLevel) { case ALL: - return logsSwitchConfigs.get(ALL_LEVEL_SWITCH_NAME) == null + return LogConfiguration.containsKey(ALL_LEVEL_SWITCH_NAME) ? Boolean.FALSE - : logsSwitchConfigs.get(ALL_LEVEL_SWITCH_NAME); + : Boolean.parseBoolean(LogConfiguration.get(ALL_LEVEL_SWITCH_NAME)); case TRACE: - return logsSwitchConfigs.get(TRACE_LEVEL_SWITCH_NAME) == null + return LogConfiguration.containsKey(TRACE_LEVEL_SWITCH_NAME) ? Boolean.FALSE - : logsSwitchConfigs.get(TRACE_LEVEL_SWITCH_NAME); + : Boolean.parseBoolean(LogConfiguration.get(TRACE_LEVEL_SWITCH_NAME)); case DEBUG: - return logsSwitchConfigs.get(DEBUG_LEVEL_SWITCH_NAME) == null + return LogConfiguration.containsKey(DEBUG_LEVEL_SWITCH_NAME) ? Boolean.FALSE - : logsSwitchConfigs.get(DEBUG_LEVEL_SWITCH_NAME); + : Boolean.parseBoolean(LogConfiguration.get(DEBUG_LEVEL_SWITCH_NAME)); case INFO: - return logsSwitchConfigs.get(INFO_LEVEL_SWITCH_NAME) == null - ? Boolean.TRUE - : logsSwitchConfigs.get(INFO_LEVEL_SWITCH_NAME); + return LogConfiguration.containsKey(INFO_LEVEL_SWITCH_NAME) + ? Boolean.FALSE + : Boolean.parseBoolean(LogConfiguration.get(INFO_LEVEL_SWITCH_NAME)); case WARN: - return logsSwitchConfigs.get(WARN_LEVEL_SWITCH_NAME) == null - ? Boolean.TRUE - : logsSwitchConfigs.get(WARN_LEVEL_SWITCH_NAME); + return LogConfiguration.containsKey(WARN_LEVEL_SWITCH_NAME) + ? Boolean.FALSE + : Boolean.parseBoolean(LogConfiguration.get(WARN_LEVEL_SWITCH_NAME)); case ERROR: - return logsSwitchConfigs.get(ERROR_LEVEL_SWITCH_NAME) == null - ? Boolean.TRUE - : logsSwitchConfigs.get(ERROR_LEVEL_SWITCH_NAME); + return LogConfiguration.containsKey(ERROR_LEVEL_SWITCH_NAME) + ? Boolean.FALSE + : Boolean.parseBoolean(LogConfiguration.get(ERROR_LEVEL_SWITCH_NAME)); case FATAL: - return logsSwitchConfigs.get(FATAL_LEVEL_SWITCH_NAME) == null - ? Boolean.TRUE - : logsSwitchConfigs.get(FATAL_LEVEL_SWITCH_NAME); + return LogConfiguration.containsKey(FATAL_LEVEL_SWITCH_NAME) + ? Boolean.FALSE + : Boolean.parseBoolean(LogConfiguration.get(FATAL_LEVEL_SWITCH_NAME)); case OFF: - return logsSwitchConfigs.get(OFF_LEVEL_SWITCH_NAME) == null - ? Boolean.TRUE - : logsSwitchConfigs.get(OFF_LEVEL_SWITCH_NAME) == null; + return LogConfiguration.containsKey(OFF_LEVEL_SWITCH_NAME) + ? Boolean.FALSE + : Boolean.parseBoolean(LogConfiguration.get(OFF_LEVEL_SWITCH_NAME)); default: return Boolean.FALSE; } From d1b2aac19640f6ab6f0766dfa1075d5b3f6f4c59 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 3 Dec 2021 00:20:54 +0800 Subject: [PATCH 3/4] add header line --- .../capa/spi/log/CapaLog4jAppenderSpi.java | 16 ++++++++++++++++ .../capa/spi/log/CapaLogbackAppenderSpi.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java index ee106c6..12fbf3f 100644 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLog4jAppenderSpi.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package group.rxcloud.capa.spi.log; import group.rxcloud.capa.component.log.CapaLog4jAppenderAgent; diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java index 9bf51fd..ebef191 100644 --- a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java +++ b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/CapaLogbackAppenderSpi.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package group.rxcloud.capa.spi.log; import ch.qos.logback.classic.spi.ILoggingEvent; From 14397a50da6adf442b7707123f738e3c29ce9b26 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 3 Dec 2021 00:24:06 +0800 Subject: [PATCH 4/4] delete useless code --- .../group/rxcloud/capa/spi/demo/log/DemoLogbackAppender.java | 1 - 1 file changed, 1 deletion(-) 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 index 3267727..3d86c24 100644 --- 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,7 +17,6 @@ package group.rxcloud.capa.spi.demo.log; import ch.qos.logback.classic.spi.ILoggingEvent; -import group.rxcloud.capa.component.log.CapaLogbackAppenderAgent; import group.rxcloud.capa.spi.log.CapaLogbackAppenderSpi; public class DemoLogbackAppender extends CapaLogbackAppenderSpi {