From 445c9ef974f1bb5715b59ce79ffa852646fb96b7 Mon Sep 17 00:00:00 2001 From: Dan Halperin Date: Wed, 19 Apr 2017 12:13:59 -0700 Subject: [PATCH] [BEAM-2017] Fix NPE in DataflowRunner when there are no metrics --- .../org/apache/beam/runners/dataflow/DataflowMetrics.java | 7 ++++++- .../apache/beam/runners/dataflow/DataflowMetricsTest.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java index 9d28ef6027706..d4d29dd7a9af3 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java @@ -17,11 +17,14 @@ */ package org.apache.beam.runners.dataflow; +import static com.google.common.base.MoreObjects.firstNonNull; + import com.google.api.services.dataflow.model.JobMetrics; import com.google.auto.value.AutoValue; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import java.io.IOException; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -169,7 +172,9 @@ private MetricQueryResults queryServiceForMetrics(MetricsFilter filter) { LOG.warn("Unable to query job metrics.\n"); return DataflowMetricQueryResults.create(counters, distributions, gauges); } - metricUpdates = jobMetrics.getMetrics(); + metricUpdates = firstNonNull( + jobMetrics.getMetrics(), + Collections.emptyList()); return populateMetricQueryResults(metricUpdates, filter); } diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java index 1017978deb9d5..ddb719cc2230e 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java @@ -98,7 +98,7 @@ public void testEmptyMetricUpdates() throws IOException { job.jobId = JOB_ID; JobMetrics jobMetrics = new JobMetrics(); - jobMetrics.setMetrics(ImmutableList.of()); + jobMetrics.setMetrics(null /* this is how the APIs represent empty metrics */); DataflowClient dataflowClient = mock(DataflowClient.class); when(dataflowClient.getJobMetrics(JOB_ID)).thenReturn(jobMetrics);