Merge aa1b696 into 295e898

build.gradle

@@ -68,7 +68,10 @@ dependencies {
     compile('org.jooq:jool-java-8:0.9.14')
 
     compile('org.springframework.boot:spring-boot-starter-web')
-    runtime('org.springframework.boot:spring-boot-starter-actuator')
+    compile('org.springframework.boot:spring-boot-starter-actuator')
+
+    compile 'org.springframework.metrics:spring-metrics:0.5.1.RELEASE'
+    compile 'io.prometheus:simpleclient_common:0.8.0'
 
     testCompile('no.fint:fint-test-utils:0.0.4')
     testCompile("cglib:cglib-nodep:${cglibVersion}")

src/main/java/no/fint/provider/events/Application.java

@@ -7,6 +7,7 @@
 import no.fint.springfox.EnableSpringfoxExtension;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.metrics.export.prometheus.EnablePrometheusMetrics;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableFintAudit
@@ -19,6 +20,7 @@
 ))
 @SwaggerDefinition(externalDocs = @ExternalDocs(value = "Go to the API list", url = "/api"))
 @EnableScheduling
+@EnablePrometheusMetrics
 @SpringBootApplication
 public class Application {
 

src/main/java/no/fint/provider/events/admin/AdminController.java

@@ -16,6 +16,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.metrics.annotation.Timed;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
@@ -45,11 +46,13 @@ public class AdminController {
     @Autowired
     private DownstreamSubscriber downstreamSubscriber;
 
+    @Timed
     @GetMapping("/audit/events")
     public List<MongoAuditEvent> getAllEvents() {
         return mongo.findAll(MongoAuditEvent.class);
     }
 
+    @Timed
     @GetMapping("/audit/events/since/{when}")
     public List<MongoAuditEvent> queryEventsSince(@PathVariable String when) {
         Duration duration = Duration.parse(when);
@@ -58,6 +61,7 @@ public List<MongoAuditEvent> queryEventsSince(@PathVariable String when) {
         return mongo.find(q, MongoAuditEvent.class);
     }
 
+    @Timed
     @GetMapping("/orgIds")
     public List<Map> getOrganizations() {
         return adminService.getOrgIds().entrySet().stream().map(entry -> ImmutableMap.of(
@@ -66,6 +70,7 @@ public List<Map> getOrganizations() {
         )).collect(Collectors.toList());
     }
 
+    @Timed
     @GetMapping("/orgIds/{orgId:.+}")
     public ResponseEntity getOrganization(@ApiParam(Constants.SWAGGER_X_ORG_ID) @PathVariable String orgId) {
         if (adminService.isRegistered(orgId)) {
@@ -78,6 +83,7 @@ public ResponseEntity getOrganization(@ApiParam(Constants.SWAGGER_X_ORG_ID) @Pat
         }
     }
 
+    @Timed
     @PostMapping("/orgIds/{orgId:.+}")
     public ResponseEntity registerOrgId(
             @ApiParam(Constants.SWAGGER_X_ORG_ID) @PathVariable String orgId,

src/main/java/no/fint/provider/events/eventstate/EventStateController.java

@@ -5,6 +5,7 @@
 import no.fint.provider.events.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.metrics.annotation.Timed;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,6 +22,7 @@ public class EventStateController {
     @Autowired
     private EventStateService eventStateService;
 
+    @Timed
     @GetMapping
     public Collection<EventState> getEventState() {
         return eventStateService.getEventStates();

src/main/java/no/fint/provider/events/response/ResponseController.java

@@ -12,6 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.metrics.annotation.Timed;
 import org.springframework.web.bind.annotation.*;
 
 @Slf4j
@@ -24,6 +25,7 @@ public class ResponseController {
     private ResponseService responseService;
 
     @ApiOperation(value = "", notes = "Receives event object with response data.")
+    @Timed
     @PostMapping
     public void response(@ApiParam(Constants.SWAGGER_X_ORG_ID) @RequestHeader(HeaderConstants.ORG_ID) String orgId,
                          @ApiParam(Constants.SWAGGER_EVENT) @RequestBody Event event) {

src/main/java/no/fint/provider/events/sse/SseController.java

@@ -12,6 +12,7 @@
 import no.fint.provider.events.subscriber.DownstreamSubscriber;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.metrics.annotation.Timed;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
@@ -41,6 +42,7 @@ public class SseController {
     private ProviderProps props;
 
     @ApiOperation(value = "Connect SSE client", notes = "Endpoint to register SSE client.")
+    @Timed
     @GetMapping("/{id}")
     public ResponseEntity<SseEmitter> subscribe(
             @ApiParam(Constants.SWAGGER_X_ORG_ID) @RequestHeader(HeaderConstants.ORG_ID) String orgId,
@@ -57,6 +59,7 @@ public ResponseEntity<SseEmitter> subscribe(
     }
 
     @ApiOperation(value = "", notes = "Returns all registered SSE clients.")
+    @Timed
     @GetMapping("/clients")
     public List<SseOrg> getClients() {
         Map<String, FintSseEmitters> clients = sseService.getSseClients();
@@ -71,12 +74,14 @@ public List<SseOrg> getClients() {
     }
 
     @ApiOperation(value = "", notes = "Remove all registered SSE clients.")
+    @Timed
     @DeleteMapping("/clients")
     public void removeSseClients() {
         sseService.removeAll();
     }
 
     @ApiOperation(value = "", notes = "Adapter starts the oauth process")
+    @Timed
     @GetMapping("/auth-init")
     public void authorize() {
     }

src/main/java/no/fint/provider/events/status/StatusController.java

@@ -13,6 +13,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageConversionException;
+import org.springframework.metrics.annotation.Timed;
 import org.springframework.web.bind.annotation.*;
 
 @Slf4j
@@ -25,6 +26,7 @@ public class StatusController {
     private StatusService statusService;
 
     @ApiOperation(value = "", notes = "Post back the event with the status flag telling if the response can be handled or not.")
+    @Timed
     @PostMapping
     public void status(@ApiParam(Constants.SWAGGER_X_ORG_ID) @RequestHeader(HeaderConstants.ORG_ID) String orgId,
                        @ApiParam(Constants.SWAGGER_EVENT) @RequestBody Event event) {

src/main/resources/application-test.yml

@@ -26,3 +26,16 @@ server:
 logging:
   level:
     no.fint.provider.events.sse: DEBUG
+
+management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include: "*"
+#  metrics:
+#    export:
+#      prometheus:
+#        enabled: true
+#
+  security:
+    enabled: false