Skip to content

Commit

Permalink
Apply workaround for spring-projects/spring-boot#26630
Browse files Browse the repository at this point in the history
  • Loading branch information
izeye committed May 26, 2021
1 parent c24fe53 commit d30fbe9
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 0 deletions.
39 changes: 39 additions & 0 deletions src/main/kotlin/com/izeye/sample/config/MetricsConfig.kt
@@ -0,0 +1,39 @@
package com.izeye.sample.config

import io.micrometer.core.instrument.MeterRegistry
import io.micrometer.core.instrument.binder.MeterBinder
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties
import org.springframework.boot.actuate.metrics.data.MetricsRepositoryMethodInvocationListener
import org.springframework.boot.actuate.metrics.data.RepositoryTagsProvider
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Lazy

/**
* Configuration for metrics.
*
* @author Johnny Lim
*/
@Configuration
class MetricsConfig {
@Bean
fun myMeterBinder(): MeterBinder {
return MeterBinder { registry: MeterRegistry -> registry.counter("binder.test") }
}

companion object {
// FIXME: See https://github.com/spring-projects/spring-boot/issues/26630
@Bean
fun metricsRepositoryMethodInvocationListener(
metricsProperties: MetricsProperties,
@Lazy registry: MeterRegistry,
tagsProvider: RepositoryTagsProvider
): MetricsRepositoryMethodInvocationListener {
val properties = metricsProperties.data.repository
return MetricsRepositoryMethodInvocationListener(
registry, tagsProvider, properties.metricName,
properties.autotime
)
}
}
}
19 changes: 19 additions & 0 deletions src/test/kotlin/com/izeye/sample/config/MetricsConfigTests.kt
@@ -0,0 +1,19 @@
package com.izeye.sample.config

import io.micrometer.core.instrument.MeterRegistry
import org.assertj.core.api.Assertions
import org.junit.jupiter.api.Test
import org.springframework.boot.test.context.SpringBootTest

/**
* Tests for [MetricsConfig].
*
* @author Johnny Lim
*/
@SpringBootTest
class MetricsConfigTests(val registry: MeterRegistry) {
@Test
fun userDefinedMeterBinderWorks() {
Assertions.assertThat(registry.find("binder.test").counter()).isNotNull
}
}
1 change: 1 addition & 0 deletions src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
spring.test.constructor.autowire.mode=all

0 comments on commit d30fbe9

Please sign in to comment.