release: release 1.0.5.RELEASE version

Author: kevinten10

capa-spi-aws-config/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.5-alpha-1</version>
+        <version>1.0.5.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-config</artifactId>
@@ -51,7 +51,6 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- power mock -->
         <dependency>
             <groupId>org.powermock</groupId>

capa-spi-aws-infrastructure/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.5-alpha-1</version>
+        <version>1.0.5.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-infrastructure</artifactId>

capa-spi-aws-mesh/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.5-alpha-1</version>
+        <version>1.0.5.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-mesh</artifactId>
     <name>capa-skd-spi-aws-appmesh</name>
 
     <properties>
-        <capa-serializer.version>1.0.2.RELEASE</capa-serializer.version>
+        <capa-serializer.version>1.0.3.RELEASE</capa-serializer.version>
     </properties>
 
     <dependencies>

capa-spi-aws-telemetry/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.5-alpha-1</version>
+        <version>1.0.5.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-telemetry</artifactId>
@@ -33,17 +33,16 @@
         <slf4j.version>1.7.21</slf4j.version>
         <log4j.version>2.8.2</log4j.version>
         <logback.version>1.1.7</logback.version>
-        <commons-collections4.version>4.2</commons-collections4.version>
-        <commons-lang3.version>3.3.2</commons-lang3.version>
         <gson.version>2.8.0</gson.version>
-        <capa.addons.version>1.0.3-alpha-2</capa.addons.version>
+        <capa.addons.version>1.0.3.RELEASE</capa.addons.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-spi-aws-infrastructure</artifactId>
         </dependency>
+
         <dependency>
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-foundation</artifactId>
@@ -79,7 +78,6 @@
             <version>${logback.version}</version>
             <optional>true</optional>
         </dependency>
-
         <!--log4j-->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -88,17 +86,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/AwsCapaTelemetryProperties.java

@@ -0,0 +1,45 @@
+/*
+ * 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.aws.telemetry;
+
+
+import group.rxcloud.capa.infrastructure.CapaProperties;
+
+import java.util.Properties;
+
+public interface AwsCapaTelemetryProperties {
+
+    abstract class Settings {
+
+        private static String awsTraceId = "";
+
+        private static final String TELEMETRY_AWS_TRACE_ID_KEY = "TELEMETRY_AWS_TRACE_ID_KEY";
+
+        static {
+            Properties awsProperties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("telemetry-aws");
+
+            awsTraceId = awsProperties.getProperty(TELEMETRY_AWS_TRACE_ID_KEY, awsTraceId);
+        }
+
+        public static String getTelemetryAwsTraceIdKey() {
+            return awsTraceId;
+        }
+
+        private Settings() {
+        }
+    }
+}

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/log/appender/AbstractCapaAwsLogAppender.java

@@ -23,7 +23,7 @@
 import group.rxcloud.capa.spi.aws.telemetry.log.service.CloudWatchLogsService;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
-import org.apache.commons.lang3.StringUtils;
+import software.amazon.awssdk.utils.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -91,12 +91,6 @@ public abstract class AbstractCapaAwsLogAppender {
         });
     }
 
-    /**
-     *
-     * @param message
-     * @param tagsEndIndex
-     * @return
-     */
     protected Map<String, String> parseTags(String message, int tagsEndIndex) {
         Map<String, String> tags = null;
         int tagStart = 2;
@@ -149,7 +143,7 @@ protected void appendLogs(String message, Map<String, String> MDCTags, String lo
         tags = appendMDCTags(tags, MDCTags);
 
         Map<String, String> logMessageMap = new HashMap<>();
-        if (StringUtils.isNotEmpty(message)) {
+        if (StringUtils.isNotBlank(message)) {
             logMessageMap.put(LOG_DATA_NAME, message);
         }
         if (tags != null && !tags.isEmpty()) {

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/log/appender/CapaAwsLog4jAppender.java

@@ -16,7 +16,7 @@
  */
 package group.rxcloud.capa.spi.aws.telemetry.log.appender;
 
-import group.rxcloud.capa.component.log.agent.CapaLog4jAppenderAgent;
+import group.rxcloud.capa.component.log.CapaLog4jAppenderAgent;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import org.apache.logging.log4j.core.LogEvent;
@@ -38,7 +38,7 @@ public class CapaAwsLog4jAppender extends AbstractCapaAwsLogAppender
     }
 
     @Override
-    public void appendLog(LogEvent event) {
+    public void append(LogEvent event) {
         try {
             if (event == null
                     || event.getLevel() == null

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/log/appender/CapaAwsLogbackAppender.java

@@ -17,7 +17,7 @@
 package group.rxcloud.capa.spi.aws.telemetry.log.appender;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent;
+import group.rxcloud.capa.component.log.CapaLogbackAppenderAgent;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 
@@ -32,7 +32,7 @@ public class CapaAwsLogbackAppender extends AbstractCapaAwsLogAppender
     protected static final String LOG_LOGBACK_APPENDER_ERROR_TYPE = "LogbackAppendLogsError";
 
     @Override
-    public void appendLog(ILoggingEvent event) {
+    public void append(ILoggingEvent event) {
         try {
             if (event == null || event.getLevel() == null) {
                 return;

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/log/service/CloudWatchLogsService.java

@@ -24,8 +24,6 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogStreamRequest;
@@ -36,6 +34,7 @@
 import software.amazon.awssdk.services.cloudwatchlogs.model.InputLogEvent;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsResponse;
+import software.amazon.awssdk.utils.CollectionUtils;
 
 import java.util.Optional;
 
@@ -77,9 +76,9 @@ public static void putLogEvent(String message) {
                 .logStreamNamePrefix(APP_ID)
                 .build();
         DescribeLogStreamsResponse describeLogStreamsResponse = CLOUD_WATCH_LOGS_CLIENT.describeLogStreams(logStreamsRequest);
-        String sequenceToken = StringUtils.EMPTY;
+        String sequenceToken = "";
         if (describeLogStreamsResponse != null
-                && CollectionUtils.isNotEmpty(describeLogStreamsResponse.logStreams())) {
+                && !CollectionUtils.isNullOrEmpty(describeLogStreamsResponse.logStreams())) {
             sequenceToken = describeLogStreamsResponse.logStreams()
                     .get(0)
                     .uploadSequenceToken();

capa-spi-aws-telemetry/src/main/java/group/rxcloud/capa/spi/aws/telemetry/metrics/CloudWatchClientProvider.java

@@ -26,10 +26,10 @@
 public final class CloudWatchClientProvider {
 
     private static final CloudWatchClient CLIENT = CloudWatchClient.builder()
-                                                                   .region(Region
-                                                                           .of(CapaEnvironment.Provider.getInstance()
-                                                                                                       .getDeployRegion()))
-                                                                   .build();
+            .region(Region
+                    .of(CapaEnvironment.Provider.getInstance()
+                            .getDeployRegion()))
+            .build();
 
     private CloudWatchClientProvider() {
     }