This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 2c8aa192b133d513fce20c46310e8f4112a0b3fa Author: Robert Munteanu <romb...@apache.org> AuthorDate: Tue Aug 29 23:57:58 2023 +0200 metrics-prometheus: use activate/deactivate instead of init/destroy This fits in nicer with the OSGi component model and we don't need to care about calling super methods, etc. --- .../metrics/prometheus/impl/WrapperMetricsServlet.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/metrics-prometheus/src/main/java/org/apache/sling/metrics/prometheus/impl/WrapperMetricsServlet.java b/metrics-prometheus/src/main/java/org/apache/sling/metrics/prometheus/impl/WrapperMetricsServlet.java index f1ffafd5..9fe7ce62 100644 --- a/metrics-prometheus/src/main/java/org/apache/sling/metrics/prometheus/impl/WrapperMetricsServlet.java +++ b/metrics-prometheus/src/main/java/org/apache/sling/metrics/prometheus/impl/WrapperMetricsServlet.java @@ -21,9 +21,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.servlet.Servlet; -import javax.servlet.ServletException; +import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferencePolicy; @@ -62,17 +63,15 @@ public class WrapperMetricsServlet extends MetricsServlet { private final ConcurrentMap<MetricRegistry, CopyMetricRegistryListener> childRegistries = new ConcurrentHashMap<>(); - @Override - public void init() throws ServletException { - super.init(); + @Activate + public WrapperMetricsServlet() { this.exports = new DropwizardExports(metrics); CollectorRegistry.defaultRegistry.register(this.exports); } - @Override - public void destroy() { + @Deactivate + public void deactivate() { CollectorRegistry.defaultRegistry.unregister(this.exports); - super.destroy(); } @Reference(service = MetricRegistry.class, cardinality = ReferenceCardinality.MULTIPLE,