Additional Tags for repository initialisation metrics.

Add the interface type name the repository is created for, query executors, as well as the number of fragments and measurements about potential post processors.

Author: christophstrobl

src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java

@@ -364,6 +364,7 @@ public BiFunction<Method, Object[], Object[]> getArgumentConverter() {
 	 * Value object representing an ordered list of {@link RepositoryFragment fragments}.
 	 *
 	 * @author Mark Paluch
+	 * @author Christoph Strobl
 	 */
 	public static class RepositoryFragments implements Streamable<RepositoryFragment<?>> {
 
@@ -550,6 +551,16 @@ private static Method findMethod(InvokedMethod invokedMethod, MethodLookup looku
 			return null;
 		}
 
+		/**
+		 * Returns the number of {@link RepositoryFragment fragments} available.
+		 *
+		 * @return the number of {@link RepositoryFragment fragments}.
+		 * @since 2.5
+		 */
+		public int size() {
+			return fragments.size();
+		}
+
 		/*
 		 * (non-Javadoc)
 		 * @see java.lang.Object#toString()

src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import org.aopalliance.intercept.MethodInterceptor;
@@ -37,7 +36,6 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.context.ApplicationContext;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.core.log.LogMessage;
@@ -280,12 +278,15 @@ public <T> T getRepository(Class<T> repositoryInterface, RepositoryFragments fra
 		ApplicationStartup applicationStartup = getStartup();
 
 		StartupStep repositoryInit = applicationStartup.start("spring.data.repository.init");
+		repositoryInit.tag("repository", () -> repositoryInterface.getName());
 
 		StartupStep repositoryMetadataStep = applicationStartup.start("spring.data.repository.metadata");
 		RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
 		repositoryMetadataStep.end();
 
 		StartupStep repositoryCompositionStep = applicationStartup.start("spring.data.repository.composition");
+		repositoryCompositionStep.tag("fragment.count", () -> String.valueOf(fragments.size()));
+
 		RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
 		RepositoryInformation information = getRepositoryInformation(metadata, composition);
 		repositoryCompositionStep.end();
@@ -309,45 +310,51 @@ public <T> T getRepository(Class<T> repositoryInterface, RepositoryFragments fra
 		result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 
 		StartupStep repositoryPostprocessorsStep = applicationStartup.start("spring.data.repository.postprocessors");
-		postProcessors.forEach(processor -> processor.postProcess(result, information));
+		postProcessors.forEach(processor -> {
+
+			StartupStep singlePostProcessor = applicationStartup.start("spring.data.repository.postprocessor");
+			singlePostProcessor.tag("type", processor.getClass().getName());
+			processor.postProcess(result, information);
+			singlePostProcessor.end();
+		});
 		repositoryPostprocessorsStep.end();
 
 		if (DefaultMethodInvokingMethodInterceptor.hasDefaultMethods(repositoryInterface)) {
 			result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
 		}
 
+		StartupStep queryExecutorsStep = applicationStartup.start("spring.data.repository.queryexecutors");
 		ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
 		Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
 				evaluationContextProvider);
 		result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
 				namedQueries, queryPostProcessors, methodInvocationListeners));
+		queryExecutorsStep.end();
 
 		composition = composition.append(RepositoryFragment.implemented(target));
 		result.addAdvice(new ImplementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
 
 		T repository = (T) result.getProxy(classLoader);
 		repositoryProxyStep.end();
+		repositoryInit.end();
 
 		if (logger.isDebugEnabled()) {
 			logger.debug(LogMessage.format("Finished creation of repository instance for {}.",
 				repositoryInterface.getName()));
 		}
 
-		repositoryInit.end();
 		return repository;
 	}
 
 	ApplicationStartup getStartup() {
 
 		try {
 
-			ApplicationStartup applicationStartup = beanFactory != null
-				? beanFactory.getBean(ApplicationStartup.class)
-				: ApplicationStartup.DEFAULT;
+			ApplicationStartup applicationStartup = beanFactory != null ? beanFactory.getBean(ApplicationStartup.class)
+					: ApplicationStartup.DEFAULT;
 
 			return applicationStartup != null ? applicationStartup : ApplicationStartup.DEFAULT;
-		}
-		catch (NoSuchBeanDefinitionException e) {
+		} catch (NoSuchBeanDefinitionException e) {
 			return ApplicationStartup.DEFAULT;
 		}
 	}

src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java

@@ -35,13 +35,15 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.metrics.ApplicationStartup;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -406,10 +408,19 @@ void considersNullabilityForKotlinInterfaceProperties() {
 	}
 
 	@Test // DATACMNS-1832
-	void callsApplicationStartupOnRepositoryIntialization() {
+	void callsApplicationStartupOnRepositoryInitialization() {
 
 		factory.getRepository(ObjectRepository.class, backingRepo);
-		verify(factory.getApplicationStartup()).start("spring.data.repository.init");
+
+		ApplicationStartup startup = factory.getApplicationStartup();
+
+		InOrder orderedInvocation = Mockito.inOrder(startup);
+		orderedInvocation.verify(startup).start("spring.data.repository.init");
+		orderedInvocation.verify(startup).start("spring.data.repository.metadata");
+		orderedInvocation.verify(startup).start("spring.data.repository.composition");
+		orderedInvocation.verify(startup).start("spring.data.repository.target");
+		orderedInvocation.verify(startup).start("spring.data.repository.proxy");
+		orderedInvocation.verify(startup).start("spring.data.repository.postprocessors");
 	}
 
 	private ConvertingRepository prepareConvertingRepository(final Object expectedValue) {