[java-opensaml COMMIT] in /trunk: opensaml-core/pom.xml opensaml-core/src/main/java/org/opensaml/core/metrics/ opensa...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  7 16:50:03 2016
New Revision: 4523

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4523&view=rev
Log:
Migrate Metrics support classes into opensaml-core.
Add an Initializer to install a MetricRegistry that is essentially "off".

Added:
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/MetricsSupport.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/DisabledCounter.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/DisabledHistogram.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/DisabledMeter.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/DisabledMetric.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/DisabledTimer.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/MetricRegistryInitializer.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/impl/package-info.java   (with props)
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/package-info.java   (with props)
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/context/MetricContext.java   (with props)
    trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateMetricContext.java   (with props)
Modified:
    trunk/opensaml-core/pom.xml
    trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java

Modified: trunk/opensaml-core/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/pom.xml?rev=4523&r1=4522&r2=4523&view=diff
==============================================================================
--- trunk/opensaml-core/pom.xml	(original)
+++ trunk/opensaml-core/pom.xml	Fri Oct  7 16:50:03 2016
@@ -21,6 +21,10 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
         </dependency>
 
         <!-- Provided Dependencies -->

Modified: trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer?rev=4523&r1=4522&r2=4523&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer	(original)
+++ trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer	Fri Oct  7 16:50:03 2016
@@ -1,2 +1,3 @@
 org.opensaml.core.xml.config.XMLObjectProviderInitializer
 org.opensaml.core.xml.config.GlobalParserPoolInitializer
+org.opensaml.core.metrics.impl.MetricRegistryInitializer

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java?rev=4523&r1=4522&r2=4523&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java	(original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java	Fri Oct  7 16:50:03 2016
@@ -28,11 +28,10 @@
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 import org.opensaml.profile.context.EventContext;
+import org.opensaml.profile.context.MetricContext;
 import org.opensaml.profile.context.PreviousEventContext;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.LoggerFactory;
-
-//TODO perf metrics
 
 /**
  * Base class for profile actions.
@@ -155,6 +154,12 @@
      */
     protected boolean doPreExecute(
             @Nonnull final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext) {
+
+        final MetricContext metricCtx = profileRequestContext.getSubcontext(MetricContext.class);
+        if (metricCtx != null) {
+            metricCtx.start(getClass().getSimpleName());
+        }
+        
         return true;
     }
 
@@ -181,6 +186,13 @@
      */
     protected void doPostExecute(

[... 12 lines stripped ...]