Commit 149963bc authored by Tommy Ludwig's avatar Tommy Ludwig Committed by Andy Wilkinson

Auto-configure ClassLoaderMetrics

Auto-configure ClassLoaderMetrics as part of the JVM metrics from
Micrometer.

See gh-12022
parent 83e0978a
...@@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics; ...@@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics;
import io.micrometer.core.annotation.Timed; import io.micrometer.core.annotation.Timed;
import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics; import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics; import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics; import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
...@@ -92,6 +93,12 @@ public class MetricsAutoConfiguration { ...@@ -92,6 +93,12 @@ public class MetricsAutoConfiguration {
return new JvmThreadMetrics(); return new JvmThreadMetrics();
} }
@Bean
@ConditionalOnMissingBean
public ClassLoaderMetrics classLoaderMetrics() {
return new ClassLoaderMetrics();
}
} }
@Configuration @Configuration
......
...@@ -21,6 +21,7 @@ import java.util.List; ...@@ -21,6 +21,7 @@ import java.util.List;
import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.MeterBinder; import io.micrometer.core.instrument.binder.MeterBinder;
import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics; import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics; import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics; import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
...@@ -94,7 +95,8 @@ public class MetricsAutoConfigurationTests { ...@@ -94,7 +95,8 @@ public class MetricsAutoConfigurationTests {
public void autoConfiguresJvmMetrics() { public void autoConfiguresJvmMetrics() {
this.runner.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class) this.runner.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class)
.hasSingleBean(JvmMemoryMetrics.class) .hasSingleBean(JvmMemoryMetrics.class)
.hasSingleBean(JvmThreadMetrics.class)); .hasSingleBean(JvmThreadMetrics.class)
.hasSingleBean(ClassLoaderMetrics.class));
} }
@Test @Test
...@@ -102,7 +104,8 @@ public class MetricsAutoConfigurationTests { ...@@ -102,7 +104,8 @@ public class MetricsAutoConfigurationTests {
this.runner.withPropertyValues("management.metrics.binders.jvm.enabled=false") this.runner.withPropertyValues("management.metrics.binders.jvm.enabled=false")
.run((context) -> assertThat(context).doesNotHaveBean(JvmGcMetrics.class) .run((context) -> assertThat(context).doesNotHaveBean(JvmGcMetrics.class)
.doesNotHaveBean(JvmMemoryMetrics.class) .doesNotHaveBean(JvmMemoryMetrics.class)
.doesNotHaveBean(JvmThreadMetrics.class)); .doesNotHaveBean(JvmThreadMetrics.class)
.doesNotHaveBean(ClassLoaderMetrics.class));
} }
@Test @Test
...@@ -111,7 +114,8 @@ public class MetricsAutoConfigurationTests { ...@@ -111,7 +114,8 @@ public class MetricsAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class) .run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class)
.hasBean("customJvmGcMetrics") .hasBean("customJvmGcMetrics")
.hasSingleBean(JvmMemoryMetrics.class) .hasSingleBean(JvmMemoryMetrics.class)
.hasSingleBean(JvmThreadMetrics.class)); .hasSingleBean(JvmThreadMetrics.class)
.hasSingleBean(ClassLoaderMetrics.class));
} }
@Test @Test
...@@ -120,7 +124,8 @@ public class MetricsAutoConfigurationTests { ...@@ -120,7 +124,8 @@ public class MetricsAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class) .run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class)
.hasSingleBean(JvmMemoryMetrics.class) .hasSingleBean(JvmMemoryMetrics.class)
.hasBean("customJvmMemoryMetrics") .hasBean("customJvmMemoryMetrics")
.hasSingleBean(JvmThreadMetrics.class)); .hasSingleBean(JvmThreadMetrics.class)
.hasSingleBean(ClassLoaderMetrics.class));
} }
@Test @Test
...@@ -129,9 +134,20 @@ public class MetricsAutoConfigurationTests { ...@@ -129,9 +134,20 @@ public class MetricsAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class) .run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class)
.hasSingleBean(JvmMemoryMetrics.class) .hasSingleBean(JvmMemoryMetrics.class)
.hasSingleBean(JvmThreadMetrics.class) .hasSingleBean(JvmThreadMetrics.class)
.hasSingleBean(ClassLoaderMetrics.class)
.hasBean("customJvmThreadMetrics")); .hasBean("customJvmThreadMetrics"));
} }
@Test
public void allowsCustomClassLoaderMetricsToBeUsed() {
this.runner.withUserConfiguration(CustomClassLoaderMetricsConfiguration.class)
.run((context) -> assertThat(context).hasSingleBean(JvmGcMetrics.class)
.hasSingleBean(JvmMemoryMetrics.class)
.hasSingleBean(JvmThreadMetrics.class)
.hasSingleBean(ClassLoaderMetrics.class)
.hasBean("customClassLoaderMetrics"));
}
@Test @Test
public void autoConfiguresLogbackMetrics() { public void autoConfiguresLogbackMetrics() {
this.runner.run( this.runner.run(
...@@ -256,6 +272,16 @@ public class MetricsAutoConfigurationTests { ...@@ -256,6 +272,16 @@ public class MetricsAutoConfigurationTests {
} }
@Configuration
static class CustomClassLoaderMetricsConfiguration {
@Bean
ClassLoaderMetrics customClassLoaderMetrics() {
return new ClassLoaderMetrics();
}
}
@Configuration @Configuration
static class CustomLogbackMetricsConfiguration { static class CustomLogbackMetricsConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment