Merge pull request #1228 from OpenConext/featuire/count_tiqr_registration

Add total number of linked accounts to metrics endpoint

Author: oharsta

myconext-server/src/main/java/myconext/api/MetricsController.java

@@ -37,6 +37,11 @@ public MetricsController(UserRepository userRepository,
                 .description("Used services count")
                 .register(meterRegistry);
 
+        Gauge.builder("total_external_linked_account_count",
+                        () -> metricsRepository.countTotalExternalLinkedAccounts())
+                .description("Total external linked account count")
+                .register(meterRegistry);
+
         Stream.of(IdpScoping.values())
                 .forEach(idpScoping -> Gauge
                         .builder("external_linked_account_" + idpScoping.name(),

myconext-server/src/main/java/myconext/repository/MetricsRepository.java

@@ -41,6 +41,14 @@ public Integer countTotalExternalLinkedAccountsByType(IdpScoping idpScoping) {
                 ), "countExternalLinkedAccounts");
     }
 
+    public Integer countTotalExternalLinkedAccounts() {
+        return doInCollection("users",
+                List.of(
+                        "{ \"$unwind\": \"$externalLinkedAccounts\" }",
+                        "{ \"$count\": \"totalExternalLinkedAccounts\" }"
+                ), "totalExternalLinkedAccounts");
+    }
+
     public Integer countTotalUsedServices() {
         return doInCollection("users",
                 List.of(

myconext-server/src/test/java/myconext/api/MetricsControllerTest.java

@@ -33,7 +33,7 @@ void prometheus() throws IOException {
 
         String metrics = IOUtils.toString(inputStream, Charset.defaultCharset());
 
-        List.of("user_count", "linked_account_count", "app_registration_count", "used_services_count")
+        List.of("user_count", "linked_account_count", "app_registration_count", "used_services_count", "total_external_linked_account_count")
                 .forEach(s -> assertTrue(metrics.contains(s)));
         Stream.of(IdpScoping.values()).forEach(idpScoping ->
                 assertTrue(metrics.contains("external_linked_account_" + idpScoping.name())));

myconext-server/src/test/java/myconext/repository/MetricsRepositoryTest.java

@@ -18,6 +18,8 @@ void getTotalLinkedAccountCount() {
         assertEquals(2, totalLinkedAccountCount);
         Integer idinExternalAccounts = metricsRepository.countTotalExternalLinkedAccountsByType(IdpScoping.idin);
         assertEquals(0, idinExternalAccounts);
+        Integer totalExternalLinkedAccounts = metricsRepository.countTotalExternalLinkedAccounts();
+        assertEquals(0, totalExternalLinkedAccounts);
         Integer countTotalUsedServices = metricsRepository.countTotalUsedServices();
         assertEquals(2, countTotalUsedServices);
     }