From 82a2246298befbc8febfeb58f52ce5eb1bc4bdaa Mon Sep 17 00:00:00 2001 From: Antoine DESSAIGNE Date: Wed, 1 Jun 2022 15:41:15 +0200 Subject: [PATCH 1/2] Move servlet adapters to an internal package to avoid duplicating classes when building OSGi bundles Signed-off-by: Antoine DESSAIGNE --- .../java/io/prometheus/client/exporter/MetricsServlet.java | 4 ++-- .../main/java/io/prometheus/client/filter/MetricsFilter.java | 2 +- .../java/io/prometheus/client/{ => internal}/Adapter.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename simpleclient_servlet/src/main/java/io/prometheus/client/{ => internal}/Adapter.java (98%) diff --git a/simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java b/simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java index 3cd6af877..f30050d8e 100644 --- a/simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java +++ b/simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java @@ -1,6 +1,6 @@ package io.prometheus.client.exporter; -import io.prometheus.client.Adapter; +import io.prometheus.client.internal.Adapter; import io.prometheus.client.CollectorRegistry; import io.prometheus.client.Predicate; import io.prometheus.client.servlet.common.exporter.Exporter; @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static io.prometheus.client.Adapter.wrap; +import static io.prometheus.client.internal.Adapter.wrap; /** * The MetricsServlet class provides a simple way of exposing the metrics values. diff --git a/simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java b/simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java index 21d5b3343..c2775fcff 100644 --- a/simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java +++ b/simpleclient_servlet/src/main/java/io/prometheus/client/filter/MetricsFilter.java @@ -1,6 +1,6 @@ package io.prometheus.client.filter; -import io.prometheus.client.Adapter; +import io.prometheus.client.internal.Adapter; import io.prometheus.client.servlet.common.filter.Filter; import io.prometheus.client.servlet.common.filter.FilterConfigurationException; diff --git a/simpleclient_servlet/src/main/java/io/prometheus/client/Adapter.java b/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java similarity index 98% rename from simpleclient_servlet/src/main/java/io/prometheus/client/Adapter.java rename to simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java index 8433fd67d..c9fcb282b 100644 --- a/simpleclient_servlet/src/main/java/io/prometheus/client/Adapter.java +++ b/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java @@ -1,4 +1,4 @@ -package io.prometheus.client; +package io.prometheus.client.internal; import io.prometheus.client.servlet.common.adapter.FilterConfigAdapter; import io.prometheus.client.servlet.common.adapter.HttpServletRequestAdapter; From f1a948f0ea04f20cc3c3b57c2f1111dc441a2ac8 Mon Sep 17 00:00:00 2001 From: Antoine DESSAIGNE Date: Wed, 1 Jun 2022 15:55:06 +0200 Subject: [PATCH 2/2] Fix typo in Adapter preventing it to work properly Signed-off-by: Antoine DESSAIGNE --- .../src/main/java/io/prometheus/client/internal/Adapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java b/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java index c9fcb282b..853980ae5 100644 --- a/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java +++ b/simpleclient_servlet/src/main/java/io/prometheus/client/internal/Adapter.java @@ -58,7 +58,7 @@ private static class HttpServletResponseAdapterImpl implements HttpServletRespon @Override public void setStatus(int httpStatusCode) { - delegate.setBufferSize(httpStatusCode); + delegate.setStatus(httpStatusCode); } @Override