Make JCacheCacheMeterBinderProvider back off when user provides a bean (fixes #46212)

Signed-off-by: Siva Sai Udayagiri <[email protected]>

Author: siva-sai-udaygiri

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java

@@ -30,6 +30,7 @@
 import org.springframework.boot.actuate.metrics.cache.JCacheCacheMeterBinderProvider;
 import org.springframework.boot.actuate.metrics.cache.RedisCacheMeterBinderProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cache.caffeine.CaffeineCache;
 import org.springframework.cache.jcache.JCacheCache;
 import org.springframework.context.annotation.Bean;
@@ -83,6 +84,7 @@ HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() {
 	static class JCacheCacheMeterBinderProviderConfiguration {
 
 		@Bean
+		@ConditionalOnMissingBean(JCacheCacheMeterBinderProvider.class)
 		JCacheCacheMeterBinderProvider jCacheCacheMeterBinderProvider() {
 			return new JCacheCacheMeterBinderProvider();
 		}

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.metrics.cache;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.actuate.metrics.cache.JCacheCacheMeterBinderProvider;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class JCacheCacheMeterBinderProviderBackOffTests {
+
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+		.withConfiguration(AutoConfigurations.of(CacheMetricsAutoConfiguration.class));
+
+	@Test
+	void backsOffWhenUserProvidesProvider() {
+		JCacheCacheMeterBinderProvider custom = new JCacheCacheMeterBinderProvider();
+		this.contextRunner.withBean(JCacheCacheMeterBinderProvider.class, () -> custom).run((context) -> {
+			var bean = context.getBean(JCacheCacheMeterBinderProvider.class);
+			assertThat(bean).isSameAs(custom);
+		});
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java

@@ -22,6 +22,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpDelete;
@@ -65,66 +66,31 @@ protected HttpClientTransport(HttpClient client, HttpHost host) {
 		this.host = host;
 	}
 
-	/**
-	 * Perform an HTTP GET operation.
-	 * @param uri the destination URI
-	 * @return the operation response
-	 */
 	@Override
 	public Response get(URI uri) {
 		return execute(new HttpGet(uri));
 	}
 
-	/**
-	 * Perform an HTTP POST operation.
-	 * @param uri the destination URI
-	 * @return the operation response
-	 */
 	@Override
 	public Response post(URI uri) {
 		return execute(new HttpPost(uri));
 	}
 
-	/**
-	 * Perform an HTTP POST operation.
-	 * @param uri the destination URI
-	 * @param registryAuth registry authentication credentials
-	 * @return the operation response
-	 */
 	@Override
 	public Response post(URI uri, String registryAuth) {
 		return execute(new HttpPost(uri), registryAuth);
 	}
 
-	/**
-	 * Perform an HTTP POST operation.
-	 * @param uri the destination URI
-	 * @param contentType the content type to write
-	 * @param writer a content writer
-	 * @return the operation response
-	 */
 	@Override
 	public Response post(URI uri, String contentType, IOConsumer<OutputStream> writer) {
 		return execute(new HttpPost(uri), contentType, writer);
 	}
 
-	/**
-	 * Perform an HTTP PUT operation.
-	 * @param uri the destination URI
-	 * @param contentType the content type to write
-	 * @param writer a content writer
-	 * @return the operation response
-	 */
 	@Override
 	public Response put(URI uri, String contentType, IOConsumer<OutputStream> writer) {
 		return execute(new HttpPut(uri), contentType, writer);
 	}
 
-	/**
-	 * Perform an HTTP DELETE operation.
-	 * @param uri the destination URI
-	 * @return the operation response
-	 */
 	@Override
 	public Response delete(URI uri) {
 		return execute(new HttpDelete(uri));
@@ -149,22 +115,22 @@ private Response execute(HttpUriRequest request) {
 
 			if (statusCode >= 400 && statusCode <= 500) {
 				byte[] content = readContent(response);
+				// Always close the response for error paths
+				response.close();
 
+				// Special handling for proxy auth failures
 				if (statusCode == 407) {
-					response.close();
-
 					String detail = null;
 					Message json = deserializeMessage(content);
-					if (json != null && org.springframework.util.StringUtils.hasText(json.getMessage())) {
+					if (json != null && StringUtils.hasText(json.getMessage())) {
 						detail = json.getMessage();
 					}
-					else {
-						detail = new String(content, java.nio.charset.StandardCharsets.UTF_8);
+					else if (content != null) {
+						detail = new String(content, StandardCharsets.UTF_8);
 					}
 
 					String msg = "Proxy authentication required for host: " + this.host.toHostString() + ", uri: "
-							+ request.getUri()
-							+ (org.springframework.util.StringUtils.hasText(detail) ? " - " + detail : "");
+							+ request.getUri() + (StringUtils.hasText(detail) ? " - " + detail : "");
 
 					throw new ProxyAuthenticationException(msg);
 				}