Merge pull request #26827 from vespa-engine/mpolden/feed-client-9

Less locking

2 files changed, 6 insertions, 5 deletions

diff --git a/client/go/internal/cli/cmd/feed.go b/client/go/internal/cli/cmd/feed.go
index 06568dd35c3..8635f4aa41b 100644
--- a/client/go/internal/cli/cmd/feed.go
+++ b/client/go/internal/cli/cmd/feed.go
@@ -139,6 +139,7 @@ func feed(r io.Reader, cli *CLI, options feedOptions) error {
 		Route:       options.route,
 		TraceLevel:  options.traceLevel,
 		BaseURL:     service.BaseURL,
+		NowFunc:     cli.now,
 	}, clients)
 	throttler := document.NewThrottler(options.connections)
 	// TODO(mpolden): Make doom duration configurable
diff --git a/client/go/internal/cli/cmd/feed_test.go b/client/go/internal/cli/cmd/feed_test.go
index 521d2b2abd0..eb641005ab7 100644
--- a/client/go/internal/cli/cmd/feed_test.go
+++ b/client/go/internal/cli/cmd/feed_test.go
@@ -44,9 +44,9 @@ func TestFeed(t *testing.T) {
 
 	assert.Equal(t, "", stderr.String())
 	want := `{
-  "feeder.seconds": 1.000,
+  "feeder.seconds": 3.000,
   "feeder.ok.count": 1,
-  "feeder.ok.rate": 1.000,
+  "feeder.ok.rate": 0.333,
   "feeder.error.count": 0,
   "feeder.inflight.count": 0,
   "http.request.count": 1,
@@ -57,9 +57,9 @@ func TestFeed(t *testing.T) {
   "http.response.bytes": 16,
   "http.response.MBps": 0.000,
   "http.response.error.count": 0,
-  "http.response.latency.millis.min": 0,
-  "http.response.latency.millis.avg": 0,
-  "http.response.latency.millis.max": 0,
+  "http.response.latency.millis.min": 1000,
+  "http.response.latency.millis.avg": 1000,
+  "http.response.latency.millis.max": 1000,
   "http.response.code.counts": {
     "200": 1
   }