[java-shib-metadata] branch main updated: JSMD-3 - Support metricsBaseName for dynamic resolvers

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=be342d032e342e2a781619645717efefe2c3543c

The following commit(s) were added to refs/heads/main by this push:
     new be342d03 JSMD-3 - Support metricsBaseName for dynamic resolvers
be342d03 is described below

commit be342d032e342e2a781619645717efefe2c3543c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri May 19 09:58:56 2023 -0400

    JSMD-3 - Support metricsBaseName for dynamic resolvers
    
    https://shibboleth.atlassian.net/browse/JSMD-3
---
 .../metadata/AbstractDynamicMetadataProviderParser.java       |  4 ++++
 .../src/main/resources/schema/shibboleth-metadata.xsd         | 11 ++++++++++-
 .../net/shibboleth/spring/metadata/dynamicBasicParams.xml     |  1 +
 .../spring/metadata/dynamicMetadataQueryProtocol.xml          |  2 +-
 .../net/shibboleth/spring/metadata/localDynamicDefaults.xml   |  1 +
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
index e5fb9055..7b18d359 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
@@ -72,6 +72,10 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
             builder.addPropertyReference("indexes",
                     AttributeSupport.ensureAttributeValue(element, null, "indexesRef"));
         }
+        
+        if (element.hasAttributeNS(null, "metricsBaseName")) {
+            builder.addPropertyValue("metricsBaseName", element.getAttributeNS(null,  "metricsBaseName"));
+        }
 
         builder.addPropertyReference("parserPool", getParserPoolRef(element));
 
diff --git a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
index 0dec3898..f0884845 100644
--- a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
@@ -3,7 +3,8 @@
     xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:security="urn:mace:shibboleth:2.0:security"
     xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
-    elementFormDefault="qualified">
+    elementFormDefault="qualified"
+    version="5.0.0">
 
     <annotation>
         <documentation>Schema describing metadata providers and filters.</documentation>
@@ -721,6 +722,14 @@
                         </documentation>
                     </annotation>
                 </attribute>
+                <attribute name="metricsBaseName" type="shibmd:string">
+                    <annotation>
+                        <documentation>
+                            Prefix name for metrics exposed by this resolver, defaults to the class name
+                            and the bean ID.
+                        </documentation>
+                    </annotation>
+                </attribute>
             </extension>
         </complexContent>
     </complexType>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicBasicParams.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicBasicParams.xml
index c0ee5ad9..f2661e01 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicBasicParams.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicBasicParams.xml
@@ -18,6 +18,7 @@
     cleanupTaskInterval="PT20M"
     httpClientRef="apacheClient"
     supportedContentTypes="text/xml"
+    metricsBaseName="dynamicBasicParams"
     >
 
 </metadata:MetadataProvider>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicMetadataQueryProtocol.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicMetadataQueryProtocol.xml
index 58e9917b..8195a172 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicMetadataQueryProtocol.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamicMetadataQueryProtocol.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
 
-	id="dynamicMDQ" xsi:type="metadata:DynamicHTTPMetadataProvider" disregardTLSCertificate="true">
+	id="dynamicMDQ" xsi:type="metadata:DynamicHTTPMetadataProvider" disregardTLSCertificate="true" metricsBaseName="dynamicMDQ">
     
         <metadata:MetadataQueryProtocol>
             https://mdq.incommon.org
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/localDynamicDefaults.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/localDynamicDefaults.xml
index f1698505..b547fc07 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/localDynamicDefaults.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/localDynamicDefaults.xml
@@ -7,6 +7,7 @@
 	id="localDynamicDefaults" xsi:type="metadata:LocalDynamicMetadataProvider"
     sourceManagerRef="metadata.LocalDynamicSourceManager"
     sourceKeyGeneratorRef="metadata.LocalDynamicSourceKeyGenerator"
+    metricsBaseName="localDynamicDefaults"
     >
 
 </metadata:MetadataProvider>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.