From fc0486016eb03833643b665206440add28172ffc Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Thu, 10 Mar 2016 11:33:25 +0100 Subject: [PATCH] Move core-edge metrics in its own package --- enterprise/metrics/pom.xml | 2 +- .../org/neo4j/metrics/source/Neo4jMetricsBuilder.java | 2 ++ .../neo4j/metrics/source/{ => coreedge}/CoreMetrics.java | 8 ++++---- .../neo4j/metrics/source/{ => coreedge}/EdgeMetrics.java | 6 +++--- .../source/{ => coreedge}/LeaderNotFoundMetric.java | 2 +- .../source/{ => coreedge}/MessageQueueMonitorMetric.java | 2 +- .../metrics/source/{ => coreedge}/PullRequestMetric.java | 2 +- .../source/{ => coreedge}/RaftLogAppendIndexMetric.java | 2 +- .../source/{ => coreedge}/RaftLogCommitIndexMetric.java | 2 +- .../metrics/source/{ => coreedge}/RaftTermMetric.java | 2 +- .../source/{ => coreedge}/TxPullRequestsMetric.java | 3 +-- .../metrics/source/{ => coreedge}/TxRetryMetric.java | 3 +-- .../test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java | 8 ++++---- .../metrics/source/MessageQueueMonitorMetricTest.java | 4 +++- 14 files changed, 25 insertions(+), 23 deletions(-) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/CoreMetrics.java (99%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/EdgeMetrics.java (98%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/LeaderNotFoundMetric.java (96%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/MessageQueueMonitorMetric.java (98%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/PullRequestMetric.java (97%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/RaftLogAppendIndexMetric.java (96%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/RaftLogCommitIndexMetric.java (96%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/RaftTermMetric.java (96%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/TxPullRequestsMetric.java (93%) rename enterprise/metrics/src/main/java/org/neo4j/metrics/source/{ => coreedge}/TxRetryMetric.java (92%) diff --git a/enterprise/metrics/pom.xml b/enterprise/metrics/pom.xml index 208b5267572de..2e2d7c56d4de1 100644 --- a/enterprise/metrics/pom.xml +++ b/enterprise/metrics/pom.xml @@ -63,7 +63,7 @@ - + diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/Neo4jMetricsBuilder.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/Neo4jMetricsBuilder.java index 8b272da46836c..f7fcaa01c7a35 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/Neo4jMetricsBuilder.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/Neo4jMetricsBuilder.java @@ -41,6 +41,8 @@ import org.neo4j.metrics.output.EventReporter; import org.neo4j.metrics.source.cluster.ClusterMetrics; import org.neo4j.metrics.source.cluster.NetworkMetrics; +import org.neo4j.metrics.source.coreedge.CoreMetrics; +import org.neo4j.metrics.source.coreedge.EdgeMetrics; import org.neo4j.metrics.source.db.BoltMetrics; import org.neo4j.metrics.source.db.CheckPointingMetrics; import org.neo4j.metrics.source.db.CypherMetrics; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/CoreMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/CoreMetrics.java similarity index 99% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/CoreMetrics.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/CoreMetrics.java index 9b69264828865..e0088f5649877 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/CoreMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/CoreMetrics.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; - -import java.io.IOException; -import java.util.function.Supplier; +package org.neo4j.metrics.source.coreedge; import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; +import java.io.IOException; +import java.util.function.Supplier; + import org.neo4j.coreedge.raft.CoreMetaData; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.lifecycle.LifecycleAdapter; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/EdgeMetrics.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/EdgeMetrics.java similarity index 98% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/EdgeMetrics.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/EdgeMetrics.java index be00cb5df2939..ee973624ed1c8 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/EdgeMetrics.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/EdgeMetrics.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; - -import java.io.IOException; +package org.neo4j.metrics.source.coreedge; import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; +import java.io.IOException; + import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.kernel.monitoring.Monitors; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/LeaderNotFoundMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/LeaderNotFoundMetric.java similarity index 96% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/LeaderNotFoundMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/LeaderNotFoundMetric.java index 99dd2efb6f5e3..7357f7d1f7863 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/LeaderNotFoundMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/LeaderNotFoundMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/MessageQueueMonitorMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/MessageQueueMonitorMetric.java similarity index 98% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/MessageQueueMonitorMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/MessageQueueMonitorMetric.java index 99f6d27f17da9..5c3c077d23d7a 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/MessageQueueMonitorMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/MessageQueueMonitorMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.net.InetSocketAddress; import java.util.Map; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/PullRequestMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/PullRequestMetric.java similarity index 97% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/PullRequestMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/PullRequestMetric.java index 480446046f555..bce1cbed0a511 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/PullRequestMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/PullRequestMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogAppendIndexMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogAppendIndexMetric.java similarity index 96% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogAppendIndexMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogAppendIndexMetric.java index 57692bdd34b24..fb5d21d05e678 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogAppendIndexMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogAppendIndexMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogCommitIndexMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogCommitIndexMetric.java similarity index 96% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogCommitIndexMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogCommitIndexMetric.java index 140c07b54066b..d70492b691fe1 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftLogCommitIndexMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftLogCommitIndexMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftTermMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftTermMetric.java similarity index 96% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftTermMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftTermMetric.java index a680468fcbcec..f1a9456af2a1c 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/RaftTermMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/RaftTermMetric.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxPullRequestsMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxPullRequestsMetric.java similarity index 93% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxPullRequestsMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxPullRequestsMetric.java index a361989ede215..2d17180d8eaf2 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxPullRequestsMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxPullRequestsMetric.java @@ -17,12 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; import org.neo4j.coreedge.catchup.tx.core.TxPullRequestsMonitor; -import org.neo4j.coreedge.raft.LeaderNotFoundMonitor; public class TxPullRequestsMetric implements TxPullRequestsMonitor diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxRetryMetric.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxRetryMetric.java similarity index 92% rename from enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxRetryMetric.java rename to enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxRetryMetric.java index 0685a0817e975..660bff8102200 100644 --- a/enterprise/metrics/src/main/java/org/neo4j/metrics/source/TxRetryMetric.java +++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/source/coreedge/TxRetryMetric.java @@ -17,11 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.metrics.source; +package org.neo4j.metrics.source.coreedge; import java.util.concurrent.atomic.AtomicLong; -import org.neo4j.coreedge.catchup.tx.core.TxPullRequestsMonitor; import org.neo4j.coreedge.catchup.tx.core.TxRetryMonitor; diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java index 3be0031584538..bde759ac56649 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java @@ -38,7 +38,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; -import org.neo4j.metrics.source.CoreMetrics; +import org.neo4j.metrics.source.coreedge.CoreMetrics; import org.neo4j.test.TargetDirectory; import org.neo4j.tooling.GlobalGraphOperations; @@ -54,9 +54,9 @@ import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_advertised_address; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterables.count; -import static org.neo4j.metrics.source.EdgeMetrics.PULL_UPDATES; -import static org.neo4j.metrics.source.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_RECEIVED; -import static org.neo4j.metrics.source.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_REQUESTED; +import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATES; +import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_RECEIVED; +import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_REQUESTED; import static org.neo4j.test.Assert.assertEventually; public class CoreEdgeMetricsIT diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/source/MessageQueueMonitorMetricTest.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/source/MessageQueueMonitorMetricTest.java index 313124ddbdb9c..17467bfddf12c 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/source/MessageQueueMonitorMetricTest.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/source/MessageQueueMonitorMetricTest.java @@ -23,6 +23,8 @@ import org.junit.Test; +import org.neo4j.metrics.source.coreedge.MessageQueueMonitorMetric; + import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -71,4 +73,4 @@ public void shouldCalculateTotalQueueSize() throws Exception // then assertThat( metric.queueSizes(), equalTo(18L) ); } -} \ No newline at end of file +}