Merge pull request #10693: [BEAM-6957] Enable Counter/Distribution me…

…trics tests for Portable Spark Runner
apache · Jan 28, 2020 · 44a92d7 · 44a92d7
2 parents fe5717c + 7c464ea
commit 44a92d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/runners/spark/job-server/build.gradle b/runners/spark/job-server/build.gradle
@@ -99,11 +99,8 @@ def portableValidatesRunnerTask(String name) {
       includeCategories 'org.apache.beam.sdk.testing.ValidatesRunner'
       excludeCategories 'org.apache.beam.sdk.testing.FlattenWithHeterogeneousCoders'
       excludeCategories 'org.apache.beam.sdk.testing.LargeKeys$Above100MB'
-      excludeCategories 'org.apache.beam.sdk.testing.UsesAttemptedMetrics'
       excludeCategories 'org.apache.beam.sdk.testing.UsesCommittedMetrics'
-      excludeCategories 'org.apache.beam.sdk.testing.UsesCounterMetrics'
       excludeCategories 'org.apache.beam.sdk.testing.UsesCustomWindowMerging'
-      excludeCategories 'org.apache.beam.sdk.testing.UsesDistributionMetrics'
       excludeCategories 'org.apache.beam.sdk.testing.UsesFailureMessage'
       excludeCategories 'org.apache.beam.sdk.testing.UsesGaugeMetrics'
       excludeCategories 'org.apache.beam.sdk.testing.UsesParDoLifecycle'

diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineResult.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineResult.java
@@ -155,9 +155,10 @@ static class PortableBatchMode extends BatchMode implements PortablePipelineResu
     }
 
     @Override
-    public JobApi.MetricResults portableMetrics() throws UnsupportedOperationException {
-      LOG.warn("Collecting monitoring infos is not implemented yet in Spark portable runner.");
-      return JobApi.MetricResults.newBuilder().build();
+    public JobApi.MetricResults portableMetrics() {
+      return JobApi.MetricResults.newBuilder()
+          .addAllAttempted(MetricsAccumulator.getInstance().value().getMonitoringInfos())
+          .build();
     }
   }