feat(origin health check): add metrics for counting total health chec…

…ks sent
ExpediaGroup · Sep 4, 2024 · 8c7b00e · 8c7b00e
1 parent ce98188
commit 8c7b00e
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 80 deletions.
diff --git a/...onents/client/src/main/java/com/hotels/styx/client/healthcheck/UrlRequestHealthCheck.java b/...onents/client/src/main/java/com/hotels/styx/client/healthcheck/UrlRequestHealthCheck.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2021 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@
  */
 public class UrlRequestHealthCheck implements OriginHealthCheckFunction {
     private final String healthCheckUri;
-    private final SimpleCache<Origin, Counter> meterCache;
+    private final SimpleCache<Origin, Counter> failuresMeter;
+    private final SimpleCache<Origin, Counter> healthChecksMeter;
 
     /**
      * Construct an instance.
@@ -41,7 +42,8 @@ public class UrlRequestHealthCheck implements OriginHealthCheckFunction {
      */
     public UrlRequestHealthCheck(String healthCheckUri, CentralisedMetrics metrics) {
         this.healthCheckUri = uriWithInitialSlash(healthCheckUri);
-        this.meterCache = metrics.proxy().client().originHealthCheckFailures();
+        this.failuresMeter = metrics.proxy().client().originHealthCheckFailures();
+        this.healthChecksMeter = metrics.proxy().client().originHealthChecks();
     }
 
     private static String uriWithInitialSlash(String uri) {
@@ -54,15 +56,16 @@ public void check(HttpClient client, Origin origin, OriginHealthCheckFunction.Ca
 
         client.send(request)
                 .handle((response, cause) -> {
+                    healthChecksMeter.get(origin).increment();
                     if (response != null) {
                         if (response.status().equals(OK)) {
                             responseCallback.originStateResponse(HEALTHY);
                         } else {
-                            meterCache.get(origin).increment();
+                            failuresMeter.get(origin).increment();
                             responseCallback.originStateResponse(UNHEALTHY);
                         }
                     } else if (cause != null) {
-                        meterCache.get(origin).increment();
+                        failuresMeter.get(origin).increment();
                         responseCallback.originStateResponse(UNHEALTHY);
                     }
                     return null;

diff --git a/...ient/src/test/unit/java/com/hotels/styx/client/healthcheck/UrlRequestHealthCheckTest.java b/...ient/src/test/unit/java/com/hotels/styx/client/healthcheck/UrlRequestHealthCheckTest.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2021 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ public void declaresOriginHealthyOnOkResponseCode() {
 
         assertThat(originState, is(HEALTHY));
         assertThat(meters(id -> id.getName().equals("proxy.client.originHealthCheckFailures")).size(), is(0));
+        assertThat(meters(id -> id.getName().equals("proxy.client.originHealthChecks")).size(), is(1));
     }
 
     @Test
@@ -92,6 +93,7 @@ public void declaresOriginUnhealthyOnNon200Ok() {
         assertThat(metrics.getRegistry().find("proxy.client.originHealthCheckFailures")
                 .tags("originId", someOrigin.id().toString(), "appId", someOrigin.applicationId().toString()).counter().count(), is(1.0));
         assertThat(meters(id -> id.getName().equals("proxy.client.originHealthCheckFailures")).size(), is(1));
+        assertThat(meters(id -> id.getName().equals("proxy.client.originHealthChecks")).size(), is(1));
     }
 
     @Test
@@ -106,6 +108,7 @@ public void declaredOriginUnhealthyOnTransportException() {
                 .tags("originId", someOrigin.id().toString(), "appId", someOrigin.applicationId().toString()).counter().count(), is(1.0));
 
         assertThat(meters(id -> id.getName().equals("proxy.client.originHealthCheckFailures")).size(), is(1));
+        assertThat(meters(id -> id.getName().equals("proxy.client.originHealthChecks")).size(), is(1));
     }
 
     private List<Meter> meters(Predicate<Meter.Id> predicate) {