diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/MetricRegistry.java b/api/src/main/java/org/eclipse/microprofile/metrics/MetricRegistry.java index f9af6005..4723cb9b 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/MetricRegistry.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/MetricRegistry.java @@ -43,42 +43,19 @@ public interface MetricRegistry { /** - * An enumeration representing the scopes of the MetricRegistry - */ - enum Type { - /** - * The Application (default) scoped MetricRegistry. Any metric registered/accessed via CDI will use this - * MetricRegistry. - */ - APPLICATION("application"), - - /** - * The Base scoped MetricRegistry. This MetricRegistry will contain required metrics specified in the - * MicroProfile Metrics specification. - */ - BASE("base"), - - /** - * The Vendor scoped MetricRegistry. This MetricRegistry will contain vendor provided metrics which may vary - * between different vendors. - */ - VENDOR("vendor"); - - private final String name; - - Type(String name) { - this.name = name; - } - - /** - * Returns the name of the MetricRegistry scope. - * - * @return the scope - */ - public String getName() { - return name; - } - } + * String constant to represent the scope value used for the application scope + */ + public static final String APPLICATION_SCOPE = "application"; + + /** + * String constant to represent the scope value used for the vendor scope + */ + public static final String VENDOR_SCOPE = "vendor"; + + /** + * String constant to represent the scope value used for the base scope + */ + public static final String BASE_SCOPE = "base"; /** * Concatenates elements to form a dotted name, eliding any null values or empty strings. @@ -751,10 +728,10 @@ static String name(Class klass, String... names) { Map getMetadata(); /** - * Returns the type of this metric registry. + * Returns the scope of this metric registry. * - * @return Type of this registry (VENDOR, BASE, APPLICATION) + * @return Scope of this registry (VENDOR, BASE, APPLICATION) */ - Type getType(); + String getScope(); } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Counted.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Counted.java index ea6e0296..65e4be80 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Counted.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Counted.java @@ -29,6 +29,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricUnits; import jakarta.enterprise.util.Nonbinding; @@ -144,4 +145,13 @@ @Nonbinding String unit() default MetricUnits.NONE; + /** + * The scope that this counter belongs to. + * + * @return The scope this counter belongs to. By default, the value is {@link MetricRegistry.APPLICATION_SCOPE}. + * + */ + @Nonbinding + String scope() default MetricRegistry.APPLICATION_SCOPE; + } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Gauge.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Gauge.java index 35853d65..cb58033c 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Gauge.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Gauge.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2017 Contributors to the Eclipse Foundation + * Copyright (c) 2017, 2022 Contributors to the Eclipse Foundation * 2010-2013 Coda Hale, Yammer.com * * See the NOTICES file(s) distributed with this work for additional @@ -27,6 +27,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.eclipse.microprofile.metrics.MetricRegistry; + import jakarta.enterprise.util.Nonbinding; import jakarta.interceptor.InterceptorBinding; @@ -115,4 +117,13 @@ @Nonbinding String unit(); + /** + * The scope that this gauge belongs to. + * + * @return The scope this gauge belongs to. By default, the value is {@link MetricRegistry.APPLICATION_SCOPE}. + * + */ + @Nonbinding + String scope() default MetricRegistry.APPLICATION_SCOPE; + } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Metric.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Metric.java index d9cb517d..3b3b199b 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Metric.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Metric.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2017, 2019 Contributors to the Eclipse Foundation + * Copyright (c) 2017, 2022 Contributors to the Eclipse Foundation * 2012 Ryan W Tenney (ryan@10e.us) * * See the NOTICES file(s) distributed with this work for additional @@ -27,6 +27,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricUnits; import jakarta.enterprise.util.Nonbinding; @@ -114,4 +115,12 @@ @Nonbinding String unit() default MetricUnits.NONE; + /** + * The scope that this metric belongs to. + * + * @return The scope this metric belongs to. By default, the value is {@link MetricRegistry.APPLICATION_SCOPE}. + * + */ + @Nonbinding + String scope() default MetricRegistry.APPLICATION_SCOPE; } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryType.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryScope.java similarity index 61% rename from api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryType.java rename to api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryScope.java index be6aef7a..8b794841 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryType.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/RegistryScope.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2017 Contributors to the Eclipse Foundation + * Copyright (c) 2017, 2022 Contributors to the Eclipse Foundation * * See the NOTICES file(s) distributed with this work for additional * information regarding copyright ownership. @@ -29,10 +29,8 @@ import org.eclipse.microprofile.metrics.MetricRegistry; -import jakarta.inject.Qualifier; - /** - * Qualifies the type of Metric Registry to inject. + * Specifies the scope of Metric Registry to inject. *

* This can be used to obtain the respective scoped {@link MetricRegistry}: *

@@ -40,27 +38,35 @@ * 
  * 
  *      {@literal @}Inject
- *      {@literal @}RegistryType(type=MetricRegistry.Type.BASE)
- *      MetricRegistry baseRegistry;
+ *      {@literal @}RegistryScope(scope=MetricRegistry.APPLICATION_SCOPE)
+ *      MetricRegistry appRegistry;
+ * 
+ *      {@literal @}Inject
+ *      {@literal @}RegistryScope(scope="customScope")
+ *      MetricRegistry customRegistry;
+ * 
  * 
  *
* - * @see org.eclipse.microprofile.metrics.MetricRegistry.Type + * see {@link MetricRegistry.APPLICATION_SCOPE}, {@link MetricRegistry.BASE_SCOPE} and + * {@link MetricRegistry.VENDOR_SCOPE} * * @author Raymond Lam * */ -@Qualifier @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE}) -public @interface RegistryType { +public @interface RegistryScope { /** * The scope of the MetricRegistry. * - * @return Returns the scope of the MetricRegistry. The {@link MetricRegistry.Type} can be {@code APPLICATION}, - * {@code BASE}, or {@code VENDOR}. - * @see org.eclipse.microprofile.metrics.MetricRegistry.Type + * @return Indicates the scope of the MetricRegistry to be injected. The MicroProfile runtimes provides + * {@code application}, {@code base} and {@code vendor} scopes automatically and creates user-defined scopes + * as needed. + * + * see {@link MetricRegistry.APPLICATION_SCOPE}, {@link MetricRegistry.BASE_SCOPE} and + * {@link MetricRegistry.VENDOR_SCOPE} */ - MetricRegistry.Type type() default MetricRegistry.Type.APPLICATION; + String scope() default MetricRegistry.APPLICATION_SCOPE; } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Timed.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Timed.java index 139d92ba..830a4f35 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Timed.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/Timed.java @@ -29,6 +29,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricUnits; import jakarta.enterprise.util.Nonbinding; @@ -138,4 +139,13 @@ @Nonbinding String unit() default MetricUnits.NANOSECONDS; + /** + * The scope that this Timer belongs to. + * + * @return The scope this Timer belongs to. By default, the value is {@link MetricRegistry.APPLICATION_SCOPE}. + * + */ + @Nonbinding + String scope() default MetricRegistry.APPLICATION_SCOPE; + } diff --git a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/package-info.java b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/package-info.java index 1fcae015..423df588 100644 --- a/api/src/main/java/org/eclipse/microprofile/metrics/annotation/package-info.java +++ b/api/src/main/java/org/eclipse/microprofile/metrics/annotation/package-info.java @@ -70,17 +70,18 @@ * * * - *

CDI Qualifier

+ *

RegistryScope annotation

*

- * The {@link org.eclipse.microprofile.metrics.annotation.RegistryType RegistryType} is used to identify which - * MetricRegistry (Application, Base, or Vendor) should be injected. By default, no - * RegistryType will inject the application MetricRegistry. + * The {@link org.eclipse.microprofile.metrics.annotation.RegistryScope RegistryScope} is used to identify which + * MetricRegistry (Application, Base, Vendor or a user-defined scope) should be injected. Injecting a + * MetricRegistry without a RegistryScope annotation gives the application-scoped + * MetricRegistry. * * 

  * 
  *      {@literal @}Inject
- *      {@literal @}RegistryType(type=MetricRegistry.Type.BASE)
- *      MetricRegistry baseRegistry;
+ *      {@literal @}RegistryScope(scope=MetricRegistry.APPLICATION_SCOPE)
+ *      MetricRegistry appRegistry;
  * 
  *
* diff --git a/spec/src/main/asciidoc/app-programming-model.adoc b/spec/src/main/asciidoc/app-programming-model.adoc index cb7f815f..46cbee7d 100644 --- a/spec/src/main/asciidoc/app-programming-model.adoc +++ b/spec/src/main/asciidoc/app-programming-model.adoc @@ -106,12 +106,12 @@ The following Annotations exist, see below for common fields: |=== |Annotation | Description | Default -|@RegistryType| Qualifies the scope of Metric Registry to inject when injecting a MetricRegistry. | _application_ (scope) +|@RegistryScope| Indicates the scope of Metric Registry to inject when injecting a MetricRegistry. | _application_ (scope) |=== ==== Fields -All annotations (Except `RegistryType`) have the following fields that correspond to the metadata fields described +All annotations (Except `RegistryScope`) have the following fields that correspond to the metadata fields described in <>. `String name`:: Optional. Sets the name of the metric. If not explicitly given the name of the annotated object is used. @@ -120,6 +120,7 @@ If `false`, prepends the package name and class name before the given name. Defa `String displayName`:: Optional. A human readable display name for metadata. `String description`:: Optional. A description of the metric. `String unit`:: Unit of the metric. For `@Gauge` no default is provided. Check the `MetricUnits` class for a set of pre-defined units. +`String scope`:: Optional. The `MetricRegistry` scope that this metric belongs to. Default value is `application`. NOTE: Implementors are encouraged to issue warnings in the server log if metadata is missing. Implementors MAY stop the deployment of an application if Metadata is missing. @@ -468,19 +469,19 @@ There is one shared singleton of the `MetricRegistry` per pre-defined scope (_ap There is also one shared singleton of the `MetricRegistry` per custom scope. When metrics are registered using annotations and no scope is provided, the metrics are registered in the _application_ `MetricRegistry` (and thus the _application_ scope). -When injected, the `@RegistryType` is used as a qualifier to selectively inject one of the `APPLICATION`, `BASE`, `VENDOR` or custom registries. -If no qualifier is used, the default `MetricRegistry` returned is the `APPLICATION` registry. +When injected, the `@RegistryScope` is used to selectively inject one of the `application`, `base`, `vendor` or custom registries. +If no _scope_ parameter is used, the default `MetricRegistry` returned is the `application` registry. Implementations may choose to use a Factory class to produce the injectable `MetricRegistry` bean via CDI. See <>. Note: The factory would be an internal class and not exposed to the application. -==== @RegistryType -The `@RegistryType` can be used to retrieve the `MetricRegistry` for a specific scope. -The implementation must produce the corresponding `MetricRegistry` specified by the `RegistryType`. +==== @RegistryScope +The `@RegistryScope` can be used to retrieve the `MetricRegistry` for a specific scope. +The implementation must produce the corresponding `MetricRegistry` specified by the `RegistryScope`. NOTE: The implementor can optionally provide a _read_only_ copy of the `MetricRegistry` for _base_ and _vendor_ scopes. ==== Application Metric Registry -The implementation must produce the _application_ `MetricRegistry` when no `RegistryType` is provided (`@Default`) or when the `RegistryType` is `APPLICATION`. +The implementation must produce the _application_ `MetricRegistry` when no `RegistryScope` is provided or when the `RegistryScope` is `application` (i.e. `MetricRegistry.APPLICATION_SCOPE`). Application-defined metrics can also be registered to <> .Example of the application injecting the application registry [source, java] @@ -493,45 +494,43 @@ MetricRegistry metricRegistry; [source, java] ---- @Inject -@RegistryType(type=MetricRegistry.Type.APPLICATION) +@RegistryScope(scope=MetricRegistry.APPLICATION_SCOPE) MetricRegistry metricRegistry; ---- ==== Base Metric Registry -The implementation must produce the _base_ `MetricRegistry` when the `RegistryType` is `BASE`. The _base_ `MetricRegistry` must contain the required metrics specified in <>. +The implementation must produce the _base_ `MetricRegistry` when the `RegistryScope` is `base` (i.e. `MetricRegistry.BASE_SCOPE`). The _base_ `MetricRegistry` must contain the required metrics specified in <>. .Example of the application injecting the base registry [source, java] ---- @Inject -@RegistryType(type=MetricRegistry.Type.BASE) +@RegistryScope(scope=MetricRegistry.BASE_SCOPE) MetricRegistry baseRegistry; ---- ==== Vendor Metric Registry -The implementation must produce the _vendor_ `MetricRegistry` when the `RegistryType` is `VENDOR`. The _vendor_ `MetricRegistry` must contain any vendor specific metrics. +The implementation must produce the _vendor_ `MetricRegistry` when the `RegistryScope` is `vendor` (i.e. `MetricRegistry.VENDOR_SCOPE`). The _vendor_ `MetricRegistry` must contain any vendor specific metrics. .Example of the application injecting the vendor registry [source, java] ---- @Inject -@RegistryType(type=MetricRegistry.Type.VENDOR) +@RegistryScope(scope=MetricRegistry.VENDOR_SCOPE) MetricRegistry vendorRegistry; ---- -==== Custom Metric Registries -The implementation must produce the `MetricRegistry` corresponding to the custom-named registry when the `RegistryType` is a custom value. If the custom-named MetricRegistry does not yet exist the implementation must create a `MetricRegistry` with the specified name. +[[pgm-custom-scope]] +The implementation must produce the `MetricRegistry` corresponding to the custom-named registry when the `RegistryType` is a custom value. If the custom-named `MetricRegistry` does not yet exist the implementation must create a `MetricRegistry` with the specified name. .Example of the application injecting a custom-named registry [source, java] ---- @Inject -@RegistryType(type="motorguide") +@RegistryScope(scope="motorguide") MetricRegistry motorGuideRegistry; ---- - - [[pgm-metadata]] ==== Metadata diff --git a/spec/src/main/asciidoc/appendix.adoc b/spec/src/main/asciidoc/appendix.adoc index 144abd80..1eacc055 100644 --- a/spec/src/main/asciidoc/appendix.adoc +++ b/spec/src/main/asciidoc/appendix.adoc @@ -89,29 +89,17 @@ This configuration can be backed into the runtime or be provided via an external public class MetricRegistryFactory { @Produces - public static MetricRegistry getDefaultRegistry() { - return getApplicationRegistry(); - } + @Default + public MetricRegistry getMetricRegistry(InjectionPoint ip) { - @Produces - @RegistryType(type = Type.APPLICATION) - public static MetricRegistry getApplicationRegistry() { - // Returns the static instance of the Application MetricRegistry - [...] - } + RegistryScope registryTypeAnnotation = ip.getAnnotated().getAnnotation(RegistryScope.class); - @Produces - @RegistryType(type = Type.BASE) - public static MetricRegistry getBaseRegistry() { - // Returns the static instance of the Base MetricRegistry - [...] - } - - @Produces - @RegistryType(type = Type.VENDOR) - public static MetricRegistry getVendorRegistry() { - // Returns the static instance of the Vendor MetricRegistry - [...] + if (registryTypeAnnotation == null) { + return getOrCreate(MetricRegistry.APPLICATION_SCOPE); + } else { + String annoScope = registryTypeAnnotation.scope(); + return getOrCreate(annoScope); + } } } diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.java index 37683a99..175d68fe 100644 --- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.java +++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.java @@ -31,7 +31,7 @@ import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.annotation.Metric; -import org.eclipse.microprofile.metrics.annotation.RegistryType; +import org.eclipse.microprofile.metrics.annotation.RegistryScope; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.junit.InSequence; @@ -47,6 +47,8 @@ @RunWith(Arquillian.class) public class MetricRegistryTest { + private static final String CUSTOM_SCOPE = "customScope"; + @Inject @Metric(name = "nameTest", absolute = true) private Counter nameTest; @@ -55,13 +57,17 @@ public class MetricRegistryTest { private MetricRegistry metrics; @Inject - @RegistryType(type = MetricRegistry.Type.BASE) + @RegistryScope(scope = MetricRegistry.BASE_SCOPE) private MetricRegistry baseMetrics; @Inject - @RegistryType(type = MetricRegistry.Type.VENDOR) + @RegistryScope(scope = MetricRegistry.VENDOR_SCOPE) private MetricRegistry vendorMetrics; + @Inject + @RegistryScope(scope = CUSTOM_SCOPE) + private MetricRegistry customScope; + @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class).addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); @@ -105,10 +111,11 @@ public void useExistingMetaDataTest() { @Test @InSequence(5) - public void testMetricRegistryType() { - Assert.assertEquals(MetricRegistry.Type.APPLICATION, metrics.getType()); - Assert.assertEquals(MetricRegistry.Type.BASE, baseMetrics.getType()); - Assert.assertEquals(MetricRegistry.Type.VENDOR, vendorMetrics.getType()); + public void testMetricRegistryScope() { + Assert.assertEquals(MetricRegistry.APPLICATION_SCOPE, metrics.getScope()); + Assert.assertEquals(MetricRegistry.BASE_SCOPE, baseMetrics.getScope()); + Assert.assertEquals(MetricRegistry.VENDOR_SCOPE, vendorMetrics.getScope()); + Assert.assertEquals(CUSTOM_SCOPE, customScope.getScope()); } private void assertExists(Class expected, MetricID metricID) { diff --git a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java index 6db751ae..99263b22 100644 --- a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java +++ b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java @@ -262,7 +262,7 @@ public void testBaseSingularMetricsPresent() { List missing = new ArrayList<>(); - Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); for (MiniMeta item : baseNames.values()) { if (item.name.startsWith("gc.")) { @@ -316,7 +316,7 @@ public void testBaseMetadataSingluarItems() { Map elements = jsonPath.getMap("."); List missing = new ArrayList<>(); - Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); for (String item : baseNames.keySet()) { if (item.startsWith("gc.") || baseNames.get(item).optional) { continue; @@ -340,7 +340,7 @@ public void testBaseMetadataTypeAndUnit() { Map> elements = jsonPath.getMap("."); - Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); checkMetadataPresent(elements, expectedMetadata); } @@ -408,7 +408,7 @@ public void testBaseMetadataSingluarItemsOpenMetrics() { String[] lines = data.split("\n"); - Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); for (MiniMeta mm : expectedMetadata.values()) { boolean found = false; @@ -571,7 +571,7 @@ public void testApplicationMetadataItems() { List missing = new ArrayList<>(); - Map names = getExpectedMetadataFromXmlFile(MetricRegistry.Type.APPLICATION); + Map names = getExpectedMetadataFromXmlFile(MetricRegistry.APPLICATION_SCOPE); for (String item : names.keySet()) { if (!elements.containsKey(item)) { missing.add(item); @@ -590,7 +590,7 @@ public void testApplicationMetadataTypeAndUnit() { Map> elements = jsonPath.getMap("."); - Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.Type.APPLICATION); + Map expectedMetadata = getExpectedMetadataFromXmlFile(MetricRegistry.APPLICATION_SCOPE); checkMetadataPresent(elements, expectedMetadata); } @@ -777,7 +777,7 @@ public void testOptionalBaseMetrics() { JsonPath jsonPath = given().header(wantJson).options("/metrics/base").jsonPath(); Map elements = jsonPath.getMap("."); - Map names = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map names = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); for (MiniMeta item : names.values()) { if (elements.containsKey(item.toJSONName()) && names.get(item.name).optional) { @@ -911,7 +911,7 @@ public void testGcCountMetrics() { Header wantJson = new Header("Accept", APPLICATION_JSON); JsonPath jsonPath = given().header(wantJson).get("/metrics/base").jsonPath(); - Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); MiniMeta gcCountMetricMeta = baseNames.get("gc.total"); Set expectedTags = gcCountMetricMeta.tags.keySet(); @@ -948,7 +948,7 @@ public void testGcTimeMetrics() { Header wantJson = new Header("Accept", APPLICATION_JSON); JsonPath jsonPath = given().header(wantJson).get("/metrics/base").jsonPath(); - Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.Type.BASE); + Map baseNames = getExpectedMetadataFromXmlFile(MetricRegistry.BASE_SCOPE); MiniMeta gcTimeMetricMeta = baseNames.get("gc.time"); Set expectedTags = gcTimeMetricMeta.tags.keySet(); @@ -1109,18 +1109,18 @@ private Matcher closeTo(double operand) { return allOf(greaterThan((float) (operand - delta)), lessThan((float) (operand + delta))); } - private Map getExpectedMetadataFromXmlFile(MetricRegistry.Type scope) { + private Map getExpectedMetadataFromXmlFile(String scope) { ClassLoader cl = this.getClass().getClassLoader(); String fileName; switch (scope) { - case BASE : + case "base" : fileName = "base_metrics.xml"; break; - case APPLICATION : + case "application" : fileName = "application_metrics.xml"; break; default : - throw new IllegalArgumentException("No definitions for " + scope.getName() + " supported"); + throw new IllegalArgumentException("No definitions for " + scope + " supported"); } InputStream is = cl.getResourceAsStream(fileName);