Bump io.micrometer:micrometer-bom from 1.13.6 to 1.14.1 (#4639)

Author: SweetWuXiaoMei

demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/EtcdConfigIT.java

@@ -18,9 +18,12 @@
 package org.apache.servicecomb.samples;
 
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.demo.CategorizedTestCase;
 import org.apache.servicecomb.demo.TestMgr;
+import org.apache.servicecomb.foundation.common.utils.ConditionWaiter.SleepUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -71,9 +74,11 @@ private void testEnvironment() {
         "test1=env");
     putValue("/servicecomb/config/environment/production/application.properties",
         "test1=env1");
+
     testGetConfig("test1", "env1");
   }
 
+
   private void testApplication() {
 
     putValue("/servicecomb/config/application/production/demo-etcd/application.properties",
@@ -119,7 +124,7 @@ public void putValue(String key, String value) {
           ByteSequence.from(value, StandardCharsets.UTF_8)
       ).get();
 
-      LOGGER.info("Value set successfully");
+      LOGGER.info("Value set successfully:{}", value);
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -129,6 +134,13 @@ private void testGetConfig(String key, String expectValue) {
 
     String result = template
         .getForObject(Config.GATEWAY_URL + "/getConfig?key=" + key, String.class);
-    TestMgr.check(expectValue, result);
+
+    for (int i = 0; i < 4; i++) {
+      if (StringUtils.equals(expectValue, result)) {
+        TestMgr.check(expectValue, result);
+        break;
+      }
+      SleepUtil.sleep(500, TimeUnit.MILLISECONDS);
+    }
   }
 }

dependencies/default/pom.xml

@@ -65,7 +65,7 @@
     <log4j.version>1.2.17</log4j.version>
     <log4j2.version>2.24.1</log4j2.version>
     <maven-model.version>3.9.9</maven-model.version>
-    <micrometer.version>1.13.6</micrometer.version>
+    <micrometer.version>1.14.1</micrometer.version>
     <mockito.version>5.14.2</mockito.version>
     <mockito-inline.version>5.2.0</mockito-inline.version>
     <mock-server.version>5.15.0</mock-server.version>

dynamic-config/config-etcd/src/main/java/org/apache/servicecomb/config/etcd/EtcdClient.java

@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.config.BootStrapProperties;
 import org.apache.servicecomb.config.etcd.EtcdDynamicPropertiesSource.UpdateHandler;
+import org.apache.servicecomb.foundation.common.utils.MuteExceptionUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;

…ecomb/registry/etcd/ConditionWaiter.java …dation/common/utils/ConditionWaiter.javaservice-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/ConditionWaiter.java renamed to foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/ConditionWaiter.java service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/ConditionWaiter.java renamed to foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/ConditionWaiter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicecomb.registry.etcd;
+package org.apache.servicecomb.foundation.common.utils;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;

…ecomb/config/etcd/MuteExceptionUtil.java …tion/common/utils/MuteExceptionUtil.javadynamic-config/config-etcd/src/main/java/org/apache/servicecomb/config/etcd/MuteExceptionUtil.java renamed to foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/MuteExceptionUtil.java dynamic-config/config-etcd/src/main/java/org/apache/servicecomb/config/etcd/MuteExceptionUtil.java renamed to foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/MuteExceptionUtil.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicecomb.config.etcd;
+package org.apache.servicecomb.foundation.common.utils;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
@@ -24,11 +24,11 @@
 
 public class MuteExceptionUtil {
 
-  interface FunctionWithException<T, R> {
+  public interface FunctionWithException<T, R> {
     R apply(T t) throws Exception;
   }
 
-  interface FunctionWithDoubleParam<T1, T2, R> {
+  public interface FunctionWithDoubleParam<T1, T2, R> {
     R apply(T1 t1, T2 t2) throws Exception;
   }
 

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscovery.java

@@ -29,7 +29,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.config.BootStrapProperties;
 import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+import org.apache.servicecomb.foundation.common.utils.ConditionWaiter;
 import org.apache.servicecomb.foundation.common.utils.JsonUtils;
+import org.apache.servicecomb.foundation.common.utils.MuteExceptionUtil;
 import org.apache.servicecomb.registry.api.Discovery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdRegistration.java

@@ -26,6 +26,7 @@
 import org.apache.servicecomb.config.BootStrapProperties;
 import org.apache.servicecomb.config.DataCenterProperties;
 import org.apache.servicecomb.foundation.common.utils.JsonUtils;
+import org.apache.servicecomb.foundation.common.utils.MuteExceptionUtil;
 import org.apache.servicecomb.registry.RegistrationId;
 import org.apache.servicecomb.registry.api.DataCenterInfo;
 import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;