KYLIN-2776 Using dropwizard as default metric framework modify metrics configuration name
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/01f1756b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/01f1756b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/01f1756b Branch: refs/heads/master Commit: 01f1756b847d53000f5578547239ce4f23e5e8e3 Parents: a5a8def Author: yiming.xu <100650...@qq.com> Authored: Tue Sep 5 16:38:56 2017 +0800 Committer: Hongbin Ma <m...@kyligence.io> Committed: Wed Sep 6 10:53:07 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/common/KylinConfigBase.java | 14 +++++++------- .../common/metrics/metrics2/CodahaleMetrics.java | 4 ++-- .../metrics/metrics2/JsonFileMetricsReporter.java | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/01f1756b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 7184553..9db2f0b 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -1198,20 +1198,20 @@ abstract public class KylinConfigBase implements Serializable { /** * metric */ - public String getCoadhaleMetricReportClassesName() { - return getOptional("kylin.metric.codahale-metric-report-classes", + public String getCoadhaleMetricsReportClassesNames() { + return getOptional("kylin.metrics.reporter-classes", "org.apache.kylin.common.metrics.metrics2.JsonFileMetricsReporter,org.apache.kylin.common.metrics.metrics2.JmxMetricsReporter"); } - public String getMetricFileLocation() { - return getOptional("kylin.metric.file.location", "/tmp/report.json"); + public String getMetricsFileLocation() { + return getOptional("kylin.metrics.file-location", "/tmp/report.json"); } - public Long getJsonFileMetricsReporterInterval() { - return Long.parseLong(getOptional("kylin.metric.json-file-metric-reporter.interval", "5000")); + public Long getMetricsReporterFrequency() { + return Long.parseLong(getOptional("kylin.metrics.file-frequency", "5000")); } public String getPerfLoggerClassName() { - return getOptional("kylin.metric.perf-logger.class", "org.apache.kylin.common.metrics.perflog.PerfLogger"); + return getOptional("kylin.metrics.perflogger-class", "org.apache.kylin.common.metrics.perflog.PerfLogger"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/01f1756b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/CodahaleMetrics.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/CodahaleMetrics.java b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/CodahaleMetrics.java index 8cc79e7..bae6cfb 100644 --- a/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/CodahaleMetrics.java +++ b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/CodahaleMetrics.java @@ -387,7 +387,7 @@ public class CodahaleMetrics implements Metrics { private boolean initCodahaleMetricsReporterClasses() { List<String> reporterClasses = Lists.newArrayList(Splitter.on(",").trimResults().omitEmptyStrings() - .split(KylinConfig.getInstanceFromEnv().getCoadhaleMetricReportClassesName())); + .split(KylinConfig.getInstanceFromEnv().getCoadhaleMetricsReportClassesNames())); if (reporterClasses.isEmpty()) { return false; } @@ -424,7 +424,7 @@ public class CodahaleMetrics implements Metrics { private boolean initMetricsReporter() { List<String> metricsReporterNames = Lists.newArrayList(Splitter.on(",").trimResults().omitEmptyStrings() - .split(KylinConfig.getInstanceFromEnv().getCoadhaleMetricReportClassesName())); + .split(KylinConfig.getInstanceFromEnv().getCoadhaleMetricsReportClassesNames())); if (metricsReporterNames.isEmpty()) { return false; } http://git-wip-us.apache.org/repos/asf/kylin/blob/01f1756b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/JsonFileMetricsReporter.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/JsonFileMetricsReporter.java b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/JsonFileMetricsReporter.java index 6e8ad76..7bacaf1 100644 --- a/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/JsonFileMetricsReporter.java +++ b/core-common/src/main/java/org/apache/kylin/common/metrics/metrics2/JsonFileMetricsReporter.java @@ -51,7 +51,7 @@ public class JsonFileMetricsReporter implements CodahaleReporter { private final ObjectWriter jsonWriter; private final ScheduledExecutorService executorService; private final KylinConfig conf; - private final long interval; + private final long frequency; private final String pathString; private final Path path; @@ -63,8 +63,8 @@ public class JsonFileMetricsReporter implements CodahaleReporter { executorService = Executors.newSingleThreadScheduledExecutor(); this.conf = conf; - interval = KylinConfig.getInstanceFromEnv().getJsonFileMetricsReporterInterval(); - pathString = KylinConfig.getInstanceFromEnv().getMetricFileLocation(); + frequency = KylinConfig.getInstanceFromEnv().getMetricsReporterFrequency(); + pathString = KylinConfig.getInstanceFromEnv().getMetricsFileLocation(); path = new Path(pathString); } @@ -126,7 +126,7 @@ public class JsonFileMetricsReporter implements CodahaleReporter { } }; - executorService.scheduleWithFixedDelay(task, 0, interval, TimeUnit.MILLISECONDS); + executorService.scheduleWithFixedDelay(task, 0, frequency, TimeUnit.MILLISECONDS); } @Override
