[hotfix][metrics] Remove unnecessary ScopeFormats constructor
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/280dcc23 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/280dcc23 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/280dcc23 Branch: refs/heads/master Commit: 280dcc23670bc5c162aee44d0b8a89d07503ccd9 Parents: d11a983 Author: zentol <[email protected]> Authored: Mon Oct 30 15:11:39 2017 +0100 Committer: zentol <[email protected]> Committed: Tue Oct 31 11:53:45 2017 +0100 ---------------------------------------------------------------------- .../metrics/MetricRegistryConfiguration.java | 2 +- .../runtime/metrics/scope/ScopeFormats.java | 21 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/280dcc23/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java index b61ec5d..e72a980 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java @@ -97,7 +97,7 @@ public class MetricRegistryConfiguration { scopeFormats = ScopeFormats.fromConfig(configuration); } catch (Exception e) { LOG.warn("Failed to parse scope format, using default scope formats", e); - scopeFormats = new ScopeFormats(); + scopeFormats = ScopeFormats.fromConfig(new Configuration()); } char delim; http://git-wip-us.apache.org/repos/asf/flink/blob/280dcc23/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/scope/ScopeFormats.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/scope/ScopeFormats.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/scope/ScopeFormats.java index 986d7ef..7f37b7f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/scope/ScopeFormats.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/scope/ScopeFormats.java @@ -36,27 +36,6 @@ public class ScopeFormats { // ------------------------------------------------------------------------ /** - * Creates all default scope formats. - */ - public ScopeFormats() { - this.jobManagerFormat = new JobManagerScopeFormat(MetricOptions.SCOPE_NAMING_JM.defaultValue()); - - this.jobManagerJobFormat = new JobManagerJobScopeFormat( - MetricOptions.SCOPE_NAMING_JM_JOB.defaultValue(), this.jobManagerFormat); - - this.taskManagerFormat = new TaskManagerScopeFormat(MetricOptions.SCOPE_NAMING_TM.defaultValue()); - - this.taskManagerJobFormat = new TaskManagerJobScopeFormat( - MetricOptions.SCOPE_NAMING_TM_JOB.defaultValue(), this.taskManagerFormat); - - this.taskFormat = new TaskScopeFormat( - MetricOptions.SCOPE_NAMING_TASK.defaultValue(), this.taskManagerJobFormat); - - this.operatorFormat = new OperatorScopeFormat( - MetricOptions.SCOPE_NAMING_OPERATOR.defaultValue(), this.taskFormat); - } - - /** * Creates all scope formats, based on the given scope format strings. */ public ScopeFormats(
