diff options
Diffstat (limited to 'metrics-proxy')
3 files changed, 7 insertions, 3 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java index 6d41fc93c25..ec5bd53cb21 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java @@ -3,6 +3,8 @@ package ai.vespa.metricsproxy.service; import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; + +import java.time.Duration; import java.util.logging.Level; import com.yahoo.jrt.ErrorCode; @@ -170,7 +172,7 @@ public class ConfigSentinelClient extends AbstractComponent { } if (connection.isValid()) { Request req = new Request("sentinel.ls"); - connection.invokeSync(req, 5.0); + connection.invokeSync(req, Duration.ofSeconds(5)); if (req.errorCode() == ErrorCode.NONE && req.checkReturnTypes("s")) { diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java index 8c8a44deae6..cf3610fe0bb 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java @@ -14,6 +14,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; +import java.time.Duration; import java.util.List; import static ai.vespa.metricsproxy.TestUtil.getFileContents; @@ -35,7 +36,7 @@ public class RpcHealthMetricsTest { getFileContents("health-check-failed.response.json"); private static final String WANTED_RPC_RESPONSE = getFileContents("rpc-json-output-check.json").trim(); - private static final double RPC_INVOKE_TIMEOUT = 60.0; + private static final Duration RPC_INVOKE_TIMEOUT = Duration.ofSeconds(60); @Rule diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java index cedf7542233..1e7a398b3d0 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.junit.rules.Timeout; import java.io.IOException; +import java.time.Duration; import java.util.List; import static ai.vespa.metricsproxy.TestUtil.getFileContents; @@ -45,7 +46,7 @@ public class RpcMetricsTest { private static final String METRICS_RESPONSE = getFileContents("metrics-storage-simple.json").trim(); private static final String EXTRA_APP = "extra"; - private static final double RPC_INVOKE_TIMEOUT = 60.0; + private static final Duration RPC_INVOKE_TIMEOUT = Duration.ofSeconds(60); private static class RpcClient implements AutoCloseable { private final Supervisor supervisor; |