You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ts...@apache.org on 2016/03/16 17:56:23 UTC

[09/17] wicket git commit: Wicket Metrics - Fixed thread local issue

Wicket Metrics - Fixed thread local issue

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f64a4803
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f64a4803
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f64a4803

Branch: refs/heads/master
Commit: f64a48033e6705bde690716779dabb94fa11e24a
Parents: 25b1c9e
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Mon Mar 14 08:54:55 2016 +0100
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Wed Mar 16 17:55:13 2016 +0100

----------------------------------------------------------------------
 .../apache/wicket/metrics/WicketMetrics.java    | 25 ++++----------------
 .../metrics/aspects/WicketFilterAspect.java     |  4 ++--
 2 files changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f64a4803/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
----------------------------------------------------------------------
diff --git a/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java b/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
index 6331a78..51e55c5 100644
--- a/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
+++ b/wicket-metrics/src/main/java/org/apache/wicket/metrics/WicketMetrics.java
@@ -32,33 +32,17 @@ import com.codahale.metrics.Timer.Context;
 public class WicketMetrics
 {
 
-	/** The key for metrics **/
-	public static final MetaDataKey<WicketMetrics> METRICS = new MetaDataKey<WicketMetrics>()
-	{
-		private static final long serialVersionUID = 1L;
-	};
-	
 	/** The key for metrics registry **/
 	public static final MetaDataKey<MetricRegistry> METRIC_REGISTRY = new MetaDataKey<MetricRegistry>()
 	{
 		private static final long serialVersionUID = 1L;
 	};
-	
+
 	/** The key for metrics registry **/
 	public static final MetaDataKey<WicketMetricsSettings> METRIC_SETTINGS = new MetaDataKey<WicketMetricsSettings>()
 	{
 		private static final long serialVersionUID = 1L;
 	};
-	
-	/**
-	 * Creates the wicket metrics
-	 */
-	public WicketMetrics()
-	{
-		Application application = Application.get();
-		application.setMetaData(METRICS, this);
-		application.setMetaData(METRIC_SETTINGS, new WicketMetricsSettings());
-	}
 
 	/**
 	 * Simply measure the time for a {@literal @}around
@@ -75,7 +59,7 @@ public class WicketMetrics
 	{
 		WicketMetricsSettings settings = getSettings();
 		MetricRegistry registry = getMetricRegistry();
-		
+
 		if (settings.isEnabled())
 		{
 			Context context = registry
@@ -109,7 +93,7 @@ public class WicketMetrics
 	{
 		WicketMetricsSettings settings = getSettings();
 		MetricRegistry registry = getMetricRegistry();
-		
+
 		if (settings.isEnabled())
 		{
 			registry.meter(settings.getPrefix() + name + renderClassName(joinPoint)).mark();
@@ -173,12 +157,11 @@ public class WicketMetrics
 	private WicketMetricsSettings getSettings()
 	{
 		Application application = Application.get();
-		
 		WicketMetricsSettings metricRegistry = application.getMetaData(METRIC_SETTINGS);
 		if (metricRegistry == null)
 		{
 			metricRegistry = new WicketMetricsSettings();
-			Application.get().setMetaData(METRIC_SETTINGS, metricRegistry);
+			application.setMetaData(METRIC_SETTINGS, metricRegistry);
 		}
 		return metricRegistry;
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/f64a4803/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/WicketFilterAspect.java
----------------------------------------------------------------------
diff --git a/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/WicketFilterAspect.java b/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/WicketFilterAspect.java
index bb31b74..c71430c 100644
--- a/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/WicketFilterAspect.java
+++ b/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/WicketFilterAspect.java
@@ -41,9 +41,9 @@ public class WicketFilterAspect extends WicketMetrics
 	 * @throws Throwable
 	 *             might occur while invoking process request
 	 */
-	@Around("execution(* org.apache.wicket.protocol.http.WicketFilter.processRequest(..))")
+	@Around("execution(* org.apache.wicket.protocol.http.WicketFilter.processRequestCycle(..))")
 	public Object aroundRequestProcessed(ProceedingJoinPoint joinPoint) throws Throwable
 	{
-		return measureTime("core/application/request", joinPoint);
+		return measureTime("core/application/requestCycle", joinPoint);
 	}
 }