From 0f044e2f476c8370e6673afa24da3e0bb7999f71 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 17 Dec 2015 09:26:19 +0200 Subject: [PATCH] Rename "com.cloudius.urchin" package to "com.scylladb.jmx" Move the Scylla JMX code under "com.scylladb.jmx" package. Signed-off-by: Pekka Enberg --- pom.xml | 4 ++-- .../urchin => scylladb/jmx}/api/APIClient.java | 8 +++++--- .../urchin => scylladb/jmx}/api/APIConfig.java | 2 +- .../urchin => scylladb/jmx}/api/CacheEntry.java | 4 ++-- .../{cloudius/urchin => scylladb/jmx}/main/Main.java | 4 ++-- .../urchin => scylladb/jmx}/metrics/APIMetrics.java | 2 +- .../jmx}/metrics/DefaultNameFactory.java | 2 +- .../jmx}/metrics/MetricNameFactory.java | 2 +- .../jmx}/utils/EstimatedHistogram.java | 2 +- .../urchin => scylladb/jmx}/utils/FileUtils.java | 2 +- .../{cloudius/urchin => scylladb/jmx}/utils/Pair.java | 2 +- .../jmx}/utils/RecentEstimatedHistogram.java | 2 +- .../jmx}/utils/SnapshotDetailsTabularData.java | 2 +- src/main/java/com/yammer/metrics/core/APICounter.java | 2 +- .../java/com/yammer/metrics/core/APIHistogram.java | 2 +- src/main/java/com/yammer/metrics/core/APIMeter.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../java/org/apache/cassandra/gms/FailureDetector.java | 2 +- src/main/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../apache/cassandra/locator/EndpointSnitchInfo.java | 2 +- .../cassandra/metrics/CASClientRequestMetrics.java | 2 +- .../org/apache/cassandra/metrics/CacheMetrics.java | 8 ++++---- .../apache/cassandra/metrics/ClientRequestMetrics.java | 4 ++-- .../apache/cassandra/metrics/ColumnFamilyMetrics.java | 10 +++++----- .../org/apache/cassandra/metrics/CommitLogMetrics.java | 8 ++++---- .../apache/cassandra/metrics/CompactionMetrics.java | 8 ++++---- .../cassandra/metrics/DroppedMessageMetrics.java | 6 +++--- .../cassandra/metrics/EstimatedHistogramWrapper.java | 4 ++-- .../org/apache/cassandra/metrics/LatencyMetrics.java | 10 +++++----- .../org/apache/cassandra/metrics/StorageMetrics.java | 6 +++--- .../org/apache/cassandra/net/MessagingService.java | 4 +++- .../org/apache/cassandra/service/CacheService.java | 2 +- .../org/apache/cassandra/service/StorageProxy.java | 2 +- .../org/apache/cassandra/service/StorageService.java | 4 ++-- .../org/apache/cassandra/streaming/StreamManager.java | 2 +- 37 files changed, 70 insertions(+), 66 deletions(-) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/api/APIClient.java (99%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/api/APIConfig.java (99%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/api/CacheEntry.java (93%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/main/Main.java (94%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/metrics/APIMetrics.java (99%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/metrics/DefaultNameFactory.java (98%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/metrics/MetricNameFactory.java (97%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/utils/EstimatedHistogram.java (99%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/utils/FileUtils.java (98%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/utils/Pair.java (98%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/utils/RecentEstimatedHistogram.java (98%) rename src/main/java/com/{cloudius/urchin => scylladb/jmx}/utils/SnapshotDetailsTabularData.java (98%) diff --git a/pom.xml b/pom.xml index 7b7ef93..4ce5518 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.cloudius.urchin + com.scylladb.jmx scylla-jmx 1.0 jar @@ -84,7 +84,7 @@ - com.cloudius.urchin.main.Main + com.scylladb.jmx.main.Main diff --git a/src/main/java/com/cloudius/urchin/api/APIClient.java b/src/main/java/com/scylladb/jmx/api/APIClient.java similarity index 99% rename from src/main/java/com/cloudius/urchin/api/APIClient.java rename to src/main/java/com/scylladb/jmx/api/APIClient.java index 31b7858..66c34e6 100644 --- a/src/main/java/com/cloudius/urchin/api/APIClient.java +++ b/src/main/java/com/scylladb/jmx/api/APIClient.java @@ -1,7 +1,7 @@ /* * Copyright 2015 Cloudius Systems */ -package com.cloudius.urchin.api; +package com.scylladb.jmx.api; import java.io.StringReader; import java.net.InetAddress; @@ -31,9 +31,11 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + import org.glassfish.jersey.client.ClientConfig; -import com.cloudius.urchin.utils.EstimatedHistogram; -import com.cloudius.urchin.utils.SnapshotDetailsTabularData; + +import com.scylladb.jmx.utils.EstimatedHistogram; +import com.scylladb.jmx.utils.SnapshotDetailsTabularData; import com.yammer.metrics.core.HistogramValues; public class APIClient { diff --git a/src/main/java/com/cloudius/urchin/api/APIConfig.java b/src/main/java/com/scylladb/jmx/api/APIConfig.java similarity index 99% rename from src/main/java/com/cloudius/urchin/api/APIConfig.java rename to src/main/java/com/scylladb/jmx/api/APIConfig.java index 04879fb..522a12d 100644 --- a/src/main/java/com/cloudius/urchin/api/APIConfig.java +++ b/src/main/java/com/scylladb/jmx/api/APIConfig.java @@ -1,4 +1,4 @@ -package com.cloudius.urchin.api; +package com.scylladb.jmx.api; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/cloudius/urchin/api/CacheEntry.java b/src/main/java/com/scylladb/jmx/api/CacheEntry.java similarity index 93% rename from src/main/java/com/cloudius/urchin/api/CacheEntry.java rename to src/main/java/com/scylladb/jmx/api/CacheEntry.java index 89d5285..78a22f9 100644 --- a/src/main/java/com/cloudius/urchin/api/CacheEntry.java +++ b/src/main/java/com/scylladb/jmx/api/CacheEntry.java @@ -19,9 +19,9 @@ * along with Scylla. If not, see . */ -package com.cloudius.urchin.api; +package com.scylladb.jmx.api; -import com.cloudius.urchin.utils.EstimatedHistogram; +import com.scylladb.jmx.utils.EstimatedHistogram; public class CacheEntry { long time; diff --git a/src/main/java/com/cloudius/urchin/main/Main.java b/src/main/java/com/scylladb/jmx/main/Main.java similarity index 94% rename from src/main/java/com/cloudius/urchin/main/Main.java rename to src/main/java/com/scylladb/jmx/main/Main.java index 5997e76..ba4dac3 100644 --- a/src/main/java/com/cloudius/urchin/main/Main.java +++ b/src/main/java/com/scylladb/jmx/main/Main.java @@ -1,9 +1,9 @@ /* * Copyright 2015 Cloudius Systems */ -package com.cloudius.urchin.main; +package com.scylladb.jmx.main; -import com.cloudius.urchin.api.APIConfig; +import com.scylladb.jmx.api.APIConfig; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.commitlog.CommitLog; diff --git a/src/main/java/com/cloudius/urchin/metrics/APIMetrics.java b/src/main/java/com/scylladb/jmx/metrics/APIMetrics.java similarity index 99% rename from src/main/java/com/cloudius/urchin/metrics/APIMetrics.java rename to src/main/java/com/scylladb/jmx/metrics/APIMetrics.java index e0c91d5..a657a3c 100644 --- a/src/main/java/com/cloudius/urchin/metrics/APIMetrics.java +++ b/src/main/java/com/scylladb/jmx/metrics/APIMetrics.java @@ -1,4 +1,4 @@ -package com.cloudius.urchin.metrics; +package com.scylladb.jmx.metrics; /* * Copyright 2015 Cloudius Systems diff --git a/src/main/java/com/cloudius/urchin/metrics/DefaultNameFactory.java b/src/main/java/com/scylladb/jmx/metrics/DefaultNameFactory.java similarity index 98% rename from src/main/java/com/cloudius/urchin/metrics/DefaultNameFactory.java rename to src/main/java/com/scylladb/jmx/metrics/DefaultNameFactory.java index 1c65fb5..1ba99d8 100644 --- a/src/main/java/com/cloudius/urchin/metrics/DefaultNameFactory.java +++ b/src/main/java/com/scylladb/jmx/metrics/DefaultNameFactory.java @@ -21,7 +21,7 @@ * * Modified by Cloudius Systems */ -package com.cloudius.urchin.metrics; +package com.scylladb.jmx.metrics; import com.yammer.metrics.core.MetricName; diff --git a/src/main/java/com/cloudius/urchin/metrics/MetricNameFactory.java b/src/main/java/com/scylladb/jmx/metrics/MetricNameFactory.java similarity index 97% rename from src/main/java/com/cloudius/urchin/metrics/MetricNameFactory.java rename to src/main/java/com/scylladb/jmx/metrics/MetricNameFactory.java index 3bd92e5..9114711 100644 --- a/src/main/java/com/cloudius/urchin/metrics/MetricNameFactory.java +++ b/src/main/java/com/scylladb/jmx/metrics/MetricNameFactory.java @@ -21,7 +21,7 @@ * Modified by Cloudius Systems */ -package com.cloudius.urchin.metrics; +package com.scylladb.jmx.metrics; import com.yammer.metrics.core.MetricName; diff --git a/src/main/java/com/cloudius/urchin/utils/EstimatedHistogram.java b/src/main/java/com/scylladb/jmx/utils/EstimatedHistogram.java similarity index 99% rename from src/main/java/com/cloudius/urchin/utils/EstimatedHistogram.java rename to src/main/java/com/scylladb/jmx/utils/EstimatedHistogram.java index 644e67b..d2b5feb 100644 --- a/src/main/java/com/cloudius/urchin/utils/EstimatedHistogram.java +++ b/src/main/java/com/scylladb/jmx/utils/EstimatedHistogram.java @@ -23,7 +23,7 @@ * Modified by Cloudius Systems */ -package com.cloudius.urchin.utils; +package com.scylladb.jmx.utils; import java.util.Arrays; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/src/main/java/com/cloudius/urchin/utils/FileUtils.java b/src/main/java/com/scylladb/jmx/utils/FileUtils.java similarity index 98% rename from src/main/java/com/cloudius/urchin/utils/FileUtils.java rename to src/main/java/com/scylladb/jmx/utils/FileUtils.java index fc66fb8..11ffba1 100644 --- a/src/main/java/com/cloudius/urchin/utils/FileUtils.java +++ b/src/main/java/com/scylladb/jmx/utils/FileUtils.java @@ -22,7 +22,7 @@ * Modified by Cloudius Systems */ -package com.cloudius.urchin.utils; +package com.scylladb.jmx.utils; import java.io.*; import java.text.DecimalFormat; diff --git a/src/main/java/com/cloudius/urchin/utils/Pair.java b/src/main/java/com/scylladb/jmx/utils/Pair.java similarity index 98% rename from src/main/java/com/cloudius/urchin/utils/Pair.java rename to src/main/java/com/scylladb/jmx/utils/Pair.java index 92fa12c..c5aa795 100644 --- a/src/main/java/com/cloudius/urchin/utils/Pair.java +++ b/src/main/java/com/scylladb/jmx/utils/Pair.java @@ -22,7 +22,7 @@ * Modified by Cloudius Systems */ -package com.cloudius.urchin.utils; +package com.scylladb.jmx.utils; import com.google.common.base.Objects; diff --git a/src/main/java/com/cloudius/urchin/utils/RecentEstimatedHistogram.java b/src/main/java/com/scylladb/jmx/utils/RecentEstimatedHistogram.java similarity index 98% rename from src/main/java/com/cloudius/urchin/utils/RecentEstimatedHistogram.java rename to src/main/java/com/scylladb/jmx/utils/RecentEstimatedHistogram.java index 4f43690..9a823e8 100644 --- a/src/main/java/com/cloudius/urchin/utils/RecentEstimatedHistogram.java +++ b/src/main/java/com/scylladb/jmx/utils/RecentEstimatedHistogram.java @@ -1,4 +1,4 @@ -package com.cloudius.urchin.utils; +package com.scylladb.jmx.utils; /* * Copyright (C) 2015 ScyllaDB */ diff --git a/src/main/java/com/cloudius/urchin/utils/SnapshotDetailsTabularData.java b/src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java similarity index 98% rename from src/main/java/com/cloudius/urchin/utils/SnapshotDetailsTabularData.java rename to src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java index 9b98c4e..403e7c4 100644 --- a/src/main/java/com/cloudius/urchin/utils/SnapshotDetailsTabularData.java +++ b/src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java @@ -20,7 +20,7 @@ * * Modified by Cloudius Systems */ -package com.cloudius.urchin.utils; +package com.scylladb.jmx.utils; import java.util.Map; import javax.management.openmbean.*; diff --git a/src/main/java/com/yammer/metrics/core/APICounter.java b/src/main/java/com/yammer/metrics/core/APICounter.java index 85ddc87..79eeca4 100644 --- a/src/main/java/com/yammer/metrics/core/APICounter.java +++ b/src/main/java/com/yammer/metrics/core/APICounter.java @@ -5,7 +5,7 @@ package com.yammer.metrics.core; * Modified by Cloudius Systems */ -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; import com.yammer.metrics.core.Counter; public class APICounter extends Counter { diff --git a/src/main/java/com/yammer/metrics/core/APIHistogram.java b/src/main/java/com/yammer/metrics/core/APIHistogram.java index b4e54b8..985950a 100644 --- a/src/main/java/com/yammer/metrics/core/APIHistogram.java +++ b/src/main/java/com/yammer/metrics/core/APIHistogram.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; import com.yammer.metrics.stats.Sample; import com.yammer.metrics.stats.Snapshot; diff --git a/src/main/java/com/yammer/metrics/core/APIMeter.java b/src/main/java/com/yammer/metrics/core/APIMeter.java index 9e8be70..d77b641 100644 --- a/src/main/java/com/yammer/metrics/core/APIMeter.java +++ b/src/main/java/com/yammer/metrics/core/APIMeter.java @@ -8,7 +8,7 @@ package com.yammer.metrics.core; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; public class APIMeter extends APISettableMeter { String url; diff --git a/src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java index 583ec64..bdb19e7 100644 --- a/src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -39,8 +39,8 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.cassandra.metrics.ColumnFamilyMetrics; -import com.cloudius.urchin.api.APIClient; import com.google.common.base.Throwables; +import com.scylladb.jmx.api.APIClient; public class ColumnFamilyStore implements ColumnFamilyStoreMBean { private static final java.util.logging.Logger logger = java.util.logging.Logger diff --git a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java index 8cf51f9..5adcce2 100644 --- a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -31,7 +31,7 @@ import javax.management.ObjectName; import org.apache.cassandra.metrics.CommitLogMetrics; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; /* * Commit Log tracks every write operation into the system. The aim of the commit log is to be able to diff --git a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java index d8bd18b..f26b043 100644 --- a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -29,7 +29,7 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.cassandra.metrics.CompactionMetrics; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; /** * A singleton which manages a private executor of ongoing compactions. diff --git a/src/main/java/org/apache/cassandra/gms/FailureDetector.java b/src/main/java/org/apache/cassandra/gms/FailureDetector.java index 2f1194b..ce22b93 100644 --- a/src/main/java/org/apache/cassandra/gms/FailureDetector.java +++ b/src/main/java/org/apache/cassandra/gms/FailureDetector.java @@ -33,7 +33,7 @@ import javax.json.JsonObject; import javax.management.MBeanServer; import javax.management.ObjectName; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; public class FailureDetector implements FailureDetectorMBean { public static final String MBEAN_NAME = "org.apache.cassandra.net:type=FailureDetector"; diff --git a/src/main/java/org/apache/cassandra/gms/Gossiper.java b/src/main/java/org/apache/cassandra/gms/Gossiper.java index 3d05c29..9350c7d 100644 --- a/src/main/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/main/java/org/apache/cassandra/gms/Gossiper.java @@ -31,7 +31,7 @@ import javax.management.ObjectName; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; /** * This module is responsible for Gossiping information for the local endpoint. diff --git a/src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java b/src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java index bafefc3..3c5c90c 100644 --- a/src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java +++ b/src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java @@ -26,7 +26,7 @@ import javax.management.ObjectName; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; public class EndpointSnitchInfo implements EndpointSnitchInfoMBean { private static final java.util.logging.Logger logger = java.util.logging.Logger diff --git a/src/main/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java b/src/main/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java index 8ba4edf..c1c54ce 100644 --- a/src/main/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java @@ -25,7 +25,7 @@ package org.apache.cassandra.metrics; -import com.cloudius.urchin.metrics.APIMetrics; +import com.scylladb.jmx.metrics.APIMetrics; import com.yammer.metrics.core.*; public class CASClientRequestMetrics extends ClientRequestMetrics { diff --git a/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java b/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java index c15f199..fb7a2b6 100644 --- a/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/CacheMetrics.java @@ -26,10 +26,10 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; -import com.cloudius.urchin.metrics.MetricNameFactory; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Meter; diff --git a/src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java b/src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java index ff25ce2..8194a53 100644 --- a/src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java @@ -29,8 +29,8 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; import com.yammer.metrics.Metrics; import com.yammer.metrics.core.Counter; import com.yammer.metrics.core.Meter; diff --git a/src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java index c2d9fe2..6511c4b 100644 --- a/src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java @@ -30,13 +30,13 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.db.ColumnFamilyStore; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.MetricNameFactory; -import com.cloudius.urchin.utils.EstimatedHistogram; -import com.cloudius.urchin.utils.RecentEstimatedHistogram; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.MetricNameFactory; +import com.scylladb.jmx.utils.EstimatedHistogram; +import com.scylladb.jmx.utils.RecentEstimatedHistogram; import com.yammer.metrics.Metrics; import com.yammer.metrics.core.*; diff --git a/src/main/java/org/apache/cassandra/metrics/CommitLogMetrics.java b/src/main/java/org/apache/cassandra/metrics/CommitLogMetrics.java index aacf2f8..e3a1aa9 100644 --- a/src/main/java/org/apache/cassandra/metrics/CommitLogMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/CommitLogMetrics.java @@ -23,10 +23,10 @@ */ package org.apache.cassandra.metrics; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; -import com.cloudius.urchin.metrics.MetricNameFactory; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Timer; diff --git a/src/main/java/org/apache/cassandra/metrics/CompactionMetrics.java b/src/main/java/org/apache/cassandra/metrics/CompactionMetrics.java index c927226..9251a85 100644 --- a/src/main/java/org/apache/cassandra/metrics/CompactionMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/CompactionMetrics.java @@ -25,10 +25,10 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; -import com.cloudius.urchin.metrics.MetricNameFactory; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; import com.yammer.metrics.core.Counter; import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Meter; diff --git a/src/main/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java b/src/main/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java index b1e7605..c0d108d 100644 --- a/src/main/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java @@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.net.MessagingService; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; -import com.cloudius.urchin.metrics.MetricNameFactory; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; import com.yammer.metrics.core.APISettableMeter; /** diff --git a/src/main/java/org/apache/cassandra/metrics/EstimatedHistogramWrapper.java b/src/main/java/org/apache/cassandra/metrics/EstimatedHistogramWrapper.java index 7e80a57..3b511fb 100644 --- a/src/main/java/org/apache/cassandra/metrics/EstimatedHistogramWrapper.java +++ b/src/main/java/org/apache/cassandra/metrics/EstimatedHistogramWrapper.java @@ -22,8 +22,8 @@ package org.apache.cassandra.metrics; import javax.ws.rs.core.MultivaluedMap; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.utils.EstimatedHistogram; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.utils.EstimatedHistogram; public class EstimatedHistogramWrapper { private APIClient c = new APIClient(); diff --git a/src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java index 6cce299..613c773 100644 --- a/src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java @@ -26,13 +26,13 @@ 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.cloudius.urchin.utils.EstimatedHistogram; -import com.cloudius.urchin.utils.RecentEstimatedHistogram; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; +import com.scylladb.jmx.utils.EstimatedHistogram; +import com.scylladb.jmx.utils.RecentEstimatedHistogram; import com.yammer.metrics.core.Counter; import com.yammer.metrics.core.Timer; diff --git a/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java b/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java index 7a2759d..aa87e99 100644 --- a/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java +++ b/src/main/java/org/apache/cassandra/metrics/StorageMetrics.java @@ -23,9 +23,9 @@ */ package org.apache.cassandra.metrics; -import com.cloudius.urchin.metrics.APIMetrics; -import com.cloudius.urchin.metrics.DefaultNameFactory; -import com.cloudius.urchin.metrics.MetricNameFactory; +import com.scylladb.jmx.metrics.APIMetrics; +import com.scylladb.jmx.metrics.DefaultNameFactory; +import com.scylladb.jmx.metrics.MetricNameFactory; import com.yammer.metrics.core.Counter; /** diff --git a/src/main/java/org/apache/cassandra/net/MessagingService.java b/src/main/java/org/apache/cassandra/net/MessagingService.java index dceb9bb..74abacc 100644 --- a/src/main/java/org/apache/cassandra/net/MessagingService.java +++ b/src/main/java/org/apache/cassandra/net/MessagingService.java @@ -31,8 +31,10 @@ import javax.json.JsonArray; import javax.json.JsonObject; import javax.management.MBeanServer; import javax.management.ObjectName; + import org.apache.cassandra.metrics.DroppedMessageMetrics; -import com.cloudius.urchin.api.APIClient; + +import com.scylladb.jmx.api.APIClient; import com.yammer.metrics.core.APISettableMeter; public final class MessagingService implements MessagingServiceMBean { diff --git a/src/main/java/org/apache/cassandra/service/CacheService.java b/src/main/java/org/apache/cassandra/service/CacheService.java index 441a608..d71ba7e 100644 --- a/src/main/java/org/apache/cassandra/service/CacheService.java +++ b/src/main/java/org/apache/cassandra/service/CacheService.java @@ -34,7 +34,7 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.cassandra.metrics.CacheMetrics; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; public class CacheService implements CacheServiceMBean { private static final java.util.logging.Logger logger = java.util.logging.Logger diff --git a/src/main/java/org/apache/cassandra/service/StorageProxy.java b/src/main/java/org/apache/cassandra/service/StorageProxy.java index 62e512f..a0c10a6 100644 --- a/src/main/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/main/java/org/apache/cassandra/service/StorageProxy.java @@ -31,7 +31,7 @@ import javax.management.ObjectName; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; -import com.cloudius.urchin.api.APIClient; +import com.scylladb.jmx.api.APIClient; import org.apache.cassandra.metrics.*; diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java index 3f66702..a59bcdd 100644 --- a/src/main/java/org/apache/cassandra/service/StorageService.java +++ b/src/main/java/org/apache/cassandra/service/StorageService.java @@ -44,8 +44,8 @@ import org.apache.cassandra.metrics.StorageMetrics; import org.apache.cassandra.repair.RepairParallelism; import org.apache.cassandra.streaming.StreamManager; -import com.cloudius.urchin.api.APIClient; -import com.cloudius.urchin.utils.FileUtils; +import com.scylladb.jmx.api.APIClient; +import com.scylladb.jmx.utils.FileUtils; /** * This abstraction contains the token/identifier of this node on the identifier diff --git a/src/main/java/org/apache/cassandra/streaming/StreamManager.java b/src/main/java/org/apache/cassandra/streaming/StreamManager.java index 89f7d1b..843fa0a 100644 --- a/src/main/java/org/apache/cassandra/streaming/StreamManager.java +++ b/src/main/java/org/apache/cassandra/streaming/StreamManager.java @@ -37,10 +37,10 @@ import javax.management.openmbean.CompositeData; import org.apache.cassandra.streaming.management.StreamStateCompositeData; -import com.cloudius.urchin.api.APIClient; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.scylladb.jmx.api.APIClient; /** * StreamManager manages currently running {@link StreamResultFuture}s and