Revert "WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry"
This reverts commit f00af3c22588427fa3a37d41b767b215e7a9602a. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8beb5309 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8beb5309 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8beb5309 Branch: refs/heads/master Commit: 8beb530958e3d7f38eab3ac3f676b3eb2f9207b8 Parents: 528bc41 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 29 08:55:52 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 29 08:55:52 2016 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/metrics/Initializer.java | 13 +++-------- .../apache/wicket/metrics/WicketMetrics.java | 24 -------------------- .../aspects/session/SessionCountListener.java | 20 +++++++--------- .../session/SessionCountListenerAspect.java | 19 +++++----------- 4 files changed, 17 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8beb5309/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java index cd3fbc4..7c3a451 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java @@ -16,32 +16,25 @@ import org.apache.wicket.protocol.http.WebApplication; public class Initializer implements IInitializer { public static final String METRICS_SERVLET_REGISTRY = "com.codahale.metrics.servlets.MetricsServlet.registry"; - public static final String WICKET_METRICS_SETTINGS = WicketMetricsSettings.class.getName(); @Override public void init(Application application) { + WebApplication webApplication = (WebApplication) application; MetricRegistry metricRegistry = new MetricRegistry(); - WicketMetricsSettings metricsSettings = new WicketMetricsSettings(); - application.setMetaData(WicketMetrics.METRIC_REGISTRY, metricRegistry); - application.setMetaData(WicketMetrics.METRIC_SETTINGS, metricsSettings); - WebApplication webApplication = (WebApplication) application; ServletContext servletContext = webApplication.getServletContext(); servletContext.setAttribute(METRICS_SERVLET_REGISTRY, metricRegistry); - servletContext.setAttribute(WICKET_METRICS_SETTINGS, metricsSettings); } @Override public void destroy(Application application) { - application.setMetaData(WicketMetrics.METRIC_REGISTRY, null); - application.setMetaData(WicketMetrics.METRIC_SETTINGS, null); - WebApplication webApplication = (WebApplication) application; + webApplication.setMetaData(WicketMetrics.METRIC_REGISTRY, null); + ServletContext servletContext = webApplication.getServletContext(); servletContext.setAttribute(METRICS_SERVLET_REGISTRY, null); - servletContext.setAttribute(WICKET_METRICS_SETTINGS, null); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/8beb5309/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java index db5ebd3..dd22f6c 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java @@ -163,31 +163,7 @@ public class WicketMetrics { WicketMetricsSettings settings = getSettings(); MetricRegistry registry = getMetricRegistry(); - return counter(name, joinPoint, counterOperation, value, registry, settings); - } - /** - * Creates a histogram of the given arguments - * - * @param name - * the name of the meter to be marked - * @param joinPoint - * the join point - * @param counterOperation - * the operation - * @param value - * the value to update the counter - * @param registry - * the registry with the metrics - * @param settings - * the Wicket metrics settings - * @return the result of the proceeded join point - * @throws Throwable - */ - public Object counter(String name, ProceedingJoinPoint joinPoint, - CounterOperation counterOperation, Long value, - MetricRegistry registry, WicketMetricsSettings settings) throws Throwable - { if (settings.isEnabled()) { Counter counter = registry http://git-wip-us.apache.org/repos/asf/wicket/blob/8beb5309/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java index 597dd71..3f89ca3 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java @@ -17,7 +17,6 @@ package org.apache.wicket.metrics.aspects.session; import static org.apache.wicket.metrics.Initializer.METRICS_SERVLET_REGISTRY; -import static org.apache.wicket.metrics.Initializer.WICKET_METRICS_SETTINGS; import javax.servlet.ServletContext; import javax.servlet.annotation.WebListener; @@ -25,7 +24,6 @@ import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; import com.codahale.metrics.MetricRegistry; -import org.apache.wicket.metrics.WicketMetricsSettings; /** @@ -42,10 +40,9 @@ public class SessionCountListener implements HttpSessionListener { ServletContext servletContext = event.getSession().getServletContext(); MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY); - WicketMetricsSettings metricsSettings = (WicketMetricsSettings) servletContext.getAttribute(WICKET_METRICS_SETTINGS); if (metricRegistry != null) { - dec(event, metricRegistry, metricsSettings); + dec(event, metricRegistry); } } @@ -54,31 +51,30 @@ public class SessionCountListener implements HttpSessionListener { ServletContext servletContext = event.getSession().getServletContext(); MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY); - WicketMetricsSettings metricsSettings = (WicketMetricsSettings) servletContext.getAttribute(WICKET_METRICS_SETTINGS); if (metricRegistry != null) { - inc(event, metricRegistry, metricsSettings); + inc(event, metricRegistry); } } /** * Used to wire an aspect around - * @param event the http session event + * + * @param event the http session event * @param metricRegistry - * @param metricsSettings */ - public void dec(HttpSessionEvent event, MetricRegistry metricRegistry, WicketMetricsSettings metricsSettings) + public void dec(HttpSessionEvent event, MetricRegistry metricRegistry) { // NOOP for aspect usage } /** * Used to wire an aspect around - * @param event the http session event + * + * @param event the http session event * @param metricRegistry - * @param metricsSettings */ - public void inc(HttpSessionEvent event, MetricRegistry metricRegistry, WicketMetricsSettings metricsSettings) + public void inc(HttpSessionEvent event, MetricRegistry metricRegistry) { // NOOP for aspect usage } http://git-wip-us.apache.org/repos/asf/wicket/blob/8beb5309/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java index d80c600..7dc8f04 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java @@ -17,13 +17,10 @@ package org.apache.wicket.metrics.aspects.session; import org.apache.wicket.metrics.WicketMetrics; -import org.apache.wicket.metrics.WicketMetricsSettings; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import com.codahale.metrics.MetricRegistry; - /** * The Session count listener aspect measures how many sessions are active * @@ -46,11 +43,9 @@ public class SessionCountListenerAspect extends WicketMetrics @Around("execution(* org.apache.wicket.metrics.aspects.session.SessionCountListener.inc(..))") public Object aroundInc(ProceedingJoinPoint joinPoint) throws Throwable { - Object[] methodArguments = joinPoint.getArgs(); - MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1]; - WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2]; - - return counter("core/session/count", joinPoint, CounterOperation.INC, 1L, metricRegistry, metricsSettings); + Object count = joinPoint.proceed(); + counter("core/session/count", null, CounterOperation.INC, 1L); + return count; } /** @@ -65,11 +60,9 @@ public class SessionCountListenerAspect extends WicketMetrics @Around("execution(* org.apache.wicket.metrics.aspects.session.SessionCountListener.dec(..))") public Object aroundDec(ProceedingJoinPoint joinPoint) throws Throwable { - Object[] methodArguments = joinPoint.getArgs(); - MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1]; - WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2]; - - return counter("core/session/count", joinPoint, CounterOperation.DEC, 1L, metricRegistry, metricsSettings); + Object count = joinPoint.proceed(); + counter("core/session/count", null, CounterOperation.DEC, 1L); + return count; } }
