Merge pull request #70 from reactivegroup/feature/metrics

Fix Configuration data type casting.

Author: JasmineJ1230

examples/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-examples</artifactId>

pom.xml

@@ -23,7 +23,7 @@
     <groupId>group.rxcloud</groupId>
     <artifactId>capa-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.8.RELEASE</version>
+    <version>1.0.9.RELEASE</version>
     <name>capa-sdk-parent</name>
     <description>SDK for Capa.</description>
     <url>https://github.com/reactivegroup</url>

sdk-component/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-component</artifactId>

sdk-component/src/test/java/group/rxcloud/capa/component/telemetry/TestMixerProvider.java

@@ -25,18 +25,18 @@
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import reactor.core.publisher.Flux;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * @author: chenyijiang
  * @date: 2021/12/2 12:39
  */
 public class TestMixerProvider implements Mixer.MixerProvider {
 
-    Properties app = new Properties() {{put("metricsEnable", false);}};
-    Properties global = new Properties() {{put("traceEnable", false); put("metricsEnable", true);}};
+    Map<String, String> app = new HashMap() {{put("metricsEnable", false);}};
+    Map<String, String>  global = new HashMap() {{put("traceEnable", false); put("metricsEnable", true);}};
 
 
     private ConfigurationHooks configurationHooks = new ConfigurationHooks() {
@@ -53,7 +53,7 @@ public String defaultConfigurationAppId() {
         @Override
         public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, String label, TypeRef<T> type) {
 
-            if (type.getType() == Properties.class) {
+            if (type.getType() == Map.class) {
                 if ("123".equals(appId)) {
                     return Flux.just(getSubscribeResponse(global));
                 }
@@ -66,7 +66,7 @@ public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName
         }
     };
 
-    private <T> SubConfigurationResp<T> getSubscribeResponse(Properties samplerConfig) {
+    private <T> SubConfigurationResp<T> getSubscribeResponse(Map samplerConfig) {
         SubConfigurationResp<T> subConfigurationResp = new SubConfigurationResp<>();
         ConfigurationItem item = new ConfigurationItem();
         item.setContent(samplerConfig);

sdk-infrastructure/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-infrastructure</artifactId>

sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/MergedPropertiesConfig.java

@@ -18,12 +18,13 @@
 
 import group.rxcloud.cloudruntimes.domain.core.configuration.SubConfigurationResp;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
 /**
@@ -36,9 +37,11 @@
 @Deprecated
 public class MergedPropertiesConfig {
 
+    private static final Logger log = LoggerFactory.getLogger(MergedPropertiesConfig.class);
+
     private final String fileName;
 
-    private final AtomicReferenceArray<Properties> properties;
+    private final AtomicReferenceArray<Map> properties;
 
     private final Object lock = new Object();
 
@@ -50,7 +53,12 @@ public MergedPropertiesConfig(String fileName, String... appIds) {
         merged = new HashMap<>();
         Mixer.configurationHooksNullable().ifPresent(hooks -> {
             for (int i = 0; i < appIds.length; i++) {
-                subscribeConfigurationByAppId(hooks, appIds[i], i);
+                try {
+                    subscribeConfigurationByAppId(hooks, appIds[i], i);
+                } catch (Throwable throwable) {
+                    log.warn("Fail to subscribe config for app id " + appIds[i] + ", index " + i, throwable);
+                }
+
             }
         });
     }
@@ -70,14 +78,14 @@ public Map<String, String> getMerged() {
     private void subscribeConfigurationByAppId(ConfigurationHooks configurationHooks, String appId, int index) {
         String storeName = configurationHooks.registryStoreNames().get(0);
 
-        Flux<SubConfigurationResp<Properties>> configFlux = configurationHooks.subscribeConfiguration(
+        Flux<SubConfigurationResp<Map>> configFlux = configurationHooks.subscribeConfiguration(
                 storeName,
                 appId,
                 Collections.singletonList(fileName),
                 null,
                 "",
                 "",
-                TypeRef.get(Properties.class));
+                TypeRef.get(Map.class));
 
         // FIXME: 2021/12/3 random callback?
         configFlux.subscribe(resp -> {
@@ -90,7 +98,7 @@ private void subscribeConfigurationByAppId(ConfigurationHooks configurationHooks
 
                 Map<String, String> merged = new HashMap<>();
                 for (int i = 0; i < properties.length(); i++) {
-                    Properties item = properties.get(i);
+                    Map item = properties.get(i);
                     if (item != null) {
                         item.forEach((k, v) -> merged.putIfAbsent(String.valueOf(k), String.valueOf(v)));
                     }

sdk-spi-demo/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-spi-demo</artifactId>

sdk-spi/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-spi</artifactId>

sdk-springboot/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>sdk-springboot</artifactId>

sdk/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>1.0.8.RELEASE</version>
+        <version>1.0.9.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk</artifactId>