[beam] branch release-2.19.0 updated: [BEAM-9065] Reset MetricsContainerStepMapAccumulator upon initialization of MetricsAccumulator singleton because metrics need to be reset when several pipelines are run inside the same JVM

[boyuanz]

This is an automated email from the ASF dual-hosted git repository.

boyuanz pushed a commit to branch release-2.19.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.19.0 by this push:
     new 3f07189  [BEAM-9065] Reset MetricsContainerStepMapAccumulator upon 
initialization of MetricsAccumulator singleton because metrics need to be reset 
when several pipelines are run inside the same JVM
     new 85417f1  Merge pull request #10670 from 
echauchot/release-2.19.0-patched
3f07189 is described below

commit 3f07189a2a01dbc9c39282c1889d17e24f7f3f06
Author: Etienne Chauchot <echauc...@apache.org>
AuthorDate: Wed Jan 8 11:36:36 2020 +0100

    [BEAM-9065] Reset MetricsContainerStepMapAccumulator upon initialization of 
MetricsAccumulator singleton because metrics need to be reset when several 
pipelines are run inside the same JVM
    
    (cherry picked from commit fd3da1e68f18560954f9c736146c7565e4a1af0f)
---
 .../java/org/apache/beam/runners/spark/metrics/MetricsAccumulator.java  | 2 ++
 .../runners/spark/structuredstreaming/metrics/MetricsAccumulator.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/metrics/MetricsAccumulator.java
 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/metrics/MetricsAccumulator.java
index 2d83c3c..8313d73 100644
--- 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/metrics/MetricsAccumulator.java
+++ 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/metrics/MetricsAccumulator.java
@@ -74,6 +74,8 @@ public class MetricsAccumulator {
         }
       }
       LOG.info("Instantiated metrics accumulator: " + instance.value());
+    } else {
+      instance.reset();
     }
   }
 
diff --git 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/structuredstreaming/metrics/MetricsAccumulator.java
 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/structuredstreaming/metrics/MetricsAccumulator.java
index f674ef9..e182cf0 100644
--- 
a/runners/spark/src/main/java/org/apache/beam/runners/spark/structuredstreaming/metrics/MetricsAccumulator.java
+++ 
b/runners/spark/src/main/java/org/apache/beam/runners/spark/structuredstreaming/metrics/MetricsAccumulator.java
@@ -51,6 +51,8 @@ public class MetricsAccumulator {
         }
       }
       LOG.info("Instantiated metrics accumulator: " + instance.value());
+    } else {
+      instance.reset();
     }
   }