Merge branch '3.4.x' into 3.5.x

Closes spring-projectsgh-48324

Author: wilkinsona

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(ApplicationContext context) {
+		return new MeterRegistryCloser(context);
 	}
 
 	/**
@@ -81,17 +80,22 @@ MeterRegistryCloser meterRegistryCloser(ObjectProvider<MeterRegistry> meterRegis
 	 */
 	static class MeterRegistryCloser implements ApplicationListener<ContextClosedEvent> {
 
-		private final List<MeterRegistry> meterRegistries;
+		private final ApplicationContext context;
+
+		private final Iterable<MeterRegistry> meterRegistries;
 
-		MeterRegistryCloser(List<MeterRegistry> meterRegistries) {
-			this.meterRegistries = meterRegistries;
+		MeterRegistryCloser(ApplicationContext context) {
+			this.meterRegistries = context.getBeansOfType(MeterRegistry.class).values();
+			this.context = context;
 		}
 
 		@Override
 		public void onApplicationEvent(ContextClosedEvent event) {
-			for (MeterRegistry meterRegistry : this.meterRegistries) {
-				if (!meterRegistry.isClosed()) {
-					meterRegistry.close();
+			if (this.context.equals(event.getApplicationContext())) {
+				for (MeterRegistry meterRegistry : this.meterRegistries) {
+					if (!meterRegistry.isClosed()) {
+						meterRegistry.close();
+					}
 				}
 			}
 		}

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

@@ -42,6 +42,7 @@
  *
  * @author Andy Wilkinson
  * @author Moritz Halbritter
+ * @author Michael Berry
  */
 class MetricsAutoConfigurationTests {
 
@@ -89,6 +90,24 @@ void meterRegistryCloserShouldCloseRegistryOnShutdown() {
 		});
 	}
 
+	@Test
+	void meterRegistryCloserShouldOnlyCloseRegistriesBelongingToContextBeingClosed() {
+		MeterRegistry parentMeterRegistry = new SimpleMeterRegistry();
+		MeterRegistry childMeterRegistry = new SimpleMeterRegistry();
+		this.contextRunner.withBean(MeterRegistry.class, () -> parentMeterRegistry).run((parent) -> {
+			this.contextRunner.withBean(MeterRegistry.class, () -> childMeterRegistry)
+				.withParent(parent)
+				.run((child) -> {
+					assertThat(childMeterRegistry.isClosed()).isFalse();
+					assertThat(parentMeterRegistry.isClosed()).isFalse();
+				});
+			assertThat(childMeterRegistry.isClosed()).isTrue();
+			assertThat(parentMeterRegistry.isClosed()).isFalse();
+		});
+		assertThat(childMeterRegistry.isClosed()).isTrue();
+		assertThat(parentMeterRegistry.isClosed()).isTrue();
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomClockConfiguration {