GH-2148: Use ObjectProvider to Locate MeterRegistry

**cherry-pick to 2.9.x, 2.8.x**

# Conflicts:
#	spring-kafka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/support/micrometer/MicrometerHolder.java

@@ -16,15 +16,11 @@
 
 package org.springframework.kafka.support.micrometer;
 
-import java.util.Collections;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.lang.Nullable;
 
 import io.micrometer.core.instrument.MeterRegistry;
@@ -69,50 +65,22 @@ public MicrometerHolder(@Nullable ApplicationContext context, String name,
 		if (context == null) {
 			throw new IllegalStateException("No micrometer registry present");
 		}
-		Map<String, MeterRegistry> registries = context.getBeansOfType(MeterRegistry.class, false, false);
-		this.timerName = timerName;
-		this.timerDesc = timerDesc;
-		this.name = name;
-		this.tags = tags;
-		registries = filterRegistries(registries, context);
-		if (registries.size() == 1) {
-			this.registry = registries.values().iterator().next();
-			buildTimer(NONE_EXCEPTION_METERS_KEY);
-		}
-		else {
-			throw new IllegalStateException("No micrometer registry present (or more than one and "
-					+ "none marked @Primary)");
-		}
-	}
-
-	private Map<String, MeterRegistry> filterRegistries(Map<String, MeterRegistry> registries,
-			ApplicationContext context) {
-
-		if (registries.size() == 1) {
-			return registries;
+		try {
+			this.registry = context.getBeanProvider(MeterRegistry.class).getIfUnique();
 		}
-		MeterRegistry primary = null;
-		if (context instanceof ConfigurableApplicationContext) {
-			BeanDefinitionRegistry bdr = (BeanDefinitionRegistry) ((ConfigurableApplicationContext) context)
-					.getBeanFactory();
-			for (Entry<String, MeterRegistry> entry : registries.entrySet()) {
-				BeanDefinition beanDefinition = bdr.getBeanDefinition(entry.getKey());
-				if (beanDefinition.isPrimary()) {
-					if (primary != null) {
-						primary = null;
-						break;
-					}
-					else {
-						primary = entry.getValue();
-					}
-				}
-			}
+		catch (NoUniqueBeanDefinitionException ex) {
+			throw new IllegalStateException(ex);
 		}
-		if (primary != null) {
-			return Collections.singletonMap("primary", primary);
+		if (this.registry != null) {
+			this.timerName = timerName;
+			this.timerDesc = timerDesc;
+			this.name = name;
+			this.tags = tags;
+			buildTimer(NONE_EXCEPTION_METERS_KEY);
 		}
 		else {
-			return registries;
+			throw new IllegalStateException("No micrometer registry present (or more than one and "
+					+ "there is not exactly one marked with @Primary)");
 		}
 	}
 

spring-kafka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -31,6 +30,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -51,9 +51,10 @@ public class MicrometerHolderTests {
 	void testMicrometerHolderRecordSuccessWorksGracefullyAfterDestroy() {
 		MeterRegistry meterRegistry = new SimpleMeterRegistry();
 		ApplicationContext ctx = mock(ApplicationContext.class);
+		ObjectProvider<MeterRegistry> beanProvider = mock(ObjectProvider.class);
+		given(ctx.getBeanProvider(MeterRegistry.class)).willReturn(beanProvider);
 		Timer.Sample sample = mock(Timer.Sample.class);
-		given(ctx.getBeansOfType(any(), anyBoolean(), anyBoolean()))
-				.willReturn(Collections.singletonMap("registry", meterRegistry));
+		given(beanProvider.getIfUnique()).willReturn(meterRegistry);
 
 		MicrometerHolder micrometerHolder = new MicrometerHolder(ctx, "holderName",
 				"timerName", "timerDesc", Collections.emptyMap());
@@ -68,21 +69,24 @@ void testMicrometerHolderRecordSuccessWorksGracefullyAfterDestroy() {
 
 		micrometerHolder.success(sample);
 
-		verify(ctx, times(1)).getBeansOfType(any(), anyBoolean(), anyBoolean());
+		verify(ctx, times(1)).getBeanProvider(any(Class.class));
 		verify(sample, times(1)).stop(any());
 		verifyNoMoreInteractions(ctx, sample);
 	}
 
 	@Test
 	void multiReg() {
 		assertThatIllegalStateException().isThrownBy(() -> new MicrometerHolder(
-				new AnnotationConfigApplicationContext(Config1.class), "", "", "", Collections.emptyMap()));
+					new AnnotationConfigApplicationContext(Config1.class), "", "", "", Collections.emptyMap()))
+				.withMessage("No micrometer registry present (or more than one and "
+						+ "there is not exactly one marked with @Primary)");
 	}
 
 	@Test
 	void twoPrimaries() {
 		assertThatIllegalStateException().isThrownBy(() -> new MicrometerHolder(
-				new AnnotationConfigApplicationContext(Config2.class), "", "", "", Collections.emptyMap()));
+					new AnnotationConfigApplicationContext(Config2.class), "", "", "", Collections.emptyMap()))
+			.withMessageContaining("more than one 'primary' bean");
 	}
 
 	@Test