Merge pull request #73 from reckless11/feature_replace_foundation

feature:1.replace Foundation with CapaFoundation

Author: reckless11

capa-spi-aws-config/src/main/java/group/rxcloud/capa/spi/aws/config/AwsCapaConfigStore.java

@@ -16,8 +16,9 @@
  */
 package group.rxcloud.capa.spi.aws.config;
 
-import com.ctrip.framework.foundation.Foundation;
 import com.google.common.collect.Lists;
+import group.rxcloud.capa.addons.foundation.CapaFoundation;
+import group.rxcloud.capa.addons.foundation.FoundationType;
 import group.rxcloud.capa.component.CapaConfigurationProperties;
 import group.rxcloud.capa.component.configstore.ConfigurationItem;
 import group.rxcloud.capa.component.configstore.StoreConfig;
@@ -81,7 +82,7 @@ public class AwsCapaConfigStore extends CapaConfigStoreSpi {
 
     private AppConfigAsyncClient appConfigAsyncClient;
 
-    private static final String APPCONFIG_NAME_FORMAT="%s_%s";
+    private static final String APPCONFIG_NAME_FORMAT = "%s_%s";
 
     private static final Long REQUEST_TIMEOUT_IN_SECONDS = AwsCapaConfigurationProperties.AppConfigProperties.Settings.getRequestTimeoutInSeconds();
 
@@ -133,7 +134,7 @@ protected <T> Mono<List<ConfigurationItem<T>>> doGet(String appId, String group,
             return Mono.error(new CapaException(CapaErrorContext.PARAMETER_ERROR, "keys is null or empty"));
         }
 
-        String applicationName = String.format(APPCONFIG_NAME_FORMAT,appId, Foundation.server().getEnv().getName());
+        String applicationName = String.format(APPCONFIG_NAME_FORMAT, appId, CapaFoundation.getEnv(FoundationType.TRIP));
         String configurationName = keys.get(0);
 
         GetConfigurationRequest request = GetConfigurationRequest.builder()
@@ -153,7 +154,7 @@ protected <T> Mono<List<ConfigurationItem<T>>> doGet(String appId, String group,
     @Override
     protected <T> Flux<SubscribeResp<T>> doSubscribe(String appId, String group, String label, List<String> keys, Map<String, String> metadata, TypeRef<T> type) {
 
-        String applicationName = String.format(APPCONFIG_NAME_FORMAT,appId, Foundation.server().getEnv().getName());
+        String applicationName = String.format(APPCONFIG_NAME_FORMAT, appId, CapaFoundation.getEnv(FoundationType.TRIP));
         String configurationName = keys.get(0);
 
         initSubscribe(applicationName, configurationName, group, label, metadata, type);

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

@@ -17,7 +17,8 @@
 package group.rxcloud.capa.spi.aws.telemetry.metrics;
 
 
-import com.ctrip.framework.foundation.Foundation;
+import group.rxcloud.capa.addons.foundation.CapaFoundation;
+import group.rxcloud.capa.addons.foundation.FoundationType;
 import group.rxcloud.capa.component.telemetry.SamplerConfig;
 import group.rxcloud.capa.spi.telemetry.CapaMetricsExporterSpi;
 import io.opentelemetry.api.common.Attributes;
@@ -88,7 +89,7 @@ private static String getMetricName(MetricData data) {
 
     private static String getAppId() {
         try {
-            String appId = Foundation.app().getAppId();
+            String appId = CapaFoundation.getAppId(FoundationType.TRIP);
             return appId == null ? UNKNOWN : appId;
         } catch (Throwable e) {
             return UNKNOWN;

pom.xml

@@ -80,7 +80,7 @@
         <capa.version>1.10.12.RELEASE</capa.version>
         <aws-sdk.version>2.17.40</aws-sdk.version>
         <guava.version>19.0</guava.version>
-        <capa-addons.version>1.0.6.RELEASE</capa-addons.version>
+        <capa-addons.version>1.0.7.RELEASE</capa-addons.version>
         <junit.version>5.3.1</junit.version>
         <mockito-core.version>3.6.0</mockito-core.version>
         <powermock.version>2.0.9</powermock.version>