Skip to content

Commit c127425

Browse files
wilkinsonaphilwebb
authored andcommitted
Move metrics export into spring-boot-metrics
Issue: 46147
1 parent c2a2d04 commit c127425

File tree

176 files changed

+1816
-2445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+1816
-2445
lines changed

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

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -77,37 +77,16 @@ dependencies {
7777
optional("com.hazelcast:hazelcast-spring")
7878
optional("com.zaxxer:HikariCP")
7979
optional("io.lettuce:lettuce-core")
80-
optional("io.micrometer:micrometer-observation")
8180
optional("io.micrometer:micrometer-jakarta9")
81+
optional("io.micrometer:micrometer-observation")
8282
optional("io.micrometer:micrometer-tracing")
8383
optional("io.micrometer:micrometer-tracing-bridge-brave")
8484
optional("io.micrometer:micrometer-tracing-bridge-otel")
85-
optional("io.micrometer:micrometer-registry-appoptics")
86-
optional("io.micrometer:micrometer-registry-atlas") {
87-
exclude group: "javax.inject", module: "javax.inject"
88-
}
89-
optional("io.micrometer:micrometer-registry-datadog")
90-
optional("io.micrometer:micrometer-registry-dynatrace")
91-
optional("io.micrometer:micrometer-registry-elastic")
92-
optional("io.micrometer:micrometer-registry-ganglia")
93-
optional("io.micrometer:micrometer-registry-graphite")
94-
optional("io.micrometer:micrometer-registry-humio")
95-
optional("io.micrometer:micrometer-registry-influx")
96-
optional("io.micrometer:micrometer-registry-jmx")
97-
optional("io.micrometer:micrometer-registry-kairos")
98-
optional("io.micrometer:micrometer-registry-new-relic")
99-
optional("io.micrometer:micrometer-registry-otlp")
100-
optional("io.micrometer:micrometer-registry-prometheus")
101-
optional("io.micrometer:micrometer-registry-stackdriver") {
102-
exclude group: "javax.annotation", module: "javax.annotation-api"
103-
}
104-
optional("io.micrometer:micrometer-registry-signalfx")
105-
optional("io.micrometer:micrometer-registry-statsd")
10685
optional("io.zipkin.reporter2:zipkin-reporter-brave")
10786
optional("io.opentelemetry:opentelemetry-exporter-zipkin")
10887
optional("io.opentelemetry:opentelemetry-exporter-otlp")
10988
optional("io.projectreactor.netty:reactor-netty-http")
110-
optional("io.prometheus:prometheus-metrics-exporter-pushgateway")
89+
optional("io.prometheus:prometheus-metrics-tracer-common")
11190
optional("io.r2dbc:r2dbc-pool")
11291
optional("io.r2dbc:r2dbc-proxy")
11392
optional("io.r2dbc:r2dbc-spi")
@@ -152,8 +131,10 @@ dependencies {
152131
testImplementation(project(":spring-boot-project:spring-boot-test"))
153132
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
154133
testImplementation(project(":spring-boot-project:spring-boot-web-server-test"))
134+
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-metrics")))
155135
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
156136
testImplementation("io.micrometer:micrometer-observation-test")
137+
testImplementation("io.micrometer:micrometer-registry-prometheus")
157138
testImplementation("io.opentelemetry:opentelemetry-exporter-common")
158139
testImplementation("io.projectreactor:reactor-test")
159140
testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
@@ -174,6 +155,7 @@ dependencies {
174155
testImplementation("org.springframework.security:spring-security-test")
175156
testImplementation("org.yaml:snakeyaml")
176157

158+
testRuntimeOnly("io.grpc:grpc-api:1.72.0")
177159
testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
178160
testRuntimeOnly("jakarta.transaction:jakarta.transaction-api")
179161
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.springframework.beans.factory.ObjectProvider;
2222
import org.springframework.boot.actuate.autoconfigure.metrics.data.DataMetricsProperties.Repository;
23-
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
2423
import org.springframework.boot.actuate.metrics.data.DefaultRepositoryTagsProvider;
2524
import org.springframework.boot.actuate.metrics.data.MetricsRepositoryMethodInvocationListener;
2625
import org.springframework.boot.actuate.metrics.data.RepositoryTagsProvider;
@@ -32,6 +31,7 @@
3231
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3332
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
3433
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
34+
import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
3535
import org.springframework.context.annotation.Bean;
3636
import org.springframework.util.function.SingletonSupplier;
3737

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java

Lines changed: 0 additions & 194 deletions
This file was deleted.

0 commit comments

Comments
 (0)