Add tag to track request counts by same source address

Author: Fabinatix97

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/captcha/CaptchaService.java

@@ -38,7 +38,7 @@ public CaptchaService(final CaptchaProperties captchaProperties, final Difficult
     public Altcha.Challenge createChallenge(final String siteKey, final SourceAddress sourceAddress) {
         final long difficulty = difficultyService.getDifficultyForSourceAddress(siteKey, sourceAddress);
         difficultyService.registerRequest(siteKey, sourceAddress);
-        metricsService.recordChallengeRequest(siteKey, difficulty);
+        metricsService.recordChallengeRequest(siteKey, difficulty, sourceAddress);
         final Altcha.ChallengeOptions options = new Altcha.ChallengeOptions();
         options.algorithm = Altcha.Algorithm.SHA256;
         options.hmacKey = captchaProperties.hmacKey();

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/captcha/MetricsService.java

@@ -1,6 +1,7 @@
 package de.muenchen.captchaservice.service.captcha;
 
 import de.muenchen.captchaservice.data.SourceAddress;
+import de.muenchen.captchaservice.repository.CaptchaRequestRepository;
 import de.muenchen.captchaservice.repository.InvalidatedPayloadRepository;
 import de.muenchen.captchaservice.service.difficulty.DifficultyService;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -20,30 +21,37 @@ public class MetricsService {
     private final MeterRegistry meterRegistry;
     private final DifficultyService difficultyService;
     private final InvalidatedPayloadRepository invalidatedPayloadRepository;
+    private final CaptchaRequestRepository captchaRequestRepository;
 
     @SuppressFBWarnings(value = { "EI_EXPOSE_REP2" }, justification = "Dependency Injection")
     public MetricsService(MeterRegistry meterRegistry, DifficultyService difficultyService,
-            InvalidatedPayloadRepository invalidatedPayloadRepository) {
+            InvalidatedPayloadRepository invalidatedPayloadRepository, CaptchaRequestRepository captchaRequestRepository) {
         this.meterRegistry = meterRegistry;
         this.difficultyService = difficultyService;
         this.invalidatedPayloadRepository = invalidatedPayloadRepository;
+        this.captchaRequestRepository = captchaRequestRepository;
     }
 
-    public void recordChallengeRequest(String siteKey, long difficulty) {
+    public void recordChallengeRequest(String siteKey, long difficulty, SourceAddress sourceAddress) {
+        long sameSourceAddressRequestCount = getSameSourceAddressRequestCount(sourceAddress);
+
         Counter.builder("captcha.challenge.requests")
                 .tag("site_key", siteKey)
                 .tag("difficulty", String.valueOf(difficulty))
+                .tag("same_source_address_request_count", String.valueOf(sameSourceAddressRequestCount))
                 .description("Counter for captcha challenge requests")
                 .register(meterRegistry)
                 .increment();
     }
 
     public void recordVerifySuccess(String siteKey, SourceAddress sourceAddress) {
         final long difficulty = difficultyService.getDifficultyForSourceAddress(siteKey, sourceAddress);
+        long sameSourceAddressRequestCount = getSameSourceAddressRequestCount(sourceAddress);
 
         Counter.builder("captcha.verify.success")
                 .tag("site_key", siteKey)
                 .tag("difficulty", String.valueOf(difficulty))
+                .tag("same_source_address_request_count", String.valueOf(sameSourceAddressRequestCount))
                 .description("Counter for captcha verify success requests")
                 .register(meterRegistry)
                 .increment();
@@ -56,16 +64,22 @@ public void recordClientSolveTime(String siteKey, SourceAddress sourceAddress, l
         }
 
         final long difficulty = difficultyService.getDifficultyForSourceAddress(siteKey, sourceAddress);
+        long sameSourceAddressRequestCount = getSameSourceAddressRequestCount(sourceAddress);
 
         DistributionSummary.builder("captcha.client.solve.time")
                 .tag("site_key", siteKey)
                 .tag("difficulty", String.valueOf(difficulty))
+                .tag("same_source_address_request_count", String.valueOf(sameSourceAddressRequestCount))
                 .description("Summary of the time taken by clients to solve captcha challenges")
                 .baseUnit("milliseconds")
                 .register(meterRegistry)
                 .record(solveTime);
     }
 
+    private long getSameSourceAddressRequestCount(SourceAddress sourceAddress) {
+        return captchaRequestRepository.countBySourceAddressHashIgnoreCaseAndExpiresAtGreaterThanEqual(sourceAddress.getHash(), Instant.now());
+    }
+
     public void initializeInvalidatedPayloadsGauge() {
         Gauge.builder("captcha.invalidated.payloads",
                 () -> invalidatedPayloadRepository.countByExpiresAtGreaterThan(Instant.now()))