Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5FAF5200BEE for ; Sat, 17 Dec 2016 02:43:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E49E160B32; Sat, 17 Dec 2016 01:43:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A9274160B24 for ; Sat, 17 Dec 2016 02:43:41 +0100 (CET) Received: (qmail 67166 invoked by uid 500); 17 Dec 2016 01:43:40 -0000 Mailing-List: contact commits-help@bookkeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bookkeeper-dev@bookkeeper.apache.org Delivered-To: mailing list commits@bookkeeper.apache.org Received: (qmail 67156 invoked by uid 99); 17 Dec 2016 01:43:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Dec 2016 01:43:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB7EEDF9A3; Sat, 17 Dec 2016 01:43:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sijie@apache.org To: commits@bookkeeper.apache.org Message-Id: <6aa261329f1d4eca9f0f2546c263576f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: bookkeeper git commit: BOOKKEEPER-971: update bk codahale stats provider version Date: Sat, 17 Dec 2016 01:43:40 +0000 (UTC) archived-at: Sat, 17 Dec 2016 01:43:42 -0000 Repository: bookkeeper Updated Branches: refs/heads/master 4bb57ef0b -> be99f024d BOOKKEEPER-971: update bk codahale stats provider version Update bk stats provider: from codahale to yammer. Currently io.dropwizard.metrics 3.1.0 is used most widely. will change version to 3.1.0. And change CodahaleMetricsProvider.getMetrics() to public, since this would be used outside package. And a small bug here: ``` File outdir; if (Strings.isNullOrEmpty(prefix)) { < === if (!) outdir = new File(csvDir, prefix); } else { outdir = new File(csvDir); } ``` Author: jiazhai Author: jiazhai Reviewers: Sijie Guo Closes #83 from jiazhai/BOOKKEEPER-971 Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/be99f024 Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/be99f024 Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/be99f024 Branch: refs/heads/master Commit: be99f024df5d53b3988f585ab46d6b604592acf1 Parents: 4bb57ef Author: jiazhai Authored: Fri Dec 16 17:43:34 2016 -0800 Committer: Sijie Guo Committed: Fri Dec 16 17:43:34 2016 -0800 ---------------------------------------------------------------------- .../codahale-metrics-provider/pom.xml | 16 ++++++++++------ .../bookkeeper/stats/CodahaleMetricsProvider.java | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/be99f024/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml ---------------------------------------------------------------------- diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index f372458..5623e1c 100644 --- a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -38,20 +38,24 @@ bookkeeper-stats-api ${project.parent.version} + + - com.codahale.metrics + io.dropwizard.metrics metrics-core - 3.0.1 + 3.1.0 + - com.codahale.metrics + io.dropwizard.metrics metrics-jvm - 3.0.1 + 3.1.0 + - com.codahale.metrics + io.dropwizard.metrics metrics-graphite - 3.0.1 + 3.1.0 com.google.guava http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/be99f024/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java ---------------------------------------------------------------------- diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java index a434b3c..934076f 100644 --- a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java +++ b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java @@ -62,7 +62,7 @@ public class CodahaleMetricsProvider implements StatsProvider { } } - synchronized MetricRegistry getMetrics() { + public synchronized MetricRegistry getMetrics() { return metrics; } @@ -94,7 +94,7 @@ public class CodahaleMetricsProvider implements StatsProvider { // 2/ the output directory must exist // 3/ if output files already exist they are not overwritten and there is no metrics output File outdir; - if (Strings.isNullOrEmpty(prefix)) { + if (!Strings.isNullOrEmpty(prefix)) { outdir = new File(csvDir, prefix); } else { outdir = new File(csvDir);