Skip to content

Commit

Permalink
Revert "If jmx-reporter isn't provided with a metrics registry, use t…
Browse files Browse the repository at this point in the history
…he default."

This reverts commit 6191e22.
It turns out a JmxReporter is always created for the default metrics registry.
  • Loading branch information
ryantenney committed Mar 1, 2012
1 parent df6f8ef commit 4e04e30
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
Expand Up @@ -2,10 +2,8 @@


import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element; import org.w3c.dom.Element;


import com.yammer.metrics.Metrics;
import com.yammer.metrics.spring.JmxReporterFactory; import com.yammer.metrics.spring.JmxReporterFactory;


public class JmxReporterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { public class JmxReporterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
Expand All @@ -23,12 +21,7 @@ protected boolean shouldGenerateIdAsFallback() {
@Override @Override
protected void doParse(Element element, BeanDefinitionBuilder builder) { protected void doParse(Element element, BeanDefinitionBuilder builder) {
builder.setFactoryMethod("createInstance"); builder.setFactoryMethod("createInstance");
String registry = element.getAttribute("metrics-registry"); builder.addConstructorArgReference(element.getAttribute("metrics-registry"));
if (StringUtils.hasText(registry)) {
builder.addConstructorArgReference(registry);
} else {
builder.addConstructorArgValue(Metrics.defaultRegistry());
}
} }


} }
Expand Up @@ -32,7 +32,7 @@
<xsd:element name="jmx-reporter"> <xsd:element name="jmx-reporter">
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="id" type="xsd:string" use="optional"/> <xsd:attribute name="id" type="xsd:string" use="optional"/>
<xsd:attribute name="metrics-registry" type="xsd:string" use="optional"/> <xsd:attribute name="metrics-registry" type="xsd:string" use="required"/>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>


Expand Down

0 comments on commit 4e04e30

Please sign in to comment.