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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Sep 16 17:15:26 2016
New Revision: 8398

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8398&view=rev
Log:
Move metric objects into admin config file.
Extend REST flow with additional CORS/JSONP options.
Add commented objects for system metrics.

Modified:
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.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=8398&r1=8397&r2=8398&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 16 17:15:26 2016
@@ -9,8 +9,38 @@
 
     default-init-method="initialize"
     default-destroy-method="destroy">
+    
+    <!-- Metrics enablement / activation. -->
 
-    <!-- Metrics Configuration -->
+    <!--
+    Uncomment to register one or more of the built-in system metric sets available.
+    Each bean can register only one metric set at a time (artifact of the metrics API).
+    -->
+    <!--
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <bean class="com.codahale.metrics.jvm.CachedThreadStatesGaugeSet"
+                c:_0="1" c:_1="#{T(java.util.concurrent.TimeUnit).MINUTES}" />
+        </property>
+    </bean>
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <bean class="com.codahale.metrics.jvm.ClassLoadingGaugeSet" />
+        </property>
+    </bean>
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <bean class="com.codahale.metrics.jvm.GarbageCollectorMetricSet" />
+        </property>
+    </bean>
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <bean class="com.codahale.metrics.jvm.MemoryUsageGaugeSet" />
+        </property>
+    </bean>
+    -->
+
+    <!-- Metrics REST API Configuration -->
 
     <!--
     By default any requests are assumed to be for specific named metrics. You can
@@ -31,5 +61,5 @@
     <util:map id="shibboleth.metrics.AccessPolicyMap">
     
     </util:map>
-        
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml?rev=8398&r1=8397&r2=8398&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	Fri Sep 16 17:15:26 2016
@@ -34,5 +34,24 @@
             </map>
         </property>
     </bean>
+    
+    <!-- Metric registry and a call to register it with the Metrics runtime. -->
 
+    <bean id="shibboleth.metrics.MetricRegistry" class="com.codahale.metrics.MetricRegistry" /> 
+    
+    <bean class="com.codahale.metrics.SharedMetricRegistries" factory-method="add"
+        c:_0="net.shibboleth.idp" c:_1-ref="shibboleth.metrics.MetricRegistry" />
+
+    <!-- Parent beans for registering MetricSets and Metrics. -->
+    
+    <bean id="shibboleth.metrics.RegisterMetricSet" abstract="true"
+        class="org.springframework.beans.factory.config.MethodInvokingBean"
+        p:targetObject-ref="shibboleth.metrics.MetricRegistry"
+        p:targetMethod="registerAll" />
+
+    <bean id="shibboleth.metrics.RegisterMetric" abstract="true"
+        class="org.springframework.beans.factory.config.MethodInvokingBean"
+        p:targetObject-ref="shibboleth.metrics.MetricRegistry"
+        p:targetMethod="register" />
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8398&r1=8397&r2=8398&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Fri Sep 16 17:15:26 2016
@@ -327,11 +327,4 @@
         p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
         p:fieldReplacements="#{getObject('shibboleth.AuditFieldReplacementMap')}" />
         
-    <!-- Metric registry and a call to register it with the Metrics runtime. -->
-

[... 111 lines stripped ...]