Move metrics export into spring-boot-metrics

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -60,37 +60,16 @@ dependencies {
 	optional("com.hazelcast:hazelcast-spring")
 	optional("com.zaxxer:HikariCP")
 	optional("io.lettuce:lettuce-core")
-	optional("io.micrometer:micrometer-observation")
 	optional("io.micrometer:micrometer-jakarta9")
+	optional("io.micrometer:micrometer-observation")
 	optional("io.micrometer:micrometer-tracing")
 	optional("io.micrometer:micrometer-tracing-bridge-brave")
 	optional("io.micrometer:micrometer-tracing-bridge-otel")
-	optional("io.micrometer:micrometer-registry-appoptics")
-	optional("io.micrometer:micrometer-registry-atlas") {
-		exclude group: "javax.inject", module: "javax.inject"
-	}
-	optional("io.micrometer:micrometer-registry-datadog")
-	optional("io.micrometer:micrometer-registry-dynatrace")
-	optional("io.micrometer:micrometer-registry-elastic")
-	optional("io.micrometer:micrometer-registry-ganglia")
-	optional("io.micrometer:micrometer-registry-graphite")
-	optional("io.micrometer:micrometer-registry-humio")
-	optional("io.micrometer:micrometer-registry-influx")
-	optional("io.micrometer:micrometer-registry-jmx")
-	optional("io.micrometer:micrometer-registry-kairos")
-	optional("io.micrometer:micrometer-registry-new-relic")
-	optional("io.micrometer:micrometer-registry-otlp")
-	optional("io.micrometer:micrometer-registry-prometheus")
-	optional("io.micrometer:micrometer-registry-stackdriver") {
-		exclude group: "javax.annotation", module: "javax.annotation-api"
-	}
-	optional("io.micrometer:micrometer-registry-signalfx")
-	optional("io.micrometer:micrometer-registry-statsd")
 	optional("io.zipkin.reporter2:zipkin-reporter-brave")
 	optional("io.opentelemetry:opentelemetry-exporter-zipkin")
 	optional("io.opentelemetry:opentelemetry-exporter-otlp")
 	optional("io.projectreactor.netty:reactor-netty-http")
-	optional("io.prometheus:prometheus-metrics-exporter-pushgateway")
+	optional("io.prometheus:prometheus-metrics-tracer-common")
 	optional("io.r2dbc:r2dbc-pool")
 	optional("io.r2dbc:r2dbc-proxy")
 	optional("io.r2dbc:r2dbc-spi")
@@ -135,8 +114,10 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-web-server-test"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-metrics")))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
 	testImplementation("io.micrometer:micrometer-observation-test")
+	testImplementation("io.micrometer:micrometer-registry-prometheus")
 	testImplementation("io.opentelemetry:opentelemetry-exporter-common")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
@@ -157,6 +138,7 @@ dependencies {
 	testImplementation("org.springframework.security:spring-security-test")
 	testImplementation("org.yaml:snakeyaml")
 
+	testRuntimeOnly("io.grpc:grpc-api:1.72.0")
 	testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
 	testRuntimeOnly("jakarta.transaction:jakarta.transaction-api")
 	testRuntimeOnly("org.opensaml:opensaml-core:4.0.1")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/data/RepositoryMetricsAutoConfiguration.java

@@ -20,7 +20,6 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.metrics.data.DataMetricsProperties.Repository;
-import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.actuate.metrics.data.DefaultRepositoryTagsProvider;
 import org.springframework.boot.actuate.metrics.data.MetricsRepositoryMethodInvocationListener;
 import org.springframework.boot.actuate.metrics.data.RepositoryTagsProvider;
@@ -32,6 +31,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.function.SingletonSupplier;