diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 401e28e..ed20a68 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -190,7 +190,7 @@ test - com.yammer.metrics + io.dropwizard.metrics metrics-core diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java index 3863c37..6fe3a60 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java @@ -20,12 +20,12 @@ package org.apache.hadoop.hbase.client; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Message; -import com.yammer.metrics.core.Counter; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.MetricsRegistry; -import com.yammer.metrics.core.Timer; -import com.yammer.metrics.reporting.JmxReporter; -import com.yammer.metrics.util.RatioGauge; +import com.codahale.metrics.Counter; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; +import com.codahale.metrics.JmxReporter; +import com.codahale.metrics.RatioGauge; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; @@ -44,8 +44,8 @@ import java.util.concurrent.TimeUnit; * This class is for maintaining the various connection statistics and publishing them through * the metrics interfaces. * - * This class manages its own {@link MetricsRegistry} and {@link JmxReporter} so as to not - * conflict with other uses of Yammer Metrics within the client application. Instantiating + * This class manages its own {@link MetricRegistry} and {@link JmxReporter} so as to not + * conflict with other uses of CodaHale Metrics within the client application. Instantiating * this class implicitly creates and "starts" instances of these classes; be sure to call * {@link #shutdown()} to terminate the thread pools they allocate. */ @@ -109,19 +109,19 @@ public class MetricsConnection { @VisibleForTesting final Histogram reqHist; @VisibleForTesting final Histogram respHist; - private CallTracker(MetricsRegistry registry, String name, String subName, String scope) { + private CallTracker(MetricRegistry registry, String name, String subName) { StringBuilder sb = new StringBuilder(CLIENT_SVC).append("_").append(name); if (subName != null) { sb.append("(").append(subName).append(")"); } this.name = sb.toString(); - this.callTimer = registry.newTimer(MetricsConnection.class, DRTN_BASE + this.name, scope); - this.reqHist = registry.newHistogram(MetricsConnection.class, REQ_BASE + this.name, scope); - this.respHist = registry.newHistogram(MetricsConnection.class, RESP_BASE + this.name, scope); + this.callTimer = registry.timer(DRTN_BASE + this.name); + this.reqHist = registry.histogram(REQ_BASE + this.name); + this.respHist = registry.histogram(RESP_BASE + this.name); } - private CallTracker(MetricsRegistry registry, String name, String scope) { - this(registry, name, null, scope); + private CallTracker(MetricRegistry registry, String name) { + this(registry, name, null); } public void updateRpc(CallStats stats) { @@ -233,19 +233,19 @@ public class MetricsConnection { */ private static final int CONCURRENCY_LEVEL = 256; - private final MetricsRegistry registry; + private final MetricRegistry registry; private final JmxReporter reporter; private final String scope; private final NewMetric timerFactory = new NewMetric() { @Override public Timer newMetric(Class clazz, String name, String scope) { - return registry.newTimer(clazz, name, scope); + return registry.timer(name); } }; private final NewMetric histogramFactory = new NewMetric() { @Override public Histogram newMetric(Class clazz, String name, String scope) { - return registry.newHistogram(clazz, name, scope); + return registry.histogram(name); } }; @@ -275,46 +275,38 @@ public class MetricsConnection { public MetricsConnection(final ConnectionImplementation conn) { this.scope = conn.toString(); - this.registry = new MetricsRegistry(); + this.registry = new MetricRegistry(); final ThreadPoolExecutor batchPool = (ThreadPoolExecutor) conn.getCurrentBatchPool(); final ThreadPoolExecutor metaPool = (ThreadPoolExecutor) conn.getCurrentMetaLookupPool(); - this.registry.newGauge(this.getClass(), "executorPoolActiveThreads", scope, - new RatioGauge() { - @Override protected double getNumerator() { - return batchPool.getActiveCount(); - } - @Override protected double getDenominator() { - return batchPool.getMaximumPoolSize(); - } - }); - this.registry.newGauge(this.getClass(), "metaPoolActiveThreads", scope, - new RatioGauge() { - @Override protected double getNumerator() { - return metaPool.getActiveCount(); - } - @Override protected double getDenominator() { - return metaPool.getMaximumPoolSize(); - } - }); - this.metaCacheHits = registry.newCounter(this.getClass(), "metaCacheHits", scope); - this.metaCacheMisses = registry.newCounter(this.getClass(), "metaCacheMisses", scope); - this.getTracker = new CallTracker(this.registry, "Get", scope); - this.scanTracker = new CallTracker(this.registry, "Scan", scope); - this.appendTracker = new CallTracker(this.registry, "Mutate", "Append", scope); - this.deleteTracker = new CallTracker(this.registry, "Mutate", "Delete", scope); - this.incrementTracker = new CallTracker(this.registry, "Mutate", "Increment", scope); - this.putTracker = new CallTracker(this.registry, "Mutate", "Put", scope); - this.multiTracker = new CallTracker(this.registry, "Multi", scope); + this.registry.register(MetricRegistry.name(this.getClass(), "executorPoolActiveThreads"), + new RatioGauge() { + @Override protected Ratio getRatio() { + return Ratio.of(batchPool.getActiveCount(), batchPool.getMaximumPoolSize()); + } + }); + this.registry.register(MetricRegistry.name(this.getClass(), "metaPoolActiveThreads"), + new RatioGauge() { + @Override protected Ratio getRatio() { + return Ratio.of(metaPool.getActiveCount(), metaPool.getMaximumPoolSize()); + }; + }); + this.metaCacheHits = registry.counter("metaCacheHits"); + this.metaCacheMisses = registry.counter("metaCacheMisses"); + this.getTracker = new CallTracker(this.registry, "Get"); + this.scanTracker = new CallTracker(this.registry, "Scan"); + this.appendTracker = new CallTracker(this.registry, "Mutate", "Append"); + this.deleteTracker = new CallTracker(this.registry, "Mutate", "Delete"); + this.incrementTracker = new CallTracker(this.registry, "Mutate", "Increment"); + this.putTracker = new CallTracker(this.registry, "Mutate", "Put"); + this.multiTracker = new CallTracker(this.registry, "Multi"); this.runnerStats = new RunnerStats(this.registry); - - this.reporter = new JmxReporter(this.registry); + this.reporter = JmxReporter.forRegistry(this.registry).build(); this.reporter.start(); } public void shutdown() { - this.reporter.shutdown(); - this.registry.shutdown(); + this.reporter.close(); } /** Produce an instance of {@link CallStats} for clients to attach to RPCs. */ diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java index 88a653e..5191880 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java @@ -112,9 +112,9 @@ public class TestMetricsConnection { METRICS.getTracker, METRICS.scanTracker, METRICS.multiTracker, METRICS.appendTracker, METRICS.deleteTracker, METRICS.incrementTracker, METRICS.putTracker }) { - Assert.assertEquals("Failed to invoke callTimer on " + t, loop, t.callTimer.count()); - Assert.assertEquals("Failed to invoke reqHist on " + t, loop, t.reqHist.count()); - Assert.assertEquals("Failed to invoke respHist on " + t, loop, t.respHist.count()); + Assert.assertEquals("Failed to invoke callTimer on " + t, loop, t.callTimer.getCount()); + Assert.assertEquals("Failed to invoke reqHist on " + t, loop, t.reqHist.getCount()); + Assert.assertEquals("Failed to invoke respHist on " + t, loop, t.respHist.getCount()); } } } diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index bae47d9..100a297 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -182,7 +182,7 @@ limitations under the License. ${hadoop-two.version} - com.yammer.metrics + io.dropwizard.metrics metrics-core diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java index 6d85542..edaec26 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java @@ -26,9 +26,9 @@ import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import com.yammer.metrics.stats.ExponentiallyDecayingSample; -import com.yammer.metrics.stats.Sample; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.ExponentiallyDecayingReservoir; +import com.codahale.metrics.Reservoir; +import com.codahale.metrics.Snapshot; /** * A histogram implementation that runs in constant space, and exports to hadoop2's metrics2 system. @@ -43,7 +43,7 @@ public class MutableHistogram extends MutableMetric implements MetricHistogram { private final String name; private final String desc; - private final Sample sample; + private final Reservoir sample; private final AtomicLong min; private final AtomicLong max; private final AtomicLong sum; @@ -56,7 +56,7 @@ public class MutableHistogram extends MutableMetric implements MetricHistogram { public MutableHistogram(String name, String description) { this.name = StringUtils.capitalize(name); this.desc = StringUtils.uncapitalize(description); - sample = new ExponentiallyDecayingSample(DEFAULT_SAMPLE_SIZE, DEFAULT_ALPHA); + sample = new ExponentiallyDecayingReservoir(DEFAULT_SAMPLE_SIZE, DEFAULT_ALPHA); count = new AtomicLong(); min = new AtomicLong(Long.MAX_VALUE); max = new AtomicLong(Long.MIN_VALUE); diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index c36be34..92243f0 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -234,7 +234,7 @@ ${jersey.version} - com.yammer.metrics + io.dropwizard.metrics metrics-core diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java index d05e039..7ba09c4 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase; import com.google.common.base.Objects; import com.google.common.collect.Sets; -import com.yammer.metrics.core.Histogram; +import com.codahale.metrics.Histogram; import org.apache.commons.cli.CommandLine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,7 +73,7 @@ public class IntegrationTestRegionReplicaPerf extends IntegrationTestBase { private static final String NUM_RS_KEY = "numRs"; private static final String NUM_RS_DEFAULT = "" + 3; - /** Extract a descriptive statistic from a {@link com.yammer.metrics.core.Histogram}. */ + /** Extract a descriptive statistic from a {@link com.codahale.metrics.Histogram}. */ private enum Stat { STDEV { @Override diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 94f0b72..26aad71 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -435,7 +435,7 @@ true - com.yammer.metrics + io.dropwizard.metrics metrics-core diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java index 24a4e32..622e461 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.io.hfile; import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Snapshot; /** * Snapshot of block cache age in cache. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java index 94638da..16e14e3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java @@ -31,9 +31,9 @@ import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.MetricsRegistry; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; /** * Utilty for aggregating counts in CachedBlocks and toString/toJSON CachedBlocks and BlockCaches. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java index 2dae66f..37f28e8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java @@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.hbase.classification.InterfaceAudience; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.MetricsRegistry; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.MetricRegistry; /** * Class that implements cache metrics. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java index 2818d88..36ec931 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java @@ -73,12 +73,12 @@ import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.Metric; -import com.yammer.metrics.core.MetricName; -import com.yammer.metrics.core.MetricPredicate; -import com.yammer.metrics.core.MetricsRegistry; -import com.yammer.metrics.reporting.ConsoleReporter; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricName; +import com.codahale.metrics.MetricPredicate; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.ConsoleReporter; /** * Implements pretty-printing functionality for {@link HFile}s. @@ -544,13 +544,13 @@ public class HFilePrettyPrinter extends Configured implements Tool { } private static class KeyValueStatsCollector { - private final MetricsRegistry metricsRegistry = new MetricsRegistry(); + private final MetricRegistry metricsRegistry = new MetricRegistry(); private final ByteArrayOutputStream metricsOutput = new ByteArrayOutputStream(); private final SimpleReporter simpleReporter = new SimpleReporter(metricsRegistry, new PrintStream(metricsOutput)); - Histogram keyLen = metricsRegistry.newHistogram(HFilePrettyPrinter.class, "Key length"); - Histogram valLen = metricsRegistry.newHistogram(HFilePrettyPrinter.class, "Val length"); - Histogram rowSizeBytes = metricsRegistry.newHistogram(HFilePrettyPrinter.class, "Row size (bytes)"); - Histogram rowSizeCols = metricsRegistry.newHistogram(HFilePrettyPrinter.class, "Row size (columns)"); + Histogram keyLen = metricsRegistry.histogram(HFilePrettyPrinter.class, "Key length"); + Histogram valLen = metricsRegistry.histogram(HFilePrettyPrinter.class, "Val length"); + Histogram rowSizeBytes = metricsRegistry.histogram(HFilePrettyPrinter.class, "Row size (bytes)"); + Histogram rowSizeCols = metricsRegistry.histogram(HFilePrettyPrinter.class, "Row size (columns)"); long curRowBytes = 0; long curRowCols = 0; @@ -613,7 +613,7 @@ public class HFilePrettyPrinter extends Configured implements Tool { private static class SimpleReporter extends ConsoleReporter { private final PrintStream out; - public SimpleReporter(MetricsRegistry metricsRegistry, PrintStream out) { + public SimpleReporter(MetricRegistry metricsRegistry, PrintStream out) { super(metricsRegistry, out, MetricPredicate.ALL); this.out = out; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index cc8a35c..95c3bb5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.mapreduce; import com.google.protobuf.InvalidProtocolBufferException; -import com.yammer.metrics.core.MetricsRegistry; +import com.codahale.metrics.MetricRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -775,7 +775,7 @@ public class TableMapReduceUtil { com.google.protobuf.Message.class, com.google.common.collect.Lists.class, org.apache.htrace.Trace.class, - com.yammer.metrics.core.MetricsRegistry.class); + com.codahale.metrics.MetricRegistry.class); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/YammerHistogramUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/YammerHistogramUtils.java index 120f170..a4c576d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/YammerHistogramUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/YammerHistogramUtils.java @@ -18,9 +18,9 @@ */ package org.apache.hadoop.hbase.util; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.stats.Sample; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Reservoir; +import com.codahale.metrics.Snapshot; import java.lang.reflect.Constructor; import java.text.DecimalFormat; @@ -37,7 +37,7 @@ public final class YammerHistogramUtils { private static DecimalFormat DOUBLE_FORMAT = new DecimalFormat("#0.00"); /** - * Create a new {@link com.yammer.metrics.core.Histogram} instance. These constructors are + * Create a new {@link com.codahale.metrics.Histogram} instance. These constructors are * not public in 2.2.0, so we use reflection to find them. */ public static Histogram newHistogram(Sample sample) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index 33b50d4..428ba83 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -93,8 +93,8 @@ import org.apache.htrace.impl.ProbabilitySampler; import com.google.common.base.Objects; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Snapshot; import com.yammer.metrics.stats.UniformSample; /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java index e35fc08..b99dd98 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java @@ -40,8 +40,8 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.stats.Snapshot; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Snapshot; import com.yammer.metrics.stats.UniformSample; @Category({MiscTests.class, SmallTests.class}) @@ -125,7 +125,7 @@ public class TestPerformanceEvaluation { opts.setValueSize(valueSize); RandomReadTest rrt = new RandomReadTest(null, opts, null); Constructor ctor = - Histogram.class.getDeclaredConstructor(com.yammer.metrics.stats.Sample.class); + Histogram.class.getDeclaredConstructor(com.codahale.metrics.Reservoir.class); ctor.setAccessible(true); Histogram histogram = (Histogram)ctor.newInstance(new UniformSample(1024 * 500)); for (int i = 0; i < 100; i++) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 7996c17..23ace75 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -62,10 +62,10 @@ import org.apache.htrace.Trace; import org.apache.htrace.TraceScope; import org.apache.htrace.impl.ProbabilitySampler; -import com.yammer.metrics.core.Histogram; +import com.codahale.metrics.Histogram; import com.yammer.metrics.core.Meter; -import com.yammer.metrics.core.MetricsRegistry; -import com.yammer.metrics.reporting.ConsoleReporter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.ConsoleReporter; // imports for things that haven't moved from regionserver.wal yet. import org.apache.hadoop.hbase.regionserver.wal.SecureProtobufLogReader; diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 78b8270..2af3d45 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -154,8 +154,8 @@ org.apache.hadoop.hbase.shaded.com.lmax - com.yammer - org.apache.hadoop.hbase.shaded.com.yammer + com.codahale + org.apache.hadoop.hbase.shaded.com.codahale diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index f80858b..7c3754e 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -235,7 +235,7 @@ - com.yammer.metrics + io.dropwizard.metrics metrics-core diff --git a/pom.xml b/pom.xml index d772c4b..66cc260 100644 --- a/pom.xml +++ b/pom.xml @@ -1179,7 +1179,7 @@ 3.2.2 3.1 - 2.2.0 + 3.1.0 12.0.1 1.3.9 1.9.13 @@ -1427,14 +1427,14 @@ ${log4j.version} + dropwizard and zk.--> org.slf4j slf4j-api ${slf4j.version} - com.yammer.metrics + io.dropwizard.metrics metrics-core ${metrics-core.version}