Closing a child context no longer shuts down MeterRegistry instances\n\nSigned-off-by: Michael Berry <[email protected]>

Author: berry120

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAutoConfiguration.java

@@ -48,6 +48,7 @@
  * @author Stephane Nicoll
  * @author Moritz Halbritter
  * @author Phillip Webb
+ * @author Michael Berry
  * @since 4.0.0
  */
 @AutoConfiguration(before = CompositeMeterRegistryAutoConfiguration.class)
@@ -108,9 +109,11 @@ static class MeterRegistryCloser implements ApplicationListener<ContextClosedEve
 
 		@Override
 		public void onApplicationEvent(ContextClosedEvent event) {
-			for (MeterRegistry meterRegistry : this.meterRegistries) {
-				if (!meterRegistry.isClosed()) {
-					meterRegistry.close();
+			if(event.getApplicationContext().getParent() == null) {
+				for (MeterRegistry meterRegistry : this.meterRegistries) {
+					if (!meterRegistry.isClosed()) {
+						meterRegistry.close();
+					}
 				}
 			}
 		}

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAutoConfigurationTests.java

@@ -31,9 +31,12 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration.MeterRegistryCloser;
 import org.springframework.boot.micrometer.observation.autoconfigure.ObservationHandlerGroup;
+import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 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;
 
@@ -47,6 +50,7 @@
  * @author Andy Wilkinson
  * @author Moritz Halbritter
  * @author Phillip Webb
+ * @author Michael Berry
  */
 class MetricsAutoConfigurationTests {
 
@@ -95,6 +99,21 @@ 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();
+		});
+	}
+
+
 	@Test
 	void supplyHandlerAndGroup() {
 		this.contextRunner.run((context) -> {