add common configuration

dgz-pg · dgz-pg · commit 58ebe7434b9e · 2021-12-03T00:15:44.000+08:00
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -61,17 +61,17 @@
             </exclusions>
         </dependency>
         <!-- slf4j -->
-       <!-- <dependency>
+        <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
             <version>${log4j.version}</version>
-        </dependency>-->
+        </dependency>
         <!-- logback -->
-         <dependency>
+         <!--<dependency>
              <groupId>ch.qos.logback</groupId>
              <artifactId>logback-classic</artifactId>
              <version>${logback.version}</version>
-         </dependency>
+         </dependency>-->
         <!--lombok-->
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/examples/src/main/resources/log4j2.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.
   -->
-<configuration>
-    <!--Log-->
-    <appender name="Log" class="group.rxcloud.capa.component.log.CapaLogbackAppenderAgent">
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="Log"/>
-    </root>
-</configuration>
+<Configuration status="DEBUG">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+        <CapaLog4jAppender name="log"/>
+    </Appenders>
+    <Loggers>
+        <Root level="INFO">
+            <AppenderRef ref="Console"/>
+            <AppenderRef ref="log"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/examples/src/main/resources/xml/logback.xml b/examples/src/main/resources/xml/logback.xml
@@ -20,16 +20,6 @@
     <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/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<? extends Serializable> 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 = 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
@@ -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 = 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
@@ -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/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
@@ -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
@@ -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 = 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
@@ -15,8 +15,8 @@ public abstract class CapaLogbackAppenderSpi extends UnsynchronizedAppenderBase<
     public 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())) {
-                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
@@ -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<LongCounter> 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
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

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ public String get(String key) {`
`58`	`58`	`return merged.get(key);`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ public Map<String, String> getMerged(){`
	`62`	`+ return merged;`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`private void subscribeConfigurationByAppId(ConfigurationHooks configurationHooks, String appId, int index) {`
`62`	`66`	`String storeName = configurationHooks.registryStoreNames().get(0);`
`63`	`67`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@`
`16`	`16`	`*/`
`17`	`17`	`package group.rxcloud.capa.spi.demo.log;`
`18`	`18`
`19`		`-import group.rxcloud.capa.component.log.CapaLog4jAppenderAgent;`
	`19`	`+import group.rxcloud.capa.spi.log.CapaLog4jAppenderSpi;`
`20`	`20`	`import org.apache.logging.log4j.core.LogEvent;`
`21`	`21`
`22`		`-public class DemoLog4jAppender implements CapaLog4jAppenderAgent.CapaLog4jAppender {`
	`22`	`+public class DemoLog4jAppender extends CapaLog4jAppenderSpi {`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public void append(LogEvent event) {`
	`25`	`+ public void appendLog(LogEvent event) {`
`26`	`26`	`System.out.println("Test log log4j and content is " + event.getMessage().getFormattedMessage());`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,15 @@`
`18`	`18`
`19`	`19`	`import ch.qos.logback.classic.spi.ILoggingEvent;`
`20`	`20`	`import group.rxcloud.capa.component.log.CapaLogbackAppenderAgent;`
	`21`	`+import group.rxcloud.capa.spi.log.CapaLogbackAppenderSpi;`
`21`	`22`
`22`		`-public class DemoLogbackAppender implements CapaLogbackAppenderAgent.CapaLogbackAppender {`
	`23`	`+public class DemoLogbackAppender extends CapaLogbackAppenderSpi {`
`23`	`24`
`24`	`25`	`public DemoLogbackAppender() {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`@Override`
`28`		`- public void append(ILoggingEvent event) {`
	`29`	`+ public void appendLog(ILoggingEvent event) {`
`29`	`30`	`System.out.println("Test logback log and content is " + event.getFormattedMessage());`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public abstract class CapaLog4jAppenderSpi implements CapaLog4jAppenderAgent.Cap`
`13`	`13`	`public void append(LogEvent event) {`
`14`	`14`	`if (event != null && event.getLevel()!= null) {`
`15`	`15`	`Optional<CapaLogLevel> capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name());`
`16`		`- if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) {`
	`16`	`+ if (capaLogLevel.isPresent() && LogManager.whetherLogsCanOutput(capaLogLevel.get())) {`
`17`	`17`	`this.appendLog(event);`
`18`	`18`	`}`
`19`	`19`	`}`