Merge pull request #10 from elandau/feature/spectator_id

Use Id for spectator baseId so it may include tags

Author: elandau

concurrency-limits-grpc/src/test/java/com/netflix/concurrency/limits/grpc/server/ConcurrencyLimitServerInterceptorTest.java

@@ -44,8 +44,8 @@ public class ConcurrencyLimitServerInterceptorTest {
     private static final Key<String> ID_HEADER = Metadata.Key.of("id", Metadata.ASCII_STRING_MARSHALLER);
 
     Registry spectatorRegistry = new DefaultRegistry();
-    SpectatorMetricRegistry serverRegistry = new SpectatorMetricRegistry("grpc.server.call", spectatorRegistry);
-    SpectatorMetricRegistry clientRegistry = new SpectatorMetricRegistry("grpc.client.call", spectatorRegistry);
+    SpectatorMetricRegistry serverRegistry = new SpectatorMetricRegistry(spectatorRegistry, spectatorRegistry.createId("grpc.server.call.limter"));
+    SpectatorMetricRegistry clientRegistry = new SpectatorMetricRegistry(spectatorRegistry, spectatorRegistry.createId("grpc.client.call.limter"));
 
     @Test
     @Ignore

concurrency-limits-spectator/src/main/java/com/netflix/concurrency/limits/spectator/SpectatorMetricRegistry.java

@@ -2,37 +2,42 @@
 
 import com.netflix.concurrency.limits.MetricRegistry;
 import com.netflix.spectator.api.DistributionSummary;
+import com.netflix.spectator.api.Id;
 import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.patterns.PolledMeter;
 
 import java.util.function.Supplier;
 
 public final class SpectatorMetricRegistry implements MetricRegistry {
     private final Registry registry;
-    private final String baseId;
+    private final Id baseId;
 
-    public SpectatorMetricRegistry(String baseId, Registry registry) {
+    public SpectatorMetricRegistry(Registry registry, Id baseId) {
         this.registry = registry;
         this.baseId = baseId;
     }
 
     public void registerGuage(String id, Supplier<Number> supplier) {
         PolledMeter.using(registry)
-            .withName(this.baseId + "." + id)
+            .withId(suffixBaseId(id))
             .monitorValue(this, o -> supplier.get().doubleValue());
     }
 
     @Override
     public SampleListener registerDistribution(String id, String... tagNameValuePairs) {
-        DistributionSummary summary = registry.distributionSummary(this.baseId + "." + id, tagNameValuePairs);
+        DistributionSummary summary = registry.distributionSummary(suffixBaseId(id).withTags(tagNameValuePairs));
         return value -> summary.record(value.longValue());
     }
 
     @Override
     public void registerGuage(String id, Supplier<Number> supplier, String... tagNameValuePairs) {
         PolledMeter.using(registry)
-            .withName(this.baseId + "." + id)
-            .withTags(tagNameValuePairs)
+            .withId(suffixBaseId(id).withTags(tagNameValuePairs))
             .monitorValue(this, o -> supplier.get().doubleValue());
     }
+    
+    private Id suffixBaseId(String suffix) {
+        return registry.createId(this.baseId.name() + "." + suffix).withTags(this.baseId.tags());
+    }
+
 }