Auto-configure FileDescriptorMetrics

Auto-configures the FileDescriptorMetrics from Micrometer.

Author: Tommy Ludwig

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

@@ -23,6 +23,7 @@
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
 
@@ -126,6 +127,13 @@ public ProcessorMetrics processorMetrics() {
 			return new ProcessorMetrics();
 		}
 
+		@Bean
+		@ConditionalOnProperty(name = "management.metrics.binders.fds.enabled", matchIfMissing = true)
+		@ConditionalOnMissingBean
+		public FileDescriptorMetrics fileDescriptorMetrics() {
+			return new FileDescriptorMetrics();
+		}
+
 	}
 
 }

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

@@ -26,6 +26,7 @@
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
@@ -209,6 +210,28 @@ public void allowsCustomProcessorMetricsToBeUsed() {
 						.hasBean("customProcessorMetrics"));
 	}
 
+	@Test
+	public void autoConfiguresFileDescriptorMetrics() {
+		this.runner.run(
+				(context) -> assertThat(context)
+						.hasSingleBean(FileDescriptorMetrics.class));
+	}
+
+	@Test
+	public void allowsFileDescriptorMetricsToBeDisabled() {
+		this.runner.withPropertyValues("management.metrics.binders.fds.enabled=false")
+				.run((context) -> assertThat(context)
+						.doesNotHaveBean(FileDescriptorMetrics.class));
+	}
+
+	@Test
+	public void allowsCustomFileDescriptorToBeUsed() {
+		this.runner.withUserConfiguration(CustomFileDescriptorMetricsConfiguration.class)
+				.run((context) -> assertThat(context)
+						.hasSingleBean(FileDescriptorMetrics.class)
+						.hasBean("customFileDescriptorMetrics"));
+	}
+
 	@Configuration
 	static class CustomClockConfiguration {
 
@@ -311,4 +334,14 @@ ProcessorMetrics customProcessorMetrics() {
 
 	}
 
+	@Configuration
+	static class CustomFileDescriptorMetricsConfiguration {
+
+		@Bean
+		FileDescriptorMetrics customFileDescriptorMetrics() {
+			return new FileDescriptorMetrics();
+		}
+
+	}
+
 }