From 63ca055637e8f69785f422ecf7fe8749a61bc714 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Tue, 22 Jun 2021 15:38:43 +0100
Subject: [PATCH] Use ServletHolder lifecycle more carefully

Fixes metrics with Jetty > 9.4.20
---
 .../wlgitbridge/server/GitBridgeServer.java   |  2 +-
 .../wlgitbridge/server/PrometheusHandler.java | 40 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/GitBridgeServer.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/GitBridgeServer.java
index 0411c67250..6c0a32f71c 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/GitBridgeServer.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/GitBridgeServer.java
@@ -127,7 +127,7 @@ public class GitBridgeServer {
         handlers.addHandler(new StatusHandler(bridge));
         handlers.addHandler(new HealthCheckHandler(bridge));
         handlers.addHandler(new GitLfsHandler(bridge));
-        handlers.addHandler(new PrometheusHandler(bridge));
+        handlers.addHandler(new PrometheusHandler());
         base.setHandler(handlers);
         return base;
     }
diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PrometheusHandler.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PrometheusHandler.java
index afe18924fe..a4ae8a1f53 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PrometheusHandler.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PrometheusHandler.java
@@ -18,17 +18,30 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 
+/**
+  * Wrapper for the MetricsServlet from the Prometheus client.
+  *
+  * We wrap this in a handler here, as we use a wildcard servlet context on /*, and adding
+  * an additional servlet context collides with it. Adding a servlet context on /metrics
+  * causes a redirect to /metrics/ which breaks things when jetty doesn't know the full
+  * public URL.
+  * 
+  * There may still be a better way to do this, but it works.
+  **/
+
 public class PrometheusHandler extends AbstractHandler {
 
-  private final Bridge bridge;
-  private final MetricsServlet metricsServlet;
   private final ServletHolder holder;
 
-  public PrometheusHandler(Bridge bridge) {
-    this.bridge = bridge;
-    this.metricsServlet = new MetricsServlet();
-    this.holder = new ServletHolder(metricsServlet);
+  public PrometheusHandler() {
     DefaultExports.initialize();
+
+    this.holder = new ServletHolder(new MetricsServlet());
+    try {
+      this.holder.initialize();
+    } catch (Exception e) {
+      Log.error("Unable to initialise metrics servlet: " + e.getMessage());
+    }
   }
 
   @Override
@@ -45,11 +58,20 @@ public class PrometheusHandler extends AbstractHandler {
         && target.matches("^/metrics/?$")
     ) {
       Log.info(method + " <- /metrics");
-      response.setContentType("application/vnd.git-lfs+json");
-      response.setStatus(200);
+
+      if (!this.holder.isAvailable()) {
+        try {
+          this.holder.start();
+        } catch (Exception e) {
+          Log.error("Unable to start metrics servlet: " + e.getMessage());
+          response.setStatus(500);
+          baseRequest.setHandled(true);
+          return;
+        }
+      }
+
       this.holder.handle(baseRequest, request, response);
       baseRequest.setHandled(true);
     }
   }
-
 }