Merge pull request #45521 from quaff

snicoll · snicoll · commit c25e330b2e0d · 2025-05-13T16:18:38.000+02:00
* pr/45521: Polish MetricsAutoConfiguration Closes gh-45521
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * 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.
@@ -56,7 +56,7 @@ public Clock micrometerClock() {
 	}
 
 	@Bean
-	public static MeterRegistryPostProcessor meterRegistryPostProcessor(ApplicationContext applicationContext,
+	static MeterRegistryPostProcessor meterRegistryPostProcessor(ApplicationContext applicationContext,
 			ObjectProvider<MetricsProperties> metricsProperties,
 			ObjectProvider<MeterRegistryCustomizer<?>> meterRegistryCustomizers,
 			ObjectProvider<MeterFilter> meterFilters, ObjectProvider<MeterBinder> meterBinders) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2022 the original author or authors.`
	`2`	`+ * Copyright 2012-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -56,7 +56,7 @@ public Clock micrometerClock() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Bean`
`59`		`- public static MeterRegistryPostProcessor meterRegistryPostProcessor(ApplicationContext applicationContext,`
	`59`	`+ static MeterRegistryPostProcessor meterRegistryPostProcessor(ApplicationContext applicationContext,`
`60`	`60`	`ObjectProvider<MetricsProperties> metricsProperties,`
`61`	`61`	`ObjectProvider<MeterRegistryCustomizer<?>> meterRegistryCustomizers,`
`62`	`62`	`ObjectProvider<MeterFilter> meterFilters, ObjectProvider<MeterBinder> meterBinders) {`