diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLog4jAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLog4jAppenderAgent.java index 1339ff6..37386e8 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLog4jAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLog4jAppenderAgent.java @@ -16,12 +16,6 @@ */ package group.rxcloud.capa.component.telemetry.log.agent; -/** - * @Author gpeng - * @Date 2021/11/17 14:16 - */ - -import group.rxcloud.capa.component.telemetry.log.appender.CapaLog4jAppender; import group.rxcloud.capa.infrastructure.config.CapaProperties; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; @@ -116,5 +110,16 @@ public void append(LogEvent event) { logAppender.appendLog(event); } + /** + * The abstract api of the log4j appender impl.Implement this and provide your specific impl. + */ + public interface CapaLog4jAppender { + /** + * Deal with the log. + * + * @param event The log event. + */ + void appendLog(LogEvent event); + } } diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLogbackAppenderAgent.java b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLogbackAppenderAgent.java index 8e97a2e..ba43eed 100644 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLogbackAppenderAgent.java +++ b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/agent/CapaLogbackAppenderAgent.java @@ -17,7 +17,6 @@ package group.rxcloud.capa.component.telemetry.log.agent; import ch.qos.logback.core.UnsynchronizedAppenderBase; -import group.rxcloud.capa.component.telemetry.log.appender.CapaLogbackAppender; import group.rxcloud.capa.infrastructure.config.CapaProperties; import java.lang.reflect.Constructor; @@ -73,4 +72,17 @@ public static CapaLogbackAppender buildCapaLogbackAppender() { protected void append(EVENT event) { logbackAppender.appendLog(event); } + + /** + * The abstract api of the logback appender impl.Implement this and provide your specific impl. + */ + public interface CapaLogbackAppender { + + /** + * Deal with the log. + * + * @param event The log event. + */ + void appendLog(EVENT event); + } } diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLog4jAppender.java b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLog4jAppender.java deleted file mode 100644 index 1ce66f3..0000000 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLog4jAppender.java +++ /dev/null @@ -1,32 +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.component.telemetry.log.appender; - -import org.apache.logging.log4j.core.LogEvent; - -/** - * The abstract api of the log4j appender impl.Implement this and provide your specific impl. - */ -public abstract class CapaLog4jAppender { - - /** - * Deal with the log. - * - * @param event The log event. - */ - public abstract void appendLog(LogEvent event); -} diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLogbackAppender.java b/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLogbackAppender.java deleted file mode 100644 index 45b8963..0000000 --- a/sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/log/appender/CapaLogbackAppender.java +++ /dev/null @@ -1,31 +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.component.telemetry.log.appender; - - -/** - * The abstract api of the logback appender impl.Implement this and provide your specific impl. - */ -public abstract class CapaLogbackAppender { - - /** - * Deal with the log. - * - * @param event The log event. - */ - public abstract void appendLog(EVENT event); -} diff --git a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLog4jAppender.java b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLog4jAppender.java index 80e8ab4..add96e4 100644 --- a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLog4jAppender.java +++ b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLog4jAppender.java @@ -16,11 +16,10 @@ */ package group.rxcloud.capa.spi.demo.telemetry.log; -import group.rxcloud.capa.component.telemetry.log.appender.CapaLog4jAppender; +import group.rxcloud.capa.component.telemetry.log.agent.CapaLog4jAppenderAgent; import org.apache.logging.log4j.core.LogEvent; - -public class DemoLog4jAppender extends CapaLog4jAppender { +public class DemoLog4jAppender implements CapaLog4jAppenderAgent.CapaLog4jAppender { @Override public void appendLog(LogEvent event) { diff --git a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLogbackAppender.java b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLogbackAppender.java index ad7c3a2..d11320d 100644 --- a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLogbackAppender.java +++ b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/telemetry/log/DemoLogbackAppender.java @@ -17,9 +17,9 @@ package group.rxcloud.capa.spi.demo.telemetry.log; import ch.qos.logback.classic.spi.ILoggingEvent; -import group.rxcloud.capa.component.telemetry.log.appender.CapaLogbackAppender; +import group.rxcloud.capa.component.telemetry.log.agent.CapaLogbackAppenderAgent; -public class DemoLogbackAppender extends CapaLogbackAppender { +public class DemoLogbackAppender implements CapaLogbackAppenderAgent.CapaLogbackAppender { 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 index cdf5815..879e78e 100644 --- a/sdk-spi-demo/src/main/resources/capa-component-log.properties +++ b/sdk-spi-demo/src/main/resources/capa-component-log.properties @@ -1,2 +1,2 @@ -group.rxcloud.capa.component.telemetry.log.appender.CapaLog4jAppender=group.rxcloud.capa.spi.demo.telemetry.log.DemoLog4jAppender -group.rxcloud.capa.component.telemetry.log.appender.CapaLogbackAppender=group.rxcloud.capa.spi.demo.telemetry.log.DemoLogbackAppender \ No newline at end of file +group.rxcloud.capa.component.telemetry.log.agent.CapaLog4jAppenderAgent$CapaLog4jAppender=group.rxcloud.capa.spi.demo.telemetry.log.DemoLog4jAppender +group.rxcloud.capa.component.telemetry.log.agent.CapaLogbackAppenderAgent$CapaLogbackAppender=group.rxcloud.capa.spi.demo.telemetry.log.DemoLogbackAppender \ No newline at end of file