fix validation metrics for default publisher (#974)

When using the default publisher, the debug registry was always null rather than falling back to using the registry it is publishing for. This means that some of the validation metrics would be missing.
Netflix · May 17, 2022 · 1fe89a9 · 1fe89a9
1 parent d46c08b
commit 1fe89a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/AtlasConfig.java b/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/AtlasConfig.java
@@ -18,7 +18,6 @@
 import com.netflix.spectator.api.Clock;
 import com.netflix.spectator.api.Registry;
 import com.netflix.spectator.api.RegistryConfig;
-import com.netflix.spectator.atlas.impl.DefaultPublisher;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -258,6 +257,6 @@ default long initialPollingDelay(Clock clock, long stepSize) {
    * path.
    */
   default Publisher publisher() {
-    return new DefaultPublisher(this);
+    return null;
   }
 }
diff --git a/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/AtlasRegistry.java b/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/AtlasRegistry.java
@@ -28,6 +28,7 @@
 import com.netflix.spectator.api.Tag;
 import com.netflix.spectator.api.Timer;
 import com.netflix.spectator.atlas.impl.Consolidator;
+import com.netflix.spectator.atlas.impl.DefaultPublisher;
 import com.netflix.spectator.atlas.impl.EvalPayload;
 import com.netflix.spectator.atlas.impl.Evaluator;
 import com.netflix.spectator.atlas.impl.JsonUtils;
@@ -136,13 +137,13 @@ public AtlasRegistry(Clock clock, AtlasConfig config) {
     this.debugRegistry = Optional.ofNullable(config.debugRegistry()).orElse(this);
 
     this.rollupPolicy = config.rollupPolicy();
-    this.publisher = config.publisher();
 
-    this.subManager = new SubscriptionManager(
-        new ObjectMapper(),
-        client != null ? client : HttpClient.create(debugRegistry),
-        clock,
-        config);
+    HttpClient httpClient = client != null ? client : HttpClient.create(debugRegistry);
+
+    Publisher pub = config.publisher();
+    this.publisher = pub == null ? new DefaultPublisher(config, httpClient, debugRegistry) : pub;
+
+    this.subManager = new SubscriptionManager(new ObjectMapper(), httpClient, clock, config);
     this.evaluator = new Evaluator(commonTags, this::toMap, lwcStepMillis);
 
     if (config.autoStart()) {

diff --git a/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/impl/DefaultPublisher.java b/spectator-reg-atlas/src/main/java/com/netflix/spectator/atlas/impl/DefaultPublisher.java
@@ -72,12 +72,18 @@ public DefaultPublisher(final AtlasConfig config) {
   }
 
   public DefaultPublisher(final AtlasConfig config, final HttpClient client) {
+    this(config, client, config.debugRegistry());
+  }
+
+  public DefaultPublisher(
+      final AtlasConfig config, final HttpClient client, final Registry registry) {
+
     this.uri = URI.create(config.uri());
     this.evalUri = URI.create(config.evalUri());
     this.connectTimeout = (int) config.connectTimeout().toMillis();
     this.readTimeout = (int) config.readTimeout().toMillis();
     this.numThreads = config.numThreads();
-    this.debugRegistry = Optional.ofNullable(config.debugRegistry()).orElse(new NoopRegistry());
+    this.debugRegistry = Optional.ofNullable(registry).orElse(new NoopRegistry());
 
     this.client = client != null ? client : HttpClient.create(debugRegistry);