Count migrations by section (#420)

* Count migrations by section

* Tidy logging

Author: mmwinther

http/http-request.http

@@ -140,7 +140,7 @@ Authorization: Bearer {{OIDC_TOKEN}}
 
 > {%
     client.test("Request executed successfully", function() {
-        client.assert(response.status === 200, "Request failed");
+        client.assert(response.status === 201, "Request failed");
     });
 %}
 

src/main/kotlin/no/ssb/metadata/vardef/integrations/dapla/models/Dapla.kt

@@ -11,6 +11,8 @@ import io.micronaut.serde.config.naming.SnakeCaseStrategy
 @Serdeable(naming = SnakeCaseStrategy::class)
 data class Team(
     val uniformName: String,
+    val sectionCode: String,
+    val sectionName: String,
 )
 
 @JsonIgnoreProperties(ignoreUnknown = true)

src/main/kotlin/no/ssb/metadata/vardef/integrations/dapla/services/StaticDaplaTeamService.kt

@@ -29,6 +29,8 @@ const val DAPLA_PROPERTY = "dapla"
 @EachProperty(DAPLA_TEAM_PROPERTY_NAME)
 class StaticDaplaTeam(
     @param:Parameter val uniformName: String,
+    @param:Parameter val sectionCode: String,
+    @param:Parameter val sectionName: String,
     @param:Property(name = "dapla-teams.static-data-path")
     private val path: Path,
     private val jsonMapper: JsonMapper,
@@ -104,6 +106,8 @@ class StaticDaplaTeamService(
             val team: StaticDaplaTeam = beanContext.getBean(StaticDaplaTeam::class.java, Qualifiers.byName(teamName))
             Team(
                 uniformName = team.uniformName,
+                sectionCode = team.sectionCode,
+                sectionName = team.sectionName,
             )
         }.onFailure { e ->
             logger.error("Error fetching static team with name '$teamName': ${e.message}", e)

src/main/kotlin/no/ssb/metadata/vardef/integrations/vardok/services/VardokApiService.kt

@@ -2,33 +2,22 @@ package no.ssb.metadata.vardef.integrations.vardok.services
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-import io.micrometer.core.instrument.MeterRegistry
 import io.micronaut.http.client.exceptions.HttpClientResponseException
-import io.micronaut.scheduling.annotation.Scheduled
 import jakarta.inject.Singleton
 import no.ssb.metadata.vardef.integrations.vardok.client.VardokClient
 import no.ssb.metadata.vardef.integrations.vardok.models.*
 import no.ssb.metadata.vardef.integrations.vardok.repositories.VardokIdMappingRepository
 import no.ssb.metadata.vardef.repositories.VariableDefinitionRepository
 import org.slf4j.LoggerFactory
-import java.util.concurrent.atomic.AtomicInteger
 
 @Singleton
 open class VardokApiService(
     private val vardokClient: VardokClient,
     private val vardokIdMappingRepository: VardokIdMappingRepository,
     private val variableDefinitionRepository: VariableDefinitionRepository,
-    meterRegistry: MeterRegistry,
 ) : VardokService {
     private val logger = LoggerFactory.getLogger(VardokApiService::class.java)
 
-    private var totalMigrated: AtomicInteger = AtomicInteger()
-
-    init {
-        totalMigrated.set(vardokIdMappingRepository.count().toInt())
-        meterRegistry.gauge("ssb.variable-definitions.migrated.count", totalMigrated)
-    }
-
     override fun isDuplicate(name: String): Boolean = variableDefinitionRepository.existsByShortName(name)
 
     private val xmlMapper = XmlMapper().registerKotlinModule()
@@ -113,12 +102,4 @@ open class VardokApiService(
     override fun getVardokIdByVardefId(vardokId: String): String? = vardokIdMappingRepository.getVardokIdByVardefId(vardokId)
 
     override fun isAlreadyMigrated(vardokId: String): Boolean = vardokIdMappingRepository.existsByVardokId(vardokId)
-
-    @Scheduled(
-        fixedRate = $$"${micronaut.metrics.custom.update-frequency:1h}",
-        initialDelay = $$"${micronaut.metrics.custom.initial-delay:1h}",
-    )
-    open fun exportMetrics() {
-        totalMigrated.set(vardokIdMappingRepository.count().toInt())
-    }
 }

src/main/kotlin/no/ssb/metadata/vardef/services/MetricsService.kt

@@ -0,0 +1,66 @@
+package no.ssb.metadata.vardef.services
+
+import io.micrometer.core.instrument.MeterRegistry
+import io.micrometer.core.instrument.MultiGauge
+import io.micrometer.core.instrument.Tags
+import io.micronaut.context.annotation.Requires
+import io.micronaut.scheduling.annotation.Scheduled
+import no.ssb.metadata.vardef.integrations.dapla.services.DaplaTeamApiService
+import no.ssb.metadata.vardef.integrations.vardok.repositories.VardokIdMappingRepository
+import org.slf4j.LoggerFactory
+import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Singleton
+
+const val MIGRATED_COUNT_METRIC = "ssb.variable-definitions.migrated"
+const val SECTION_TAG_KEY = "section"
+
+@Requires(env = ["naistest", "naisprod"])
+@Singleton
+class MetricsService(
+    private val vardokIdMappingRepository: VardokIdMappingRepository,
+    private val validityPeriodsService: ValidityPeriodsService,
+    private val daplaTeamApiService: DaplaTeamApiService,
+    private val meterRegistry: MeterRegistry,
+) {
+    private val logger = LoggerFactory.getLogger(MetricsService::class.java)
+    private val totalMigrated = AtomicInteger(0)
+    private val migrated: MultiGauge =
+        MultiGauge
+            .builder(MIGRATED_COUNT_METRIC)
+            .description("The number of migrated variable definitions, by section")
+            .register(meterRegistry)
+
+    init {
+        meterRegistry.gauge(MIGRATED_COUNT_METRIC, Tags.of(SECTION_TAG_KEY, "total"), totalMigrated)
+    }
+
+    private fun countMigratedVariablesBySection(): Map<String, Int> =
+        vardokIdMappingRepository
+            .findAll()
+            .map { (_, vardefId, _) ->
+                validityPeriodsService
+                    .getLatestPatchInLastValidityPeriod(
+                        vardefId,
+                    ).owner.team
+            }.map {
+                daplaTeamApiService.getTeam(it)?.sectionCode ?: "Unknown"
+            }.groupBy { it }
+            .mapValues { it.value.size }
+
+    @Scheduled(
+        fixedRate = $$"${micronaut.metrics.custom.update-frequency:1h}",
+        initialDelay = $$"${micronaut.metrics.custom.initial-delay:1h}",
+    )
+    fun exportMetrics() {
+        totalMigrated.set(vardokIdMappingRepository.count().toInt())
+        logger.debug("Updating metrics.")
+        migrated.register(
+            countMigratedVariablesBySection()
+                .also { logger.debug(it.toString()) }
+                .map {
+                    MultiGauge.Row.of(Tags.of(SECTION_TAG_KEY, it.key), it.value)
+                }.toList(),
+            true,
+        )
+    }
+}

src/test/kotlin/no/ssb/metadata/vardef/integrations/dapla/services/DaplaTeamApiMockkServiceTest.kt

@@ -31,7 +31,7 @@ class DaplaTeamApiMockkServiceTest {
 
     @Test
     fun `valid team request`() {
-        val expectedTeam = Team("dapla-felles")
+        val expectedTeam = Team("dapla-felles", sectionName = "Dapla", sectionCode = "724")
         val mockResponse: HttpResponse<Team?> = mockk()
         every { mockResponse.status } returns HttpStatus.OK
         every { mockResponse.body() } returns expectedTeam

src/test/kotlin/no/ssb/metadata/vardef/integrations/vardok/VardokServiceTest.kt

@@ -1,11 +1,11 @@
 package no.ssb.metadata.vardef.integrations.vardok
 
-import io.micrometer.core.instrument.MeterRegistry
 import io.micronaut.http.HttpStatus
 import io.micronaut.http.exceptions.HttpStatusException
 import io.mockk.MockKAnnotations
 import io.mockk.clearAllMocks
 import io.mockk.every
+import io.mockk.impl.annotations.InjectMockKs
 import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import no.ssb.metadata.vardef.integrations.vardok.client.VardokClient
@@ -22,9 +22,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 @MockK
-class VardokServiceTest(
-    private val meterRegistry: MeterRegistry,
-) : BaseVardokTest() {
+class VardokServiceTest : BaseVardokTest() {
     @MockK
     lateinit var vardokMockkClient: VardokClient
 
@@ -37,19 +35,12 @@ class VardokServiceTest(
     @MockK
     lateinit var variableDefinitionRepository: VariableDefinitionRepository
 
+    @InjectMockKs
     lateinit var vardokApiService: VardokApiService
 
     @BeforeEach
     fun setup() {
         MockKAnnotations.init(this)
-        every { vardokIdMappingRepository.count() } returns 0
-        vardokApiService =
-            VardokApiService(
-                vardokMockkClient,
-                vardokIdMappingRepository = vardokIdMappingRepository,
-                variableDefinitionRepository = variableDefinitionRepository,
-                meterRegistry = meterRegistry,
-            )
     }
 
     @AfterEach