Stop closing parent's MeterRegistry beans when child context closes

See gh-48319

Signed-off-by: Michael Berry <berry120@gmail.com>

Author: berry120

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
-import java.util.List;
-
 import io.micrometer.core.annotation.Timed;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -42,6 +40,7 @@
  * @author Jon Schneider
  * @author Stephane Nicoll
  * @author Moritz Halbritter
+ * @author Michael Berry
  * @since 2.0.0
  */
 @AutoConfiguration(before = CompositeMeterRegistryAutoConfiguration.class)
@@ -71,8 +70,8 @@ public PropertiesMeterFilter propertiesMeterFilter(MetricsProperties properties)
 	}
 
 	@Bean
-	MeterRegistryCloser meterRegistryCloser(ObjectProvider<MeterRegistry> meterRegistries) {
-		return new MeterRegistryCloser(meterRegistries.orderedStream().toList());
+	MeterRegistryCloser meterRegistryCloser() {
+		return new MeterRegistryCloser();
 	}
 
 	/**
@@ -81,17 +80,15 @@ MeterRegistryCloser meterRegistryCloser(ObjectProvider<MeterRegistry> meterRegis
 	 */
 	static class MeterRegistryCloser implements ApplicationListener<ContextClosedEvent> {
 
-		private final List<MeterRegistry> meterRegistries;
-
-		MeterRegistryCloser(List<MeterRegistry> meterRegistries) {
-			this.meterRegistries = meterRegistries;
-		}
-
 		@Override
 		public void onApplicationEvent(ContextClosedEvent event) {
-			for (MeterRegistry meterRegistry : this.meterRegistries) {
-				if (!meterRegistry.isClosed()) {
-					meterRegistry.close();
+			if (event.getApplicationContext().getParent() == null) {
+				for (MeterRegistry meterRegistry : event.getApplicationContext()
+					.getBeansOfType(MeterRegistry.class)
+					.values()) {
+					if (!meterRegistry.isClosed()) {
+						meterRegistry.close();
+					}
 				}
 			}
 		}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java

@@ -30,6 +30,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.annotation.Order;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -42,6 +43,7 @@
  *
  * @author Andy Wilkinson
  * @author Moritz Halbritter
+ * @author Michael Berry
  */
 class MetricsAutoConfigurationTests {
 
@@ -89,6 +91,20 @@ void meterRegistryCloserShouldCloseRegistryOnShutdown() {
 		});
 	}
 
+	@Test
+	void meterRegistryCloserShouldNotCloseOnNonRootContextClosing() {
+		this.contextRunner.withUserConfiguration(MeterRegistryConfiguration.class).run((context) -> {
+			MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
+			GenericApplicationContext childContext = new GenericApplicationContext();
+			childContext.setParent(context);
+			childContext.refresh();
+			childContext.close();
+			assertThat(meterRegistry.isClosed()).isFalse();
+			context.close();
+			assertThat(meterRegistry.isClosed()).isTrue();
+		});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomClockConfiguration {