Skip to content

Commit 066d211

Browse files
authored
Making sure there's a distinction between metrics publisher and metrics publisher's publish frequency (#199)
Co-authored-by: Sundaram Ananthanarayanan <sananthanarayanan@netflix.com>
1 parent 256d3cd commit 066d211

File tree

2 files changed

+3
-6
lines changed
  • mantis-control-plane

2 files changed

+3
-6
lines changed

mantis-control-plane/mantis-control-plane-core/src/main/java/io/mantisrx/server/core/CoreConfiguration.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,11 @@ public interface CoreConfiguration {
5454
@Default("true")
5555
boolean isLocalMode();
5656

57-
@Config("mantis.metricsPublisher")
57+
@Config("mantis.metricsPublisher.class")
5858
@Default("io.mantisrx.common.metrics.MetricsPublisherNoOp")
5959
MetricsPublisher getMetricsPublisher();
6060

6161
@Config("mantis.metricsPublisher.publishFrequencyInSeconds")
6262
@Default("15")
6363
int getMetricsPublisherFrequencyInSeconds();
64-
65-
@Config("mantis.metricsPublisher.config.prefix")
66-
@Default("")
67-
String getMetricsPublisherConfigPrefix();
6864
}

mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/MasterMain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,9 @@ public MasterMain(ConfigurationFactory configFactory, AuditEventSubscriber audit
198198
ConfigurationProvider.getConfig().getActiveSlaveAttributeName());
199199

200200
// start serving metrics
201-
if (config.getMasterMetricsPort() > 0)
201+
if (config.getMasterMetricsPort() > 0) {
202202
new MetricsServerService(config.getMasterMetricsPort(), 1, Collections.emptyMap()).start();
203+
}
203204
new MetricsPublisherService(config.getMetricsPublisher(), config.getMetricsPublisherFrequencyInSeconds(),
204205
new HashMap<>()).start();
205206

0 commit comments

Comments
 (0)