Log a warning when a health indicator takes too long to run

Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-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.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.health;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.Set;
 
@@ -51,9 +52,24 @@ public class HealthEndpoint extends HealthEndpointSupport<HealthContributor, Hea
 	 * Create a new {@link HealthEndpoint} instance.
 	 * @param registry the health contributor registry
 	 * @param groups the health endpoint groups
+	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
+	 * {@link #HealthEndpoint(HealthContributorRegistry, HealthEndpointGroups, Duration)}
 	 */
+	@Deprecated
 	public HealthEndpoint(HealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups);
+		super(registry, groups, null);
+	}
+
+	/**
+	 * Create a new {@link HealthEndpoint} instance.
+	 * @param registry the health contributor registry
+	 * @param groups the health endpoint groups
+	 * @param slowIndicatorLoggingThreshold duration after which slow health indicator
+	 * logging should occur
+	 */
+	public HealthEndpoint(HealthContributorRegistry registry, HealthEndpointGroups groups,
+			Duration slowIndicatorLoggingThreshold) {
+		super(registry, groups, slowIndicatorLoggingThreshold);
 	}
 
 	@ReadOperation

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-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.
@@ -16,14 +16,21 @@
 
 package org.springframework.boot.actuate.health;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.boot.actuate.endpoint.ApiVersion;
 import org.springframework.boot.actuate.endpoint.SecurityContext;
 import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
+import org.springframework.boot.convert.DurationStyle;
+import org.springframework.core.log.LogMessage;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -37,22 +44,30 @@ import org.springframework.util.StringUtils;
  */
 abstract class HealthEndpointSupport<C, T> {
 
+	private static final Log logger = LogFactory.getLog(HealthEndpointSupport.class);
+
 	static final Health DEFAULT_HEALTH = Health.up().build();
 
 	private final ContributorRegistry<C> registry;
 
 	private final HealthEndpointGroups groups;
 
+	private Duration slowIndicatorLoggingThreshold;
+
 	/**
 	 * Create a new {@link HealthEndpointSupport} instance.
 	 * @param registry the health contributor registry
 	 * @param groups the health endpoint groups
+	 * @param slowIndicatorLoggingThreshold duration after which slow health indicator
+	 * logging should occur
 	 */
-	HealthEndpointSupport(ContributorRegistry<C> registry, HealthEndpointGroups groups) {
+	HealthEndpointSupport(ContributorRegistry<C> registry, HealthEndpointGroups groups,
+			Duration slowIndicatorLoggingThreshold) {
 		Assert.notNull(registry, "Registry must not be null");
 		Assert.notNull(groups, "Groups must not be null");
 		this.registry = registry;
 		this.groups = groups;
+		this.slowIndicatorLoggingThreshold = slowIndicatorLoggingThreshold;
 	}
 
 	HealthResult<T> getHealth(ApiVersion apiVersion, WebServerNamespace serverNamespace,
@@ -127,7 +142,7 @@ abstract class HealthEndpointSupport<C, T> {
 					showDetails, groupNames);
 		}
 		if (contributor != null && (name.isEmpty() || group.isMember(name))) {
-			return getHealth((C) contributor, showDetails);
+			return getLoggedHealth((C) contributor, name, showDetails);
 		}
 		return null;
 	}
@@ -151,6 +166,25 @@ abstract class HealthEndpointSupport<C, T> {
 				groupNames);
 	}
 
+	private T getLoggedHealth(C contributor, String name, boolean showDetails) {
+		Instant start = Instant.now();
+		try {
+			return getHealth(contributor, showDetails);
+		}
+		finally {
+			if (logger.isWarnEnabled() && this.slowIndicatorLoggingThreshold != null) {
+				Duration duration = Duration.between(start, Instant.now());
+				if (duration.compareTo(this.slowIndicatorLoggingThreshold) > 0) {
+					String contributorClassName = contributor.getClass().getName();
+					Object contributorIdentifier = (!StringUtils.hasLength(name)) ? contributorClassName
+							: contributor.getClass().getName() + " (" + name + ")";
+					logger.warn(LogMessage.format("Health contributor %s took %s to respond", contributorIdentifier,
+							DurationStyle.SIMPLE.print(duration)));
+				}
+			}
+		}
+	}
+
 	protected abstract T getHealth(C contributor, boolean includeDetails);
 
 	protected abstract T aggregateContributions(ApiVersion apiVersion, Map<String, T> contributions,

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointWebExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-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.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.health;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
@@ -51,9 +52,24 @@ public class HealthEndpointWebExtension extends HealthEndpointSupport<HealthCont
 	 * Create a new {@link HealthEndpointWebExtension} instance.
 	 * @param registry the health contributor registry
 	 * @param groups the health endpoint groups
+	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
+	 * {@link #HealthEndpointWebExtension(HealthContributorRegistry, HealthEndpointGroups, Duration)}
 	 */
+	@Deprecated
 	public HealthEndpointWebExtension(HealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups);
+		super(registry, groups, null);
+	}
+
+	/**
+	 * Create a new {@link HealthEndpointWebExtension} instance.
+	 * @param registry the health contributor registry
+	 * @param groups the health endpoint groups
+	 * @param slowIndicatorLoggingThreshold duration after which slow health indicator
+	 * logging should occur
+	 */
+	public HealthEndpointWebExtension(HealthContributorRegistry registry, HealthEndpointGroups groups,
+			Duration slowIndicatorLoggingThreshold) {
+		super(registry, groups, slowIndicatorLoggingThreshold);
 	}
 
 	@ReadOperation

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthEndpointWebExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-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.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.health;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
@@ -51,9 +52,24 @@ public class ReactiveHealthEndpointWebExtension
 	 * Create a new {@link ReactiveHealthEndpointWebExtension} instance.
 	 * @param registry the health contributor registry
 	 * @param groups the health endpoint groups
+	 * @deprecated since 2.6.9 for removal in 3.0.0 in favor of
+	 * {@link #ReactiveHealthEndpointWebExtension(ReactiveHealthContributorRegistry, HealthEndpointGroups, Duration)}
 	 */
+	@Deprecated
 	public ReactiveHealthEndpointWebExtension(ReactiveHealthContributorRegistry registry, HealthEndpointGroups groups) {
-		super(registry, groups);
+		super(registry, groups, null);
+	}
+
+	/**
+	 * Create a new {@link ReactiveHealthEndpointWebExtension} instance.
+	 * @param registry the health contributor registry
+	 * @param groups the health endpoint groups
+	 * @param slowIndicatorLoggingThreshold duration after which slow health indicator
+	 * logging should occur
+	 */
+	public ReactiveHealthEndpointWebExtension(ReactiveHealthContributorRegistry registry, HealthEndpointGroups groups,
+			Duration slowIndicatorLoggingThreshold) {
+		super(registry, groups, slowIndicatorLoggingThreshold);
 	}
 
 	@ReadOperation