Merge pull request #4328 from vespa-engine/bjorncs/stabilize

Only include if non-null MERGEOK
vespa-engine · Jan 30, 2025 · cea5d91 · cea5d91
2 parents ee5dc5a + 5271117
commit cea5d91
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/lib/performance_test.rb b/lib/performance_test.rb
@@ -163,8 +163,10 @@ def fill_feeder_json(json)
       result.add_metric('feeder.minlatency', json['http.response.latency.millis.min'].to_s)
       result.add_metric('feeder.maxlatency', json['http.response.latency.millis.max'].to_s)
       result.add_metric('feeder.avglatency', json['http.response.latency.millis.avg'].to_s)
-      result.add_metric("feeder.operation.avg_latency", json.dig("operation.latency", "avg").to_s)
-      result.add_metric('feeder.response.200.avg_latency', json.dig("http.response", "200", "latency", "avg").to_s)
+      operation_latency = json.dig("operation.latency", "avg")
+      result.add_metric("feeder.operation.avg_latency", operation_latency.to_s) if operation_latency
+      response_200_latency = json.dig("http.response", "200", "latency", "avg")
+      result.add_metric('feeder.response.200.avg_latency', response_200_latency.to_s) if response_200_latency
       result.add_parameter('loadgiver', 'vespa-feed-client')
     end
   end

diff --git a/...lient/java-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/Utils.java b/...lient/java-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/Utils.java
@@ -68,7 +68,10 @@ static void printJsonReport(Duration duration, OperationStats stats, String load
             generator.writeStartObject();
             generator.writeNumberField("feeder.runtime", duration.toMillis());
             generator.writeNumberField("feeder.okcount", stats.successes());
-            generator.writeNumberField("feeder.errorcount", stats.exceptions() + stats.responsesByCode().entrySet().stream().filter(entry -> entry.getKey() != 200).map(Entry::getValue).reduce(0L, Long::sum));
+            generator.writeNumberField("feeder.errorcount", stats.exceptions() + stats.statsByCode().entrySet().stream()
+                    .filter(entry -> entry.getKey() != 200)
+                    .map(e -> e.getValue().count())
+                    .reduce(0L, Long::sum));
             generator.writeNumberField("feeder.exceptions", stats.exceptions());
             generator.writeNumberField("feeder.bytessent", stats.bytesSent());
             generator.writeNumberField("feeder.bytesreceived", stats.bytesReceived());

diff --git a/...-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/VespaFeedClient.java b/...-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/VespaFeedClient.java
@@ -31,9 +31,8 @@ public static void main(String[] args) throws IOException {
         FeedClient client = createFeedClient();
         AtomicReference<OperationStats> stats = new AtomicReference<>();
         ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-        executor.schedule(() -> { stats.set(client.stats()); },
-                          warmupSeconds(), TimeUnit.SECONDS);
-        executor.schedule(() -> { stats.set(client.stats().since(stats.get())); executor.shutdown(); },
+        executor.schedule(client::resetStats, warmupSeconds(), TimeUnit.SECONDS);
+        executor.schedule(() -> { stats.set(client.stats()); executor.shutdown(); },
                           warmupSeconds() + benchmarkSeconds(), TimeUnit.SECONDS);
         executor.scheduleAtFixedRate(() -> { System.err.println(client.stats()); },
                                      1, 1, TimeUnit.SECONDS);

diff --git a/...-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/VespaJsonFeeder.java b/...-feed-client/src/main/java/com/yahoo/vespa/systemtest/javafeedclient/VespaJsonFeeder.java
@@ -46,7 +46,7 @@ public static void main(String[] args) throws IOException {
         AtomicReference<OperationStats> stats = new AtomicReference<>();
         AtomicLong startNanos = new AtomicLong();
         ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-        executor.schedule(() -> { stats.set(client.stats()); startNanos.set(System.nanoTime()); },
+        executor.schedule(() -> { client.resetStats(); startNanos.set(System.nanoTime()); },
                           warmupSeconds(), TimeUnit.SECONDS);
         executor.scheduleAtFixedRate(() -> { System.err.println(client.stats()); },
                                      1, 1, TimeUnit.SECONDS);
@@ -55,7 +55,7 @@ public static void main(String[] args) throws IOException {
              JsonFeeder feeder = JsonFeeder.builder(client).withRoute(route()).build()) {
             feeder.feedMany(in);
         }
-        printJsonReport(Duration.ofNanos(System.nanoTime() - startNanos.get()), client.stats().since(stats.get()), "vespa-json-feeder");
+        printJsonReport(Duration.ofNanos(System.nanoTime() - startNanos.get()), client.stats(), "vespa-json-feeder");
         executor.shutdown();
     }