Upgrade micrometer to version 1.14.0

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -195,7 +195,7 @@
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.9.1</version>
+        <version>1.14.0</version>
       </dependency>
       <dependency>
         <groupId>io.swagger.core.v3</groupId>

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

@@ -41,7 +41,7 @@ class DependencyConstraints {
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.20.Final")
     deps.put("log4j.version", "2.17.2")
-    deps.put("micrometer.version", "1.9.1")
+    deps.put("micrometer.version", "1.14.0")
     deps.put("shiro.version", "1.13.0")
     deps.put("slf4j-api.version", "1.7.32")
     deps.put("jboss-modules.version", "1.11.0.Final")

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -1001,7 +1001,9 @@ lib/lucene-analyzers-phonetic-6.6.6.jar
 lib/lucene-core-6.6.6.jar
 lib/lucene-queries-6.6.6.jar
 lib/lucene-queryparser-6.6.6.jar
-lib/micrometer-core-1.9.1.jar
+lib/micrometer-commons-1.14.0.jar
+lib/micrometer-core-1.14.0.jar
+lib/micrometer-observation-1.14.0.jar
 lib/mx4j-3.0.2.jar
 lib/mx4j-remote-3.0.2.jar
 lib/mx4j-tools-3.0.1.jar

geode-assembly/src/integrationTest/resources/expected_jars.txt

@@ -69,7 +69,9 @@ lucene-analyzers-phonetic
 lucene-core
 lucene-queries
 lucene-queryparser
+micrometer-commons
 micrometer-core
+micrometer-observation
 mx4j
 mx4j-remote
 mx4j-tools

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

@@ -27,6 +27,7 @@ jackson-core-2.17.0.jar
 jackson-datatype-jsr310-2.17.0.jar
 jackson-databind-2.17.0.jar
 swagger-annotations-2.2.22.jar
+jaxb-api-2.3.1.jar
 jopt-simple-5.0.4.jar
 log4j-slf4j-impl-2.17.2.jar
 log4j-core-2.17.2.jar
@@ -35,28 +36,28 @@ log4j-jul-2.17.2.jar
 log4j-api-2.17.2.jar
 spring-context-5.3.21.jar
 spring-core-5.3.21.jar
+jaxb-impl-2.3.2.jar
+javax.activation-1.2.0.jar
 lucene-analyzers-phonetic-6.6.6.jar
 lucene-analyzers-common-6.6.6.jar
 lucene-queryparser-6.6.6.jar
 lucene-core-6.6.6.jar
 httpclient-4.5.13.jar
 httpcore-4.4.15.jar
 HikariCP-4.0.3.jar
-jaxb-api-2.3.1.jar
 antlr-2.7.7.jar
 istack-commons-runtime-4.0.1.jar
-jaxb-impl-2.3.2.jar
 commons-validator-1.7.jar
-commons-beanutils-1.11.0.jar
 shiro-core-1.13.0.jar
 shiro-config-ogdl-1.13.0.jar
+commons-beanutils-1.11.0.jar
 commons-codec-1.15.jar
 commons-collections-3.2.2.jar
 commons-digester-2.1.jar
 commons-io-2.18.0.jar
 commons-logging-1.3.5.jar
 classgraph-4.8.147.jar
-micrometer-core-1.9.1.jar
+micrometer-core-1.14.0.jar
 fastutil-8.5.8.jar
 javax.resource-api-1.7.1.jar
 jetty-webapp-9.4.57.v20241219.jar
@@ -78,11 +79,13 @@ shiro-crypto-core-1.13.0.jar
 shiro-lang-1.13.0.jar
 slf4j-api-1.7.36.jar
 spring-beans-5.3.21.jar
-javax.activation-1.2.0.jar
 javax.activation-api-1.2.0.jar
 jline-2.12.jar
+byte-buddy-1.14.9.jar
 lucene-queries-6.6.6.jar
 spring-jcl-5.3.21.jar
+micrometer-observation-1.14.0.jar
+micrometer-commons-1.14.0.jar
 HdrHistogram-2.2.2.jar
 LatencyUtils-2.0.3.jar
 javax.transaction-api-1.3.jar
@@ -91,4 +94,3 @@ jetty-http-9.4.57.v20241219.jar
 jetty-io-9.4.57.v20241219.jar
 jetty-util-ajax-9.4.57.v20241219.jar
 jetty-util-9.4.57.v20241219.jar
-byte-buddy-1.14.9.jar

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java

@@ -14,7 +14,6 @@
  */
 package org.apache.geode.management.internal.cli.commands.lifecycle;
 
-import static io.micrometer.core.instrument.util.StringUtils.isNotBlank;
 import static org.apache.geode.management.internal.cli.shell.MXBeanProvider.getMemberMXBean;
 
 import java.util.concurrent.TimeUnit;
@@ -49,7 +48,7 @@ public ResultModel stopServer(
       throws Exception {
     ServerLauncher.ServerState serverState;
 
-    if (isNotBlank(member)) {
+    if (member != null && !member.trim().isEmpty()) {
       if (!isConnectedAndReady()) {
         return ResultModel.createError(CliStrings
             .format(CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Cache Server"));

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

@@ -1,94 +1,96 @@
-spring-web-5.3.21.jar
-shiro-event-1.13.0.jar
-shiro-crypto-hash-1.13.0.jar
-shiro-crypto-cipher-1.13.0.jar
-shiro-config-core-1.13.0.jar
-commons-digester-2.1.jar
-commons-validator-1.7.jar
-spring-jcl-5.3.21.jar
-commons-codec-1.15.jar
-classgraph-4.8.147.jar
-commons-logging-1.3.5.jar
-jackson-databind-2.17.0.jar
-geode-management-0.0.0.jar
-geode-core-0.0.0.jar
-javax.activation-1.2.0.jar
-javax.activation-api-1.2.0.jar
-javax.resource-api-1.7.1.jar
-LatencyUtils-2.0.3.jar
-jline-2.12.jar
-jetty-servlet-9.4.57.v20241219.jar
-spring-core-5.3.21.jar
-jetty-util-ajax-9.4.57.v20241219.jar
+geode-connectors-0.0.0.jar
 geode-cq-0.0.0.jar
-geode-old-client-support-0.0.0.jar
-javax.servlet-api-3.1.0.jar
-jgroups-3.6.20.Final.jar
-shiro-cache-1.13.0.jar
-httpcore-4.4.15.jar
-spring-beans-5.3.21.jar
-lucene-queries-6.6.6.jar
-shiro-core-1.13.0.jar
-HikariCP-4.0.3.jar
-slf4j-api-1.7.32.jar
-geode-http-service-0.0.0.jar
-commons-collections-3.2.2.jar
-httpclient-4.5.13.jar
-jna-5.11.0.jar
 geode-lucene-0.0.0.jar
-lucene-core-6.6.6.jar
-fastutil-8.5.8.jar
+geode-wan-0.0.0.jar
 geode-gfsh-0.0.0.jar
-jetty-http-9.4.57.v20241219.jar
+geode-log4j-0.0.0.jar
+geode-rebalancer-0.0.0.jar
 geode-memcached-0.0.0.jar
-rmiio-2.1.2.jar
+geode-old-client-support-0.0.0.jar
+geode-core-0.0.0.jar
+geode-management-0.0.0.jar
+geode-membership-0.0.0.jar
 geode-tcp-server-0.0.0.jar
-log4j-jcl-2.17.2.jar
-geode-connectors-0.0.0.jar
+geode-serialization-0.0.0.jar
+geode-http-service-0.0.0.jar
+geode-logging-0.0.0.jar
+geode-common-0.0.0.jar
+geode-unsafe-0.0.0.jar
+geode-deployment-legacy-0.0.0.jar
+snappy-0.5.jar
+swagger-annotations-2.2.22.jar
+jackson-datatype-jsr310-2.17.0.jar
+jackson-annotations-2.17.0.jar
 jackson-core-2.17.0.jar
-jetty-util-9.4.57.v20241219.jar
-log4j-slf4j-impl-2.17.2.jar
-lucene-analyzers-common-6.6.6.jar
-geode-membership-0.0.0.jar
-jetty-webapp-9.4.57.v20241219.jar
+jackson-datatype-joda-2.17.0.jar
+jackson-databind-2.17.0.jar
+httpclient-4.5.13.jar
+httpcore-4.4.15.jar
+HikariCP-4.0.3.jar
 commons-lang3-3.12.0.jar
-jopt-simple-5.0.4.jar
-swagger-annotations-2.2.22.jar
-snappy-0.5.jar
-geode-wan-0.0.0.jar
+jaxb-api-2.3.1.jar
+log4j-slf4j-impl-2.17.2.jar
+log4j-core-2.17.2.jar
+log4j-jcl-2.17.2.jar
+log4j-jul-2.17.2.jar
 log4j-api-2.17.2.jar
-geode-serialization-0.0.0.jar
+spring-shell-1.2.0.RELEASE.jar
+rmiio-2.1.2.jar
+antlr-2.7.7.jar
+commons-io-2.18.0.jar
+micrometer-core-1.14.0.jar
+javax.resource-api-1.7.1.jar
+shiro-core-1.13.0.jar
+jgroups-3.6.20.Final.jar
+commons-validator-1.7.jar
+fastutil-8.5.8.jar
+jna-platform-5.11.0.jar
+jna-5.11.0.jar
+jopt-simple-5.0.4.jar
+classgraph-4.8.147.jar
+jaxb-impl-2.3.2.jar
+javax.activation-1.2.0.jar
 istack-commons-runtime-4.0.1.jar
+spring-web-5.3.21.jar
+spring-context-5.3.21.jar
+spring-beans-5.3.21.jar
+spring-core-5.3.21.jar
+lucene-analyzers-phonetic-6.6.6.jar
+lucene-analyzers-common-6.6.6.jar
 lucene-queryparser-6.6.6.jar
-jetty-io-9.4.57.v20241219.jar
-geode-deployment-legacy-0.0.0.jar
+lucene-core-6.6.6.jar
+shiro-config-ogdl-1.13.0.jar
 commons-beanutils-1.11.0.jar
-log4j-core-2.17.2.jar
-shiro-crypto-core-1.13.0.jar
-jaxb-api-2.3.1.jar
-geode-unsafe-0.0.0.jar
-spring-shell-1.2.0.RELEASE.jar
-jaxb-impl-2.3.2.jar
-jna-platform-5.11.0.jar
-log4j-jul-2.17.2.jar
+commons-codec-1.15.jar
+commons-collections-3.2.2.jar
+commons-digester-2.1.jar
+commons-logging-1.3.5.jar
 HdrHistogram-2.2.2.jar
-jackson-annotations-2.17.0.jar
-micrometer-core-1.9.1.jar
-shiro-config-ogdl-1.13.0.jar
-geode-log4j-0.0.0.jar
-lucene-analyzers-phonetic-6.6.6.jar
-spring-context-5.3.21.jar
+jetty-webapp-9.4.57.v20241219.jar
+jetty-servlet-9.4.57.v20241219.jar
 jetty-security-9.4.57.v20241219.jar
-geode-logging-0.0.0.jar
-commons-io-2.18.0.jar
-shiro-lang-1.13.0.jar
-javax.transaction-api-1.3.jar
-geode-common-0.0.0.jar
-antlr-2.7.7.jar
-jetty-xml-9.4.57.v20241219.jar
-geode-rebalancer-0.0.0.jar
 jetty-server-9.4.57.v20241219.jar
-jackson-datatype-jsr310-2.17.0.jar
-jackson-datatype-joda-2.17.0.jar
+javax.servlet-api-3.1.0.jar
 joda-time-2.12.7.jar
+shiro-cache-1.13.0.jar
+shiro-crypto-hash-1.13.0.jar
+shiro-crypto-cipher-1.13.0.jar
+shiro-config-core-1.13.0.jar
+shiro-event-1.13.0.jar
+shiro-crypto-core-1.13.0.jar
+shiro-lang-1.13.0.jar
+slf4j-api-1.7.32.jar
+micrometer-observation-1.14.0.jar
+micrometer-commons-1.14.0.jar
+LatencyUtils-2.0.3.jar
+javax.transaction-api-1.3.jar
+javax.activation-api-1.2.0.jar
+jline-2.12.jar
 byte-buddy-1.14.9.jar
+lucene-queries-6.6.6.jar
+spring-jcl-5.3.21.jar
+jetty-xml-9.4.57.v20241219.jar
+jetty-http-9.4.57.v20241219.jar
+jetty-io-9.4.57.v20241219.jar
+jetty-util-ajax-9.4.57.v20241219.jar
+jetty-util-9.4.57.v20241219.jar