Adding the CASClientRequestMetrics ClientRequestMetrics and

LatencyMetrics

This import the implementation of CASClientRequestMetrics
ClientRequestMetrics and LatencyMetrics with modification to use the
APIMetrics with a given URL.

The Metrics where added to keep the same naming of of the MBean as they
are in Origin.

Signed-off-by: Amnon Heiman <amnon@cloudius-systems.com>

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

@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/*
+ * Copyright 2015 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+
+package org.apache.cassandra.metrics;
+
+import com.cloudius.urchin.metrics.APIMetrics;
+import com.yammer.metrics.core.*;
+
+public class CASClientRequestMetrics extends ClientRequestMetrics {
+
+    public final Histogram contention;
+    /* Used only for write */
+    public final Counter conditionNotMet;
+
+    public final Counter unfinishedCommit;
+
+    public CASClientRequestMetrics(String url, String scope) {
+        super(url, scope);
+        contention = APIMetrics.newHistogram(url + "contention",
+                factory.createMetricName("ContentionHistogram"), true);
+        conditionNotMet = APIMetrics.newCounter(url + "condition_not_met",
+                factory.createMetricName("ConditionNotMet"));
+        unfinishedCommit = APIMetrics.newCounter(url + "unfinished_commit",
+                factory.createMetricName("UnfinishedCommit"));
+    }
+
+    public void release() {
+        super.release();
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName("ContentionHistogram"));
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName("ConditionNotMet"));
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName("UnfinishedCommit"));
+    }
+}

src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java

@@ -0,0 +1,77 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+/*
+ * Copyright 2015 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+
+package org.apache.cassandra.metrics;
+
+import java.util.concurrent.TimeUnit;
+
+import com.cloudius.urchin.metrics.APIMetrics;
+import com.cloudius.urchin.metrics.DefaultNameFactory;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Meter;
+
+public class ClientRequestMetrics extends LatencyMetrics {
+    @Deprecated
+    public static final Counter readTimeouts = Metrics
+            .newCounter(DefaultNameFactory.createMetricName(
+                    "ClientRequestMetrics", "ReadTimeouts", null));
+    @Deprecated
+    public static final Counter writeTimeouts = Metrics
+            .newCounter(DefaultNameFactory.createMetricName(
+                    "ClientRequestMetrics", "WriteTimeouts", null));
+    @Deprecated
+    public static final Counter readUnavailables = Metrics
+            .newCounter(DefaultNameFactory.createMetricName(
+                    "ClientRequestMetrics", "ReadUnavailables", null));
+    @Deprecated
+    public static final Counter writeUnavailables = Metrics
+            .newCounter(DefaultNameFactory.createMetricName(
+                    "ClientRequestMetrics", "WriteUnavailables", null));
+
+    public final Meter timeouts;
+    public final Meter unavailables;
+
+    public ClientRequestMetrics(String url, String scope) {
+        super(url, "ClientRequest", scope);
+
+        timeouts = APIMetrics.newMeter(url + "timeouts",
+                factory.createMetricName("Timeouts"), "timeouts",
+                TimeUnit.SECONDS);
+        unavailables = APIMetrics.newMeter(url + "unavailables",
+                factory.createMetricName("Unavailables"), "unavailables",
+                TimeUnit.SECONDS);
+    }
+
+    public void release() {
+        super.release();
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName("Timeouts"));
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName("Unavailables"));
+    }
+}

src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java

@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+/*
+ * Copyright 2015 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+package org.apache.cassandra.metrics;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import com.cloudius.urchin.metrics.APIMetrics;
+import com.cloudius.urchin.metrics.DefaultNameFactory;
+import com.cloudius.urchin.metrics.MetricNameFactory;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+
+/**
+ * Metrics about latencies
+ */
+public class LatencyMetrics {
+    /** Latency */
+    public final Timer latency;
+    /** Total latency in micro sec */
+    public final Counter totalLatency;
+
+    /** parent metrics to replicate any updates to **/
+    private List<LatencyMetrics> parents = Lists.newArrayList();
+
+    protected final MetricNameFactory factory;
+    protected final String namePrefix;
+
+    protected long lastLatency;
+    protected long lastOpCount;
+
+    /**
+     * Create LatencyMetrics with given group, type, and scope. Name prefix for
+     * each metric will be empty.
+     *
+     * @param type
+     *            Type name
+     * @param scope
+     *            Scope
+     */
+    public LatencyMetrics(String url, String type, String scope) {
+        this(url, type, "", scope);
+    }
+
+    /**
+     * Create LatencyMetrics with given group, type, prefix to append to each
+     * metric name, and scope.
+     *
+     * @param type
+     *            Type name
+     * @param namePrefix
+     *            Prefix to append to each metric name
+     * @param scope
+     *            Scope of metrics
+     */
+    public LatencyMetrics(String url, String type, String namePrefix,
+            String scope) {
+        this(url, new DefaultNameFactory(type, scope), namePrefix);
+    }
+
+    /**
+     * Create LatencyMetrics with given group, type, prefix to append to each
+     * metric name, and scope.
+     *
+     * @param factory
+     *            MetricName factory to use
+     * @param namePrefix
+     *            Prefix to append to each metric name
+     */
+    public LatencyMetrics(String url, MetricNameFactory factory,
+            String namePrefix) {
+        this.factory = factory;
+        this.namePrefix = namePrefix;
+
+        latency = APIMetrics.newTimer(
+                factory.createMetricName(namePrefix + "Latency"),
+                TimeUnit.MICROSECONDS, TimeUnit.SECONDS);
+        totalLatency = APIMetrics.newCounter(url + "total_latency",
+                factory.createMetricName(namePrefix + "TotalLatency"));
+    }
+
+    /**
+     * Create LatencyMetrics with given group, type, prefix to append to each
+     * metric name, and scope. Any updates to this will also run on parent
+     *
+     * @param factory
+     *            MetricName factory to use
+     * @param namePrefix
+     *            Prefix to append to each metric name
+     * @param parents
+     *            any amount of parents to replicate updates to
+     */
+    public LatencyMetrics(String url, MetricNameFactory factory,
+            String namePrefix, LatencyMetrics... parents) {
+        this(url, factory, namePrefix);
+        this.parents.addAll(ImmutableList.copyOf(parents));
+    }
+
+    /** takes nanoseconds **/
+    public void addNano(long nanos) {
+        // convert to microseconds. 1 millionth
+        latency.update(nanos, TimeUnit.NANOSECONDS);
+        totalLatency.inc(nanos / 1000);
+        for (LatencyMetrics parent : parents) {
+            parent.addNano(nanos);
+        }
+    }
+
+    public void release() {
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName(namePrefix + "Latency"));
+        APIMetrics.defaultRegistry().removeMetric(
+                factory.createMetricName(namePrefix + "TotalLatency"));
+    }
+
+    @Deprecated
+    public synchronized double getRecentLatency() {
+        long ops = latency.count();
+        long n = totalLatency.count();
+        if (ops == lastOpCount)
+            return 0;
+        try {
+            return ((double) n - lastLatency) / (ops - lastOpCount);
+        } finally {
+            lastLatency = n;
+            lastOpCount = ops;
+        }
+    }
+}