aboutsummaryrefslogtreecommitdiffstats
path: root/metrics-proxy
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-06-03 12:42:30 +0200
committergjoranv <gv@verizonmedia.com>2019-06-03 12:48:52 +0200
commit464f98fe34d1a9e030b7fd43f5b0ef40869e42ad (patch)
tree5b8c5ddbbbf568efb72217ddc718cbbbfb561782 /metrics-proxy
parentfa09b83d6de9bcb041f00d74176bd3afe6cc8a6b (diff)
Remove unused ServiceListener interface.
Diffstat (limited to 'metrics-proxy')
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java14
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java10
-rw-r--r--metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java3
3 files changed, 3 insertions, 24 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java
deleted file mode 100644
index 810eb5fb908..00000000000
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
- */
-
-package ai.vespa.metricsproxy.service;
-
-import java.util.List;
-
-/**
- * @author Unknown
- */
-public interface ServiceListener {
- void setServices(List<VespaService> services);
-}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
index e19d65f2838..e33674e87b0 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
@@ -26,11 +26,11 @@ import java.util.logging.Logger;
*
* @author Eirik Nygaard
*/
-public class SystemPoller implements ServiceListener {
+public class SystemPoller {
final private static Logger log = Logger.getLogger(SystemPoller.class.getName());
private final int pollingIntervalSecs;
- private volatile List<VespaService> services;
+ private final List<VespaService> services;
private final int memoryTypeVirtual = 0;
private final int memoryTypeResident = 1;
@@ -45,12 +45,6 @@ public class SystemPoller implements ServiceListener {
systemPollTimer = new Timer("systemPollTimer", true);
}
- @Override
- public void setServices(List<VespaService> services) {
- log.log(LogLevel.DEBUG, "Setting services in SystemPoller to: " + services);
- this.services = services;
- }
-
void stop() {
systemPollTimer.cancel();
}
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
index a42d52b7ea6..c5f2ea6960b 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
@@ -25,8 +25,7 @@ public class SystemPollerTest {
SystemPoller poller = new SystemPoller(services, 60*5);
assertThat(s.isAlive(), is(false));
- services.remove(0);
- poller.setServices(services);
+
long n = poller.getPidJiffies(s);
assertThat(n, is(0L));
long[] memusage = poller.getMemoryUsage(s);