Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delegate to ConcurrentHashMap values Spliterator in AbstractRegistry #988

Merged
merged 1 commit into from Sep 12, 2022
Merged

Delegate to ConcurrentHashMap values Spliterator in AbstractRegistry #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions spectator-api/src/main/java/com/netflix/spectator/api/AbstractRegistry.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

import java.util.Iterator;
import java.util.Map;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
Expand Down Expand Up @@ -278,6 +279,11 @@ protected <T extends Meter> T getOrCreate(Id id, Class<T> cls, T dflt, Function<
return meters.values().iterator();
}

@Override
public final Spliterator<Meter> spliterator() {
return meters.values().spliterator();
}

/**
* Can be called by sub-classes to remove expired meters from the internal map.
* The SwapMeter types that are returned will lookup a new copy on the next access.
Expand Down
15 changes: 15 additions & 0 deletions spectator-api/src/test/java/com/netflix/spectator/api/RegistryTest.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import java.util.List;
import java.util.LongSummaryStatistics;
import java.util.Map;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -585,6 +586,20 @@ public void maxGaugeCanBeNegative() {
Assertions.assertEquals(-42.0, r.maxGauge("test").value(), 1e-12);
}

@Test
public void spliteratorCharacteristicsAndEstimatedSize() {
Registry registry = newRegistry(false, 20);
registry.counter("foo").increment();
registry.counter("bar").increment();
registry.counter("baz").increment();

Spliterator<Meter> spliterator = registry.spliterator();

Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.NONNULL));
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.CONCURRENT));
Assertions.assertEquals(3, spliterator.estimateSize());
}

@Test
public void customIdTags() {
DefaultRegistry r = newRegistry(false, 10000);
Expand Down