added metrics

build.gradle

@@ -60,6 +60,7 @@ dependencies {
     implementation 'no.fintlabs:fint-kafka:2.3.0'
 
     compileOnly 'org.projectlombok:lombok'
+    implementation 'io.micrometer:micrometer-core'
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
     annotationProcessor 'org.projectlombok:lombok'

kustomize/base/flais.yaml

@@ -21,4 +21,8 @@ spec:
     requests:
       memory: 512Mi
       cpu: 250m
+  prometheus:
+    enabled: true
+    port: '8080'
+    path: /actuator/prometheus
 

src/main/java/no/fintlabs/portal/model/client/CreateClientHandler.java

@@ -8,6 +8,7 @@
 import no.fintlabs.portal.model.component.Component;
 import no.fintlabs.portal.model.component.ComponentService;
 import no.fintlabs.portal.model.organisation.Organisation;
+import no.fintlabs.portal.utilities.MetricService;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 @Slf4j
@@ -19,13 +20,16 @@ public class CreateClientHandler extends FintCustomerObjectWithSecretsHandler<Cl
 
     private final ComponentService componentService;
 
+    private final MetricService metricService;
+
 
     protected CreateClientHandler(EntityTopicService entityTopicService, EntityProducerFactory entityProducerFactory,
                                   ClientService clientService, ClientFactory clientFactory,
-                                  ComponentService componentService) {
+                                  ComponentService componentService, MetricService metricService) {
         super(entityTopicService, entityProducerFactory, Client.class, clientService);
         this.clientFactory = clientFactory;
         this.componentService = componentService;
+        this.metricService = metricService;
     }
 
 
@@ -38,6 +42,7 @@ public String operation() {
     public Client apply(ConsumerRecord<String, ClientEvent> consumerRecord, Organisation organisation) {
         Client client = getOrCreateClient(consumerRecord, organisation);
         send(client);
+        metricService.registerClientCreate();
 
         return client;
     }

src/main/java/no/fintlabs/portal/model/client/DeleteClientHandler.java

@@ -6,16 +6,19 @@
 import no.fintlabs.portal.model.FintCustomerObjectEvent;
 import no.fintlabs.portal.model.FintCustomerObjectWithSecretsHandler;
 import no.fintlabs.portal.model.organisation.Organisation;
+import no.fintlabs.portal.utilities.MetricService;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
 public class DeleteClientHandler extends FintCustomerObjectWithSecretsHandler<Client, ClientEvent, ClientService> {
+    private final MetricService metricService;
 
     protected DeleteClientHandler(EntityTopicService entityTopicService, EntityProducerFactory entityProducerFactory,
-                                  ClientService clientService) {
+                                  ClientService clientService, MetricService metricService) {
         super(entityTopicService, entityProducerFactory, Client.class, clientService);
+        this.metricService = metricService;
     }
 
     @Override
@@ -31,6 +34,7 @@ public Client apply(ConsumerRecord<String, ClientEvent> consumerRecord, Organisa
                 .orElseThrow(() -> new RuntimeException("Unable to find client with dn: " + consumerRecord.value().getObject().getDn()));
 
         sendDelete(client.getDn());
+        metricService.registerClientDelete();
 
         return client;
     }

src/main/java/no/fintlabs/portal/utilities/MetricService.java

@@ -0,0 +1,29 @@
+package no.fintlabs.portal.utilities;
+
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MetricService {
+
+    private final MeterRegistry meterRegistry;
+    private final Counter clientCreateCounter;
+    private final Counter clientDeleteCounter;
+
+    public MetricService(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+
+        clientCreateCounter = Counter.builder("fint.cog.client.create").register(meterRegistry);
+        clientDeleteCounter = Counter.builder("fint.cog.client.delete").register(meterRegistry);
+    }
+
+    public void registerClientCreate() {
+        clientCreateCounter.increment();
+    }
+
+    public void registerClientDelete() {
+        clientDeleteCounter.increment();
+    }
+}

src/main/resources/application.yaml

@@ -18,6 +18,12 @@ spring:
     include:
       - db
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus, health
+
 logging:
   level:
     org.apache.kafka: WARN