summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2021-06-14 12:49:29 +0200
committerGitHub <noreply@github.com>2021-06-14 12:49:29 +0200
commitecd9ca1e494af7cdc0bfdbec724b2d184cab434b (patch)
tree4153640118801cdce589db1f809dd8b20e4404b5
parent0ea88ffbb19624b2eb0c352fbbe7b3651c2ab894 (diff)
parent87ad1a7a89c01ab36ac34c790075eabe12b72bf2 (diff)
Merge pull request #18238 from vespa-engine/jonmv/vespa-feed-client
Jonmv/vespa feed client
-rw-r--r--vespa-feed-client/src/main/java/ai/vespa/feed/client/BenchmarkingCluster.java4
-rw-r--r--vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/BenchmarkingCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/BenchmarkingCluster.java
index 0e9bfe0ef46..840219a6bf1 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/BenchmarkingCluster.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/BenchmarkingCluster.java
@@ -40,14 +40,14 @@ public class BenchmarkingCluster implements Cluster {
@Override
public void dispatch(HttpRequest request, CompletableFuture<HttpResponse> vessel) {
requests.incrementAndGet();
- long startMillis = System.currentTimeMillis();
+ long startNanos = System.nanoTime();
delegate.dispatch(request, vessel);
vessel.whenCompleteAsync((response, thrown) -> {
results++;
if (thrown == null) {
responses++;
responsesByCode[response.code()]++;
- long latency = System.currentTimeMillis() - startMillis;
+ long latency = (System.nanoTime() - startNanos) / 1_000_000;
totalLatencyMillis += latency;
minLatencyMillis = Math.min(minLatencyMillis, latency);
maxLatencyMillis = Math.max(maxLatencyMillis, latency);
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
index 72fa675ecf1..3cce423735f 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
@@ -59,7 +59,7 @@ class HttpRequestStrategy implements RequestStrategy {
});
HttpRequestStrategy(FeedClientBuilder builder) throws IOException {
- this(builder, new BenchmarkingCluster(new OkCluster(builder)));
+ this(builder, new BenchmarkingCluster(new ApacheCluster(builder)));
}
HttpRequestStrategy(FeedClientBuilder builder, Cluster cluster) {