andreacavalli
/
scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "com.cloudius.urchin" package to "com.scylladb.jmx" 

Move the Scylla JMX code under "com.scylladb.jmx" package.

Signed-off-by: Pekka Enberg <penberg@scylladb.com>
This commit is contained in:
Pekka Enberg 2015-12-17 09:26:19 +02:00
parent 4dfa0737ac
commit 0f044e2f47
37 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.cloudius.urchin</groupId>
<groupId>com.scylladb.jmx</groupId>
<artifactId>scylla-jmx</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
@ -84,7 +84,7 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>com.cloudius.urchin.main.Main</Main-Class>
<Main-Class>com.scylladb.jmx.main.Main</Main-Class>
</manifestEntries>
</transformer>
</transformers>

8
src/main/java/com/cloudius/urchin/api/APIClient.java → src/main/java/com/scylladb/jmx/api/APIClient.java
View File

@ -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 {

2
src/main/java/com/cloudius/urchin/api/APIConfig.java → src/main/java/com/scylladb/jmx/api/APIConfig.java
View File

@ -1,4 +1,4 @@
package com.cloudius.urchin.api;
package com.scylladb.jmx.api;
import java.io.File;
import java.io.FileInputStream;

4
src/main/java/com/cloudius/urchin/api/CacheEntry.java → src/main/java/com/scylladb/jmx/api/CacheEntry.java
View File

@ -19,9 +19,9 @@
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
*/
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;

4
src/main/java/com/cloudius/urchin/main/Main.java → src/main/java/com/scylladb/jmx/main/Main.java
View File

@ -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;

2
src/main/java/com/cloudius/urchin/metrics/APIMetrics.java → src/main/java/com/scylladb/jmx/metrics/APIMetrics.java
View File

@ -1,4 +1,4 @@
package com.cloudius.urchin.metrics;
package com.scylladb.jmx.metrics;
/*
* Copyright 2015 Cloudius Systems

2
src/main/java/com/cloudius/urchin/metrics/DefaultNameFactory.java → src/main/java/com/scylladb/jmx/metrics/DefaultNameFactory.java
View File

@ -21,7 +21,7 @@
*
* Modified by Cloudius Systems
*/
package com.cloudius.urchin.metrics;
package com.scylladb.jmx.metrics;
import com.yammer.metrics.core.MetricName;

2
src/main/java/com/cloudius/urchin/metrics/MetricNameFactory.java → src/main/java/com/scylladb/jmx/metrics/MetricNameFactory.java
View File

@ -21,7 +21,7 @@
* Modified by Cloudius Systems
*/
package com.cloudius.urchin.metrics;
package com.scylladb.jmx.metrics;
import com.yammer.metrics.core.MetricName;

2
src/main/java/com/cloudius/urchin/utils/EstimatedHistogram.java → src/main/java/com/scylladb/jmx/utils/EstimatedHistogram.java
View File

@ -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;

2
src/main/java/com/cloudius/urchin/utils/FileUtils.java → src/main/java/com/scylladb/jmx/utils/FileUtils.java
View File

@ -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;

2
src/main/java/com/cloudius/urchin/utils/Pair.java → src/main/java/com/scylladb/jmx/utils/Pair.java
View File

@ -22,7 +22,7 @@
* Modified by Cloudius Systems
*/
package com.cloudius.urchin.utils;
package com.scylladb.jmx.utils;
import com.google.common.base.Objects;

2
src/main/java/com/cloudius/urchin/utils/RecentEstimatedHistogram.java → src/main/java/com/scylladb/jmx/utils/RecentEstimatedHistogram.java
View File

@ -1,4 +1,4 @@
package com.cloudius.urchin.utils;
package com.scylladb.jmx.utils;
/*
* Copyright (C) 2015 ScyllaDB
*/

2
src/main/java/com/cloudius/urchin/utils/SnapshotDetailsTabularData.java → src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java
View File

@ -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.*;

2
src/main/java/com/yammer/metrics/core/APICounter.java
View File

@ -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 {

2
src/main/java/com/yammer/metrics/core/APIHistogram.java
View File

@ -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;

2
src/main/java/com/yammer/metrics/core/APIMeter.java
View File

@ -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;

2
src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -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

2
src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java
View File

@ -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

2
src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
View File

@ -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.

2
src/main/java/org/apache/cassandra/gms/FailureDetector.java
View File

@ -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";

2
src/main/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -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.

2
src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java
View File

@ -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

2
src/main/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java
View File

@ -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 {

8
src/main/java/org/apache/cassandra/metrics/CacheMetrics.java
View File

@ -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;

4
src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java
View File

@ -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;

10
src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
View File

@ -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.*;

8
src/main/java/org/apache/cassandra/metrics/CommitLogMetrics.java
View File

@ -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;

8
src/main/java/org/apache/cassandra/metrics/CompactionMetrics.java
View File

@ -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;

6
src/main/java/org/apache/cassandra/metrics/DroppedMessageMetrics.java
View File

@ -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;
/**

4
src/main/java/org/apache/cassandra/metrics/EstimatedHistogramWrapper.java
View File

@ -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();

10
src/main/java/org/apache/cassandra/metrics/LatencyMetrics.java
View File

@ -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;

6
src/main/java/org/apache/cassandra/metrics/StorageMetrics.java
View File

@ -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;
/**

4
src/main/java/org/apache/cassandra/net/MessagingService.java
View File

@ -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 {

2
src/main/java/org/apache/cassandra/service/CacheService.java
View File

@ -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

2
src/main/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -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.*;

4
src/main/java/org/apache/cassandra/service/StorageService.java
View File

@ -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

2
src/main/java/org/apache/cassandra/streaming/StreamManager.java
View File

@ -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