You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2016/12/15 19:12:11 UTC
[1/2] incubator-beam git commit: Don't incorrectly log error in
MetricsEnvironment
Repository: incubator-beam
Updated Branches:
refs/heads/release-0.4.0-incubating 5dcffe066 -> c09fbd43b
Don't incorrectly log error in MetricsEnvironment
Using getCurrentContainer() logs an error if metrics are not supported.
This is because it acts as the common point of access for user code that
reports metrics.
It should not be used within setCurrentContainer(), because the first
container being set will have a null previous-current-container, which
will cause the error to be incorrectly logged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/e864ac21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e864ac21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e864ac21
Branch: refs/heads/release-0.4.0-incubating
Commit: e864ac2141e31a930b85264506d06579ba6811de
Parents: 5dcffe0
Author: bchambers <bc...@google.com>
Authored: Wed Dec 14 11:23:39 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Thu Dec 15 11:12:00 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e864ac21/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java
index 7c06cbf..5d7cb0b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java
@@ -56,7 +56,7 @@ public class MetricsEnvironment {
*/
@Nullable
public static MetricsContainer setCurrentContainer(@Nullable MetricsContainer container) {
- MetricsContainer previous = getCurrentContainer();
+ MetricsContainer previous = CONTAINER_FOR_THREAD.get();
if (container == null) {
CONTAINER_FOR_THREAD.remove();
} else {
[2/2] incubator-beam git commit: This closes #1625
Posted by tg...@apache.org.
This closes #1625
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c09fbd43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c09fbd43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c09fbd43
Branch: refs/heads/release-0.4.0-incubating
Commit: c09fbd43b0cdaa57cffc1925c313dcf91390adc7
Parents: 5dcffe0 e864ac2
Author: Thomas Groh <tg...@google.com>
Authored: Thu Dec 15 11:12:01 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Thu Dec 15 11:12:01 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/metrics/MetricsEnvironment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------