add a test for forecast by status for the usage endpoint

Author: Hendrik Muhs

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/stats/ForecastStats.java

@@ -69,16 +69,18 @@ public ForecastStats(StreamInput in) throws IOException {
         this.statusCounts = new CountAccumulator(in);
     }
 
-    public void merge(ForecastStats other) {
+    public ForecastStats merge(ForecastStats other) {
         if (other == null) {
-            return;
+            return this;
         }
         total += other.total;
         forecastedJobs += other.forecastedJobs;
         memoryStats.merge(other.memoryStats);
         recordStats.merge(other.recordStats);
         runtimeStats.merge(other.runtimeStats);
         statusCounts.merge(other.statusCounts);
+
+        return this;
     }
 
     @Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/stats/ForecastStatsTests.java

@@ -236,7 +236,7 @@ protected Reader<ForecastStats> instanceReader() {
         return ForecastStats::new;
     }
 
-    private ForecastStats createForecastStats(long minTotal, long maxTotal) {
+    public ForecastStats createForecastStats(long minTotal, long maxTotal) {
         ForecastStats forecastStats = new ForecastStats(randomLongBetween(minTotal, maxTotal), createStatsAccumulator(),
                 createStatsAccumulator(), createStatsAccumulator(), createCountAccumulator());
 

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java

@@ -219,8 +219,7 @@ private void addJobsUsage(GetJobsStatsAction.Response response) {
                         js -> new StatsAccumulator()).add(detectorsCount);
                 modelSizeStatsByState.computeIfAbsent(jobState,
                         js -> new StatsAccumulator()).add(modelSize);
-                forecastStatsByState.computeIfAbsent(jobState,
-                        js -> new ForecastStats()).merge(jobStats.getForecastStats());
+                forecastStatsByState.merge(jobState, jobStats.getForecastStats(), (f1, f2) -> f1.merge(f2));
             }
 
             jobsUsage.put(MachineLearningFeatureSetUsage.ALL, createJobUsageEntry(jobs.size(), allJobsDetectorsStats,

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSetTests.java

@@ -39,6 +39,9 @@
 import org.elasticsearch.xpack.core.ml.job.config.Job;
 import org.elasticsearch.xpack.core.ml.job.config.JobState;
 import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSizeStats;
+import org.elasticsearch.xpack.core.ml.stats.ForecastStats;
+import org.elasticsearch.xpack.core.ml.stats.ForecastStatsTests;
+import org.elasticsearch.xpack.core.ml.stats.StatsAccumulatorTests;
 import org.elasticsearch.xpack.core.watcher.support.xcontent.XContentSource;
 import org.junit.Before;
 
@@ -138,11 +141,11 @@ public void testUsage() throws Exception {
         settings.put("xpack.ml.enabled", true);
 
         Job opened1 = buildJob("opened1", Arrays.asList(buildMinDetector("foo")));
-        GetJobsStatsAction.Response.JobStats opened1JobStats = buildJobStats("opened1", JobState.OPENED, 100L);
+        GetJobsStatsAction.Response.JobStats opened1JobStats = buildJobStats("opened1", JobState.OPENED, 100L, 3L);
         Job opened2 = buildJob("opened2", Arrays.asList(buildMinDetector("foo"), buildMinDetector("bar")));
-        GetJobsStatsAction.Response.JobStats opened2JobStats = buildJobStats("opened2", JobState.OPENED, 200L);
+        GetJobsStatsAction.Response.JobStats opened2JobStats = buildJobStats("opened2", JobState.OPENED, 200L, 8L);
         Job closed1 = buildJob("closed1", Arrays.asList(buildMinDetector("foo"), buildMinDetector("bar"), buildMinDetector("foobar")));
-        GetJobsStatsAction.Response.JobStats closed1JobStats = buildJobStats("closed1", JobState.CLOSED, 300L);
+        GetJobsStatsAction.Response.JobStats closed1JobStats = buildJobStats("closed1", JobState.CLOSED, 300L, 0);
         givenJobs(Arrays.asList(opened1, opened2, closed1),
                 Arrays.asList(opened1JobStats, opened2JobStats, closed1JobStats));
 
@@ -210,6 +213,15 @@ public void testUsage() throws Exception {
             assertThat(source.getValue("datafeeds._all.count"), equalTo(3));
             assertThat(source.getValue("datafeeds.started.count"), equalTo(2));
             assertThat(source.getValue("datafeeds.stopped.count"), equalTo(1));
+
+            assertThat(source.getValue("jobs._all.forecasts.total"), equalTo(11));
+            assertThat(source.getValue("jobs._all.forecasts.forecasted_jobs"), equalTo(2));
+
+            assertThat(source.getValue("jobs.closed.forecasts.total"), equalTo(0));
+            assertThat(source.getValue("jobs.closed.forecasts.forecasted_jobs"), equalTo(0));
+
+            assertThat(source.getValue("jobs.opened.forecasts.total"), equalTo(11));
+            assertThat(source.getValue("jobs.opened.forecasts.forecasted_jobs"), equalTo(2));
         }
     }
 
@@ -301,12 +313,16 @@ private static Job buildJob(String jobId, List<Detector> detectors) {
                 .build(new Date(randomNonNegativeLong()));
     }
 
-    private static GetJobsStatsAction.Response.JobStats buildJobStats(String jobId, JobState state, long modelBytes) {
+    private static GetJobsStatsAction.Response.JobStats buildJobStats(String jobId, JobState state, long modelBytes,
+            long numberOfForecasts) {
         ModelSizeStats.Builder modelSizeStats = new ModelSizeStats.Builder(jobId);
         modelSizeStats.setModelBytes(modelBytes);
         GetJobsStatsAction.Response.JobStats jobStats = mock(GetJobsStatsAction.Response.JobStats.class);
+        ForecastStats forecastStats = buildForecastStats(numberOfForecasts);
+
         when(jobStats.getJobId()).thenReturn(jobId);
         when(jobStats.getModelSizeStats()).thenReturn(modelSizeStats.build());
+        when(jobStats.getForecastStats()).thenReturn(forecastStats);
         when(jobStats.getState()).thenReturn(state);
         return jobStats;
     }
@@ -316,4 +332,8 @@ private static GetDatafeedsStatsAction.Response.DatafeedStats buildDatafeedStats
         when(stats.getDatafeedState()).thenReturn(state);
         return stats;
     }
+
+    private static ForecastStats buildForecastStats(long numberOfForecasts) {
+        return new ForecastStatsTests().createForecastStats(numberOfForecasts, numberOfForecasts);
+    }
 }