Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3C6D8200C85 for ; Fri, 21 Apr 2017 19:52:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B8B6160B97; Fri, 21 Apr 2017 17:52:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 53AB8160BBA for ; Fri, 21 Apr 2017 19:52:52 +0200 (CEST) Received: (qmail 83888 invoked by uid 500); 21 Apr 2017 17:52:47 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 81912 invoked by uid 99); 21 Apr 2017 17:52:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Apr 2017 17:52:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A39AF49EF; Fri, 21 Apr 2017 17:52:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.apache.org Date: Fri, 21 Apr 2017 17:53:22 -0000 Message-Id: In-Reply-To: <81a83b1aaa36486787c87c6752608c7d@git.apache.org> References: <81a83b1aaa36486787c87c6752608c7d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] beam git commit: [BEAM-2017] Fix NPE in DataflowRunner when there are no metrics archived-at: Fri, 21 Apr 2017 17:52:53 -0000 [BEAM-2017] Fix NPE in DataflowRunner when there are no metrics Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4c28c99c Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4c28c99c Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4c28c99c Branch: refs/heads/gearpump-runner Commit: 4c28c99cac26c1ec42b9bc9d20a03e53c43b1a7c Parents: d54ace4 Author: Dan Halperin Authored: Wed Apr 19 12:13:59 2017 -0700 Committer: Dan Halperin Committed: Wed Apr 19 14:19:49 2017 -0700 ---------------------------------------------------------------------- .../org/apache/beam/runners/dataflow/DataflowMetrics.java | 7 ++++++- .../org/apache/beam/runners/dataflow/DataflowMetricsTest.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/4c28c99c/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java ---------------------------------------------------------------------- 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 9d28ef6..d4d29dd 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 @@ class DataflowMetrics extends MetricResults { 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); } http://git-wip-us.apache.org/repos/asf/beam/blob/4c28c99c/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java ---------------------------------------------------------------------- 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 1017978..ddb719c 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 class DataflowMetricsTest { 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);