[CASSANDRA-20250][trunk] Optimize Counter, Meter and Histogram metrics using thread local counters

src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java

@@ -33,7 +33,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Timer.Context;
+import org.apache.cassandra.metrics.Timer.Context;
 import net.nicoulaj.compilecommand.annotations.DontInline;
 import org.apache.cassandra.concurrent.Interruptible;
 import org.apache.cassandra.concurrent.Interruptible.TerminateException;
@@ -338,7 +338,7 @@ void awaitAvailableSegment(CommitLogSegment currentAllocatingFrom)
     {
         do
         {
-            WaitQueue.Signal prepared = segmentPrepared.register(commitLog.metrics.waitingOnSegmentAllocation.time(), Context::stop);
+            WaitQueue.Signal prepared = segmentPrepared.register(commitLog.metrics.waitingOnSegmentAllocation.startTime(), Context::stop);
             if (availableSegment == null && allocatingFrom == currentAllocatingFrom)
                 prepared.awaitUninterruptibly();
             else

src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java

@@ -32,7 +32,7 @@
 import org.apache.cassandra.utils.concurrent.Semaphore;
 import org.apache.cassandra.utils.concurrent.WaitQueue;
 
-import static com.codahale.metrics.Timer.Context;
+import org.apache.cassandra.metrics.Timer.Context;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;

src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java

@@ -37,7 +37,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Timer;
 import net.openhft.chronicle.core.util.ThrowingFunction;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.Mutation;
@@ -355,7 +355,7 @@ synchronized void sync(boolean flush)
 
         if (flush || close)
         {
-            try (Timer.Context ignored = CommitLog.instance.metrics.waitingOnFlush.time())
+            try (Timer.Context ignored = CommitLog.instance.metrics.waitingOnFlush.startTime())
             {
                 flush(startMarker, sectionEnd);
             }
@@ -736,7 +736,7 @@ void markWritten()
 
         void awaitDiskSync(Timer waitingOnCommit)
         {
-            try (Timer.Context ignored = waitingOnCommit.time())
+            try (Timer.Context ignored = waitingOnCommit.startTime())
             {
                 segment.waitForSync(position);
             }

src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogService.java

@@ -39,7 +39,7 @@ protected void maybeWaitForSync(CommitLogSegment.Allocation alloc)
         if (lastSyncedAt < expectedSyncTime)
         {
             pending.incrementAndGet();
-            awaitSyncAt(expectedSyncTime, commitLog.metrics.waitingOnCommit.time());
+            awaitSyncAt(expectedSyncTime, commitLog.metrics.waitingOnCommit.startTime());
             pending.decrementAndGet();
         }
     }

src/java/org/apache/cassandra/db/compaction/CompactionManager.java

@@ -59,7 +59,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Meter;
+import org.apache.cassandra.metrics.Meter;
 import net.openhft.chronicle.core.util.ThrowingSupplier;
 import org.apache.cassandra.cache.AutoSavingCache;
 import org.apache.cassandra.concurrent.ExecutorFactory;

src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java

@@ -35,7 +35,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.Runnables;
 
-import com.codahale.metrics.Counter;
+import org.apache.cassandra.metrics.Counter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/java/org/apache/cassandra/db/virtual/CIDRFilteringMetricsTable.java

@@ -27,7 +27,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
-import com.codahale.metrics.Counter;
+import org.apache.cassandra.metrics.Counter;
 import com.codahale.metrics.Snapshot;
 import org.apache.cassandra.auth.CassandraAuthorizer;
 import org.apache.cassandra.config.DatabaseDescriptor;

src/java/org/apache/cassandra/db/virtual/model/CounterMetricRow.java

@@ -18,7 +18,7 @@
 
 package org.apache.cassandra.db.virtual.model;
 
-import com.codahale.metrics.Counter;
+import org.apache.cassandra.metrics.Counter;
 import com.codahale.metrics.Metric;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/db/virtual/model/HistogramMetricRow.java

@@ -18,7 +18,7 @@
 
 package org.apache.cassandra.db.virtual.model;
 
-import com.codahale.metrics.Histogram;
+import org.apache.cassandra.metrics.Histogram;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.Snapshot;
 

src/java/org/apache/cassandra/db/virtual/model/MeterMetricRow.java

@@ -18,7 +18,7 @@
 
 package org.apache.cassandra.db.virtual.model;
 
-import com.codahale.metrics.Meter;
+import org.apache.cassandra.metrics.Meter;
 import com.codahale.metrics.Metric;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/db/virtual/model/MetricRow.java

@@ -18,12 +18,12 @@
 
 package org.apache.cassandra.db.virtual.model;
 
-import com.codahale.metrics.Counter;
+import org.apache.cassandra.metrics.Counter;
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
+import org.apache.cassandra.metrics.Histogram;
+import org.apache.cassandra.metrics.Meter;
 import com.codahale.metrics.Metric;
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Timer;
 import org.apache.cassandra.metrics.CassandraMetricsRegistry;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/db/virtual/model/TimerMetricRow.java

@@ -19,7 +19,7 @@
 package org.apache.cassandra.db.virtual.model;
 
 import com.codahale.metrics.Metric;
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Timer;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 

src/java/org/apache/cassandra/index/sai/metrics/ColumnQueryMetrics.java

@@ -19,8 +19,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Meter;
+import org.apache.cassandra.metrics.Timer;
 import org.apache.cassandra.index.sai.utils.IndexIdentifier;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/index/sai/metrics/IndexMetrics.java

@@ -17,10 +17,10 @@
  */
 package org.apache.cassandra.index.sai.metrics;
 
-import com.codahale.metrics.Counter;
+import org.apache.cassandra.metrics.Counter;
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Histogram;
+import org.apache.cassandra.metrics.Timer;
 import org.apache.cassandra.index.sai.StorageAttachedIndex;
 import org.apache.cassandra.index.sai.memory.MemtableIndexManager;
 

src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java

@@ -19,9 +19,9 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Counter;
+import org.apache.cassandra.metrics.Histogram;
+import org.apache.cassandra.metrics.Timer;
 import org.apache.cassandra.index.sai.QueryContext;
 import org.apache.cassandra.schema.TableMetadata;
 import org.apache.cassandra.tracing.Tracing;

src/java/org/apache/cassandra/io/sstable/format/big/RowIndexEntry.java

@@ -21,7 +21,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import com.codahale.metrics.Histogram;
+import org.apache.cassandra.metrics.Histogram;
 import org.apache.cassandra.config.DataStorageSpec;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ArrayClustering;

src/java/org/apache/cassandra/io/sstable/indexsummary/IndexSummaryManager.java

@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Timer;
+import org.apache.cassandra.metrics.Timer;
 import org.apache.cassandra.concurrent.ScheduledExecutorPlus;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ColumnFamilyStore;
@@ -243,7 +243,7 @@ public void redistributeSummaries() throws IOException
         Pair<Long, Map<TableId, LifecycleTransaction>> redistributionTransactionInfo = getRestributionTransactions();
         Map<TableId, LifecycleTransaction> transactions = redistributionTransactionInfo.right;
         long nonRedistributingOffHeapSize = redistributionTransactionInfo.left;
-        try (Timer.Context ctx = CompactionManager.instance.getMetrics().indexSummaryRedistributionTime.time())
+        try (Timer.Context ctx = CompactionManager.instance.getMetrics().indexSummaryRedistributionTime.startTime())
         {
             redistributeSummaries(new IndexSummaryRedistribution(transactions,
                                                                  nonRedistributingOffHeapSize,

src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java

@@ -22,7 +22,6 @@
 import com.google.common.annotations.VisibleForTesting;
 
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Meter;
 import com.codahale.metrics.RatioGauge;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/metrics/AtomicLongCounter.java

@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.metrics;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.cassandra.utils.ReflectionUtils;
+
+/**
+ * This type of Counter is not very efficient for updates but fast to read.
+ * It should be used only when getCount performance is critical
+ * and we can sucrifice the cost to update it by multiple threads
+ */
+public class AtomicLongCounter extends com.codahale.metrics.Counter implements Counter
+{
+    private final AtomicLong counter = new AtomicLong();
+
+    public AtomicLongCounter()
+    {
+        ReflectionUtils.setFieldToNull(this, "count");
+    }
+
+    @Override
+    public void inc()
+    {
+        counter.incrementAndGet();
+    }
+
+    @Override
+    public void inc(long n)
+    {
+        counter.addAndGet(n);
+    }
+
+    @Override
+    public void dec()
+    {
+        counter.decrementAndGet();
+    }
+
+    @Override
+    public void dec(long n)
+    {
+        counter.addAndGet(-n);
+    }
+
+    @Override
+    public long getCount()
+    {
+        return counter.get();
+    }
+}

src/java/org/apache/cassandra/metrics/BatchMetrics.java

@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.metrics;
 
-import com.codahale.metrics.Histogram;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 

src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java

@@ -18,7 +18,6 @@
 package org.apache.cassandra.metrics;
 
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Meter;
 import org.apache.cassandra.utils.memory.BufferPool;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;

src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java

@@ -18,9 +18,6 @@
  */
 package org.apache.cassandra.metrics;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 

src/java/org/apache/cassandra/metrics/CASClientWriteRequestMetrics.java

@@ -18,8 +18,6 @@
  */
 package org.apache.cassandra.metrics;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Histogram;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 

src/java/org/apache/cassandra/metrics/CIDRAuthorizerMetrics.java

@@ -20,8 +20,6 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Timer;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 

src/java/org/apache/cassandra/metrics/CQLMetrics.java

@@ -17,7 +17,6 @@
  */
 package org.apache.cassandra.metrics;
 
-import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.RatioGauge;
 import org.apache.cassandra.cql3.QueryProcessor;

src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java

@@ -39,15 +39,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
-import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
 import com.codahale.metrics.Metered;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.MetricSet;
-import com.codahale.metrics.Timer;
 import org.apache.cassandra.db.virtual.CollectionVirtualTableAdapter;
 import org.apache.cassandra.db.virtual.VirtualTable;
 import org.apache.cassandra.db.virtual.model.CounterMetricRow;
@@ -294,14 +290,39 @@ private static int findNthIndexOf(String str, int start, int n)
 
     public Counter counter(MetricName... name)
     {
-        Counter counter = super.counter(name[0].getMetricName());
+        String simpleMetricName = name[0].getMetricName();
+        Metric metric = super.getMetrics().get(simpleMetricName);
+        if (metric instanceof Counter)
+            return (Counter) metric;
+
+        Counter counter = new ThreadLocalCounter();
+        super.register(simpleMetricName, counter);
+        Stream.of(name).forEach(n -> register(n, counter));
+        return counter;
+    }
+
+    public Counter atomicLongCounter(MetricName... name)
+    {
+        String simpleMetricName = name[0].getMetricName();
+        Metric metric = super.getMetrics().get(simpleMetricName);
+        if (metric instanceof Counter)
+            return (Counter) metric;
+
+        Counter counter = new AtomicLongCounter();
+        super.register(simpleMetricName, counter);
         Stream.of(name).forEach(n -> register(n, counter));
         return counter;
     }
 
     public Meter meter(MetricName... name)
     {
-        Meter meter = super.meter(name[0].getMetricName());
+        String simpleMetricName = name[0].getMetricName();
+        Metric metric = super.getMetrics().get(simpleMetricName);
+        if (metric instanceof Meter)
+            return (Meter) metric;
+
+        Meter meter = new ThreadLocalMeter();
+        super.register(simpleMetricName, meter);
         Stream.of(name).forEach(n -> register(n, meter));
         return meter;
     }