Fix breaking scrape API change #892 (#898)

Signed-off-by: Fabian Stäber <fabian@fstab.de>
prometheus · Nov 12, 2023 · dd31ee6 · dd31ee6
1 parent e8b3f87
commit dd31ee6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/...tpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java b/...tpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java
@@ -49,6 +49,17 @@ public Enumeration<String> getHeaders(String name) {
         public String getMethod() {
             return httpExchange.getRequestMethod();
         }
+
+        @Override
+        public String getRequestPath() {
+            URI requestURI = httpExchange.getRequestURI();
+            String uri = requestURI.toString();
+            int qx = uri.indexOf('?');
+            if (qx != -1) {
+                uri = uri.substring(0, qx);
+            }
+            return uri;
+        }
     }
 
     public class HttpResponse implements PrometheusHttpResponse {

diff --git a/...rta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/HttpExchangeAdapter.java b/...rta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/HttpExchangeAdapter.java
@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.URI;
 import java.util.Enumeration;
 
 public class HttpExchangeAdapter implements PrometheusHttpExchange {
@@ -67,6 +68,24 @@ public Enumeration<String> getHeaders(String name) {
         public String getMethod() {
             return request.getMethod();
         }
+
+        @Override
+        public String getRequestPath() {
+            StringBuilder uri = new StringBuilder();
+            String contextPath = request.getContextPath();
+            if (contextPath.startsWith("/")) {
+                uri.append(contextPath);
+            }
+            String servletPath = request.getServletPath();
+            if (servletPath.startsWith("/")) {
+                uri.append(servletPath);
+            }
+            String pathInfo = request.getPathInfo();
+            if (pathInfo != null) {
+                uri.append(pathInfo);
+            }
+            return uri.toString();
+        }
     }
 
     public static class Response implements PrometheusHttpResponse {

diff --git a/...ics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java b/...ics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java
@@ -2,10 +2,16 @@
 
 /**
  * Infos extracted from the request received by the endpoint
- * 
  */
 public interface PrometheusScrapeRequest {
-
-	String[] getParameterValues(String name);
 
+	/**
+	 * Absolute path of the HTTP request.
+	 */
+	String getRequestPath();
+
+	/**
+	 * See {@code jakarta.servlet.ServletRequest.getParameterValues(String name)}
+	 */
+	String[] getParameterValues(String name);
 }