[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/admin/metrics.xml idp-profile-api/src/mai...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Sep 30 13:53:44 2016
New Revision: 8438

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8438&view=rev
Log:
Switch to simple class name for triggering timers.

Modified:
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java

Modified: trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/admin/metrics.xml?rev=8438&r1=8437&r2=8438&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/admin/metrics.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/admin/metrics.xml	Fri Sep 30 13:53:44 2016
@@ -75,7 +75,6 @@
     If you want to leave a timer in place but disabled to prevent overhead, you can turn off a
     logging category named "metrics.<timername>" in your logging configuration.
     -->
-    
     <!--
     <bean id="shibboleth.metrics.TimerStrategy" parent="shibboleth.ContextFunctions.Scripted"
             factory-method="inlineScript">
@@ -84,8 +83,8 @@
             <![CDATA[
                 timerCtx = input.getSubcontext("net.shibboleth.idp.profile.context.TimerContext");
                 timerCtx.addTimer("idp.attribute.resolution",
-                    "net.shibboleth.idp.profile.impl.ResolveAttributes",
-                    "net.shibboleth.idp.profile.impl.FilterAttributes"
+                    "ResolveAttributes",
+                    "FilterAttributes"
                     );                                
                 true; // Signals success.
             ]]>

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java?rev=8438&r1=8437&r2=8438&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java	(original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java	Fri Sep 30 13:53:44 2016
@@ -171,14 +171,13 @@
         
         final TimerContext timerCtx = profileRequestContext.getSubcontext(TimerContext.class);
         if (timerCtx != null) {
-            timerCtx.start(getClass().getName());
+            timerCtx.start(getClass().getSimpleName());
         }
         
         return true;
     }
     
 
-    /** {@inheritDoc} */
     /** {@inheritDoc} */
     @Override
     protected void doPostExecute(
@@ -186,7 +185,7 @@
         
         final TimerContext timerCtx = profileRequestContext.getSubcontext(TimerContext.class);
         if (timerCtx != null) {
-            timerCtx.stop(getClass().getName());
+            timerCtx.stop(getClass().getSimpleName());
         }
         
         super.doPostExecute(profileRequestContext);