Refactor challenge request metrics to include difficulty parameter

Author: Fabinatix97

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

@@ -37,10 +37,8 @@ public CaptchaService(final CaptchaProperties captchaProperties, final Difficult
 
     public Altcha.Challenge createChallenge(final String siteKey, final SourceAddress sourceAddress) {
         final long difficulty = difficultyService.getDifficultyForSourceAddress(siteKey, sourceAddress);
-
-        metricsService.recordChallengeRequest(siteKey, sourceAddress);
-
         difficultyService.registerRequest(siteKey, sourceAddress);
+        metricsService.recordChallengeRequest(siteKey, sourceAddress, difficulty);
         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

@@ -29,9 +29,7 @@ public MetricsService(MeterRegistry meterRegistry, DifficultyService difficultyS
         this.invalidatedPayloadRepository = invalidatedPayloadRepository;
     }
 
-    public void recordChallengeRequest(String siteKey, SourceAddress sourceAddress) {
-        final long difficulty = difficultyService.getDifficultyForSourceAddress(siteKey, sourceAddress);
-
+    public void recordChallengeRequest(String siteKey, SourceAddress sourceAddress, long difficulty) {
         Counter.builder("captcha.challenge.requests")
                 .tag("site_key", siteKey)
                 .tag("difficulty", String.valueOf(difficulty))