Fikset tester og endret package navn for influxdb.

navikt · May 18, 2021 · 71a4d29 · 71a4d29
1 parent 7015125
commit 71a4d29
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 149 deletions.
diff --git a/...v/common/metrics/influx/DataPointRelay.kt → ...common/metrics/influxdb/DataPointRelay.kt b/...v/common/metrics/influx/DataPointRelay.kt → ...common/metrics/influxdb/DataPointRelay.kt
@@ -1,4 +1,4 @@
-package no.nav.personbruker.dittnav.common.metrics.influx
+package no.nav.personbruker.dittnav.common.metrics.influxdb
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

diff --git a/...nav/common/metrics/influx/InfluxConfig.kt → ...v/common/metrics/influxdb/InfluxConfig.kt b/...nav/common/metrics/influx/InfluxConfig.kt → ...v/common/metrics/influxdb/InfluxConfig.kt
@@ -1,4 +1,4 @@
-package no.nav.personbruker.dittnav.common.metrics.influx
+package no.nav.personbruker.dittnav.common.metrics.influxdb
 
 data class InfluxConfig (
     val hostName: String,

diff --git a/...n/metrics/influx/InfluxMetricsReporter.kt → ...metrics/influxdb/InfluxMetricsReporter.kt b/...n/metrics/influx/InfluxMetricsReporter.kt → ...metrics/influxdb/InfluxMetricsReporter.kt
@@ -1,4 +1,4 @@
-package no.nav.personbruker.dittnav.common.metrics.influx
+package no.nav.personbruker.dittnav.common.metrics.influxdb
 
 import no.nav.personbruker.dittnav.common.metrics.MetricsReporter
 import org.influxdb.dto.Point

diff --git a/...st/kotlin/no/nav/personbruker/dittnav/common/metrics/influx/BufferedDataPointRelayTest.kt b/...st/kotlin/no/nav/personbruker/dittnav/common/metrics/influx/BufferedDataPointRelayTest.kt
diff --git a/...t/kotlin/no/nav/personbruker/dittnav/common/metrics/influx/InfluxDataPointObjectMother.kt b/...t/kotlin/no/nav/personbruker/dittnav/common/metrics/influx/InfluxDataPointObjectMother.kt
diff --git a/.../kotlin/no/nav/personbruker/dittnav/common/metrics/influx/UnbufferedDataPointRelayTest.kt b/.../kotlin/no/nav/personbruker/dittnav/common/metrics/influx/UnbufferedDataPointRelayTest.kt
diff --git a/...trics/influx/InfluxMetricsReporterTest.kt → ...ics/influxdb/InfluxMetricsReporterTest.kt b/...trics/influx/InfluxMetricsReporterTest.kt → ...ics/influxdb/InfluxMetricsReporterTest.kt
@@ -1,4 +1,4 @@
-package no.nav.personbruker.dittnav.common.metrics.influx
+package no.nav.personbruker.dittnav.common.metrics.influxdb
 
 import io.mockk.coEvery
 import io.mockk.mockk
@@ -12,18 +12,25 @@ import java.util.concurrent.TimeUnit
 internal class InfluxMetricsReporterTest {
     val dataPointRelay: DataPointRelay = mockk()
 
+    val databaseName = "testdb"
+    val retentionPolicyName = "retention"
     val application = "testApp"
     val cluster = "test"
     val namespace = "test1"
 
-    val sensuConfig = InfluxConfig(
-        "", 0, "",
+    val influxConfig = InfluxConfig(
+        "",
+        "",
+        "",
+        0,
+        databaseName,
+        retentionPolicyName,
         application,
         cluster,
         namespace
     )
 
-    val metricsReporter = InfluxMetricsReporter(sensuConfig, dataPointRelay)
+    val metricsReporter = InfluxMetricsReporter(influxConfig, dataPointRelay)
 
     @Test
     fun `Should construct a data point and add time of measurement and application-global tags`() {

diff --git a/...-common-influxdb/src/test/kotlin/no/nav/personbruker/dittnav/common/metrics/util/delay.kt b/...-common-influxdb/src/test/kotlin/no/nav/personbruker/dittnav/common/metrics/util/delay.kt