mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-03-27 12:55:28 +00:00
Code Issues Releases Wiki Activity

Add a convenience method to clear all registered metrics

Browse Source 
Also making these methods public so that other test methods can use them.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174074038
This commit is contained in:
jianglai
2017-10-31 12:25:58 -07:00
parent b0e062d725
commit d3254eaaeb
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/google/registry/monitoring/metrics/MetricRegistryImpl.java
View File

@@ -36,11 +36,10 @@ public final class MetricRegistryImpl implements MetricRegistry {
/** The canonical registry for metrics. The map key is the metric name. */
private final ConcurrentHashMap<String, Metric<?>> registeredMetrics = new ConcurrentHashMap<>();
/**
* Production code must use {@link getDefault}, since this returns the {@link MetricRegistry}
* that {@link MetricReporter} uses. Test code that does not use {@link MetricReporter} can
* use this constructor to get an isolated instance of the registry.
* Production code must use {@link #getDefault}, since this returns the {@link MetricRegistry}
* that {@link MetricReporter} uses. Test code that does not use {@link MetricReporter} can use
* this constructor to get an isolated instance of the registry.
*/
@VisibleForTesting
public MetricRegistryImpl() {}
@@ -144,11 +143,16 @@ public final class MetricRegistryImpl implements MetricRegistry {
* write intervals.
*/
@VisibleForTesting
void unregisterMetric(String name) {
public void unregisterMetric(String name) {
registeredMetrics.remove(name);
logger.info("Unregistered metric: " + name);
}
@VisibleForTesting
public void unregisterAllMetrics() {
registeredMetrics.clear();
}
/** Registers a metric. */
@VisibleForTesting
void registerMetric(String name, Metric<?> metric) {

9
javatests/google/registry/monitoring/metrics/MetricRegistryImplTest.java
View File

@@ -37,19 +37,14 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class MetricRegistryImplTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
@Rule public final ExpectedException thrown = ExpectedException.none();
private final LabelDescriptor label =
LabelDescriptor.create("test_labelname", "test_labeldescription");
@After
public void clearMetrics() {
ImmutableList<Metric<?>> metrics = MetricRegistryImpl.getDefault().getRegisteredMetrics();
for (Metric<?> metric : metrics) {
MetricRegistryImpl.getDefault().unregisterMetric(metric.getMetricSchema().name());
}
MetricRegistryImpl.getDefault().unregisterAllMetrics();
}
@Test