You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/28 12:33:25 UTC
[1/2] wicket git commit: WiCKET-6127 WICKET-6128 Use IInitializer and
ServletContext to store the MetricRegistry
Repository: wicket
Updated Branches:
refs/heads/master f00af3c22 -> c451d4cbc
WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry
Reuse the same MetricRegistry and WicketMetricsSettings if there are more than one WicketFilters in the same .war
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6e4690f6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6e4690f6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6e4690f6
Branch: refs/heads/master
Commit: 6e4690f6986c1f2cf896ab5b50ae4e58a915cbd0
Parents: f00af3c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 28 12:30:54 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 28 12:30:54 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/metrics/Initializer.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6e4690f6/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..95c9209 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
@@ -21,16 +21,21 @@ public class Initializer implements IInitializer
@Override
public void init(Application application)
{
- MetricRegistry metricRegistry = new MetricRegistry();
- WicketMetricsSettings metricsSettings = new WicketMetricsSettings();
+ WebApplication webApplication = (WebApplication) application;
+ ServletContext servletContext = webApplication.getServletContext();
+
+ MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY);
+ WicketMetricsSettings metricsSettings = (WicketMetricsSettings) servletContext.getAttribute(WICKET_METRICS_SETTINGS);
+ if (metricRegistry == null)
+ {
+ metricRegistry = new MetricRegistry();
+ metricsSettings = new WicketMetricsSettings();
+ servletContext.setAttribute(METRICS_SERVLET_REGISTRY, metricRegistry);
+ servletContext.setAttribute(WICKET_METRICS_SETTINGS, metricsSettings);
+ }
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
[2/2] wicket git commit: WiCKET-6127 WICKET-6128 Use IInitializer and
ServletContext to store the MetricRegistry
Posted by mg...@apache.org.
WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry
Do not pass the joinPoint because it is used to render the class name in the metric name if it is not null.
Do not execute joinPoint.proceed() because it doesn't do anything meaningful anyway.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c451d4cb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c451d4cb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c451d4cb
Branch: refs/heads/master
Commit: c451d4cbc94e052c36af1c99652d9b55ca78f10b
Parents: 6e4690f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 28 12:32:14 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 28 12:32:14 2016 +0200
----------------------------------------------------------------------
.../metrics/aspects/session/SessionCountListenerAspect.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c451d4cb/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..e547a3f 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
@@ -50,7 +50,7 @@ public class SessionCountListenerAspect extends WicketMetrics
MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1];
WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2];
- return counter("core/session/count", joinPoint, CounterOperation.INC, 1L, metricRegistry, metricsSettings);
+ return counter("core/session/count", null, CounterOperation.INC, 1L, metricRegistry, metricsSettings);
}
/**
@@ -69,7 +69,7 @@ public class SessionCountListenerAspect extends WicketMetrics
MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1];
WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2];
- return counter("core/session/count", joinPoint, CounterOperation.DEC, 1L, metricRegistry, metricsSettings);
+ return counter("core/session/count", null, CounterOperation.DEC, 1L, metricRegistry, metricsSettings);
}
}