Skip to content

Commit dc12f65

Browse files
committed
clean up
1 parent 2b15c92 commit dc12f65

File tree

6 files changed

+33
-8
lines changed

6 files changed

+33
-8
lines changed

kamon-spring-auto/src/test/scala/kamon/spring/auto/HttpMetricsAsyncSpec.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ class HttpMetricsAsyncSpec extends WordSpec
4242
with HttpClientSupport {
4343

4444
override protected def beforeAll(): Unit = {
45-
Kamon.reconfigure(ConfigFactory.load())
45+
applyConfig(
46+
"""
47+
|kamon {
48+
| metric.tick-interval = 10 millis
49+
|}
50+
""".stripMargin)
4651
startJettyApp()
4752
startRegistration()
4853
}

kamon-spring-auto/src/test/scala/kamon/spring/auto/HttpMetricsNoOpSpec.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ class HttpMetricsNoOpSpec extends WordSpec
4242
with HttpClientSupport {
4343

4444
override protected def beforeAll(): Unit = {
45-
Kamon.reconfigure(ConfigFactory.parseString("kamon.servlet.metrics.enabled=false").withFallback(ConfigFactory.load()))
45+
applyConfig(
46+
"""
47+
|kamon {
48+
| metric.tick-interval = 10 millis
49+
| servlet.metrics.enabled = false
50+
|}
51+
""".stripMargin)
4652
startJettyApp()
4753
startRegistration()
4854
}

kamon-spring-auto/src/test/scala/kamon/spring/auto/HttpMetricsSyncSpec.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ class HttpMetricsSyncSpec extends WordSpec
4242
with HttpClientSupport {
4343

4444
override protected def beforeAll(): Unit = {
45-
Kamon.reconfigure(ConfigFactory.load())
45+
applyConfig(
46+
"""
47+
|kamon {
48+
| metric.tick-interval = 10 millis
49+
|}
50+
""".stripMargin)
4651
startJettyApp()
4752
startRegistration()
4853
}

kamon-spring/src/test/scala/kamon/spring/HttpMetricsAsyncSpec.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ class HttpMetricsAsyncSpec extends WordSpec
4343
with HttpClientSupport {
4444

4545
override protected def beforeAll(): Unit = {
46-
Kamon.reconfigure(ConfigFactory.load())
46+
applyConfig(
47+
"""
48+
|kamon {
49+
| metric.tick-interval = 10 millis
50+
|}
51+
""".stripMargin)
4752
startJettyApp()
4853
startRegistration()
4954
}

kamon-spring/src/test/scala/kamon/spring/HttpMetricsNoOpSpec.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ class HttpMetricsNoOpSpec extends WordSpec
4343
with HttpClientSupport {
4444

4545
override protected def beforeAll(): Unit = {
46-
Kamon.reconfigure(ConfigFactory.parseString("kamon.servlet.metrics.enabled=false").withFallback(ConfigFactory.load()))
46+
applyConfig(
47+
"""
48+
|kamon {
49+
| metric.tick-interval = 10 millis
50+
| servlet.metrics.enabled = false
51+
|}
52+
""".stripMargin)
4753
startJettyApp()
4854
startRegistration()
4955
}

kamon-spring/src/test/scala/kamon/spring/HttpMetricsSyncSpec.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ class HttpMetricsSyncSpec extends WordSpec
4848
|kamon {
4949
| metric.tick-interval = 10 millis
5050
|}
51-
|
52-
""".stripMargin
53-
)
51+
""".stripMargin)
5452
startJettyApp()
5553
startRegistration()
5654
}

0 commit comments

Comments
 (0)