[hotfix][metrics] Remove unnecessary ScopeFormats constructor

Pance · Oct 31, 2017 · 280dcc2 · 280dcc2
1 parent d11a983
commit 280dcc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/...k-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java b/...k-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java
@@ -97,7 +97,7 @@ public static MetricRegistryConfiguration fromConfiguration(Configuration config
  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;

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
@@ -35,27 +35,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.
  */