This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8602fb53 CASSSIDECAR-231: Schema Reporting Metrics Improvements (#210)
8602fb53 is described below
commit 8602fb534fd88d27e4117cc812e260c9f6246f33
Author: Yuriy Semchyshyn <[email protected]>
AuthorDate: Thu Apr 10 15:14:01 2025 -0500
CASSSIDECAR-231: Schema Reporting Metrics Improvements (#210)
Patch by Yuriy Semchyshyn; Reviewed by Doug Rohrer, Yifan Cai for
CASSSIDECAR-231
---
CHANGES.txt | 1 +
.../coordination/ClusterLeaseClaimTask.java | 3 +--
.../cassandra/sidecar/datahub/SchemaReporter.java | 26 +++++++++++++++++-----
.../db/schema/SidecarSchemaInitializer.java | 2 +-
.../handlers/restore/AbortRestoreJobHandler.java | 2 +-
.../handlers/restore/UpdateRestoreJobHandler.java | 2 +-
.../cassandra/sidecar/metrics/SidecarMetrics.java | 1 +
.../sidecar/metrics/SidecarMetricsImpl.java | 2 ++
.../sidecar/metrics/{ => server}/CacheMetrics.java | 3 ++-
.../sidecar/metrics/{ => server}/CdcMetrics.java | 6 +++--
.../metrics/{ => server}/CoordinationMetrics.java | 6 +++--
.../metrics/{ => server}/HealthMetrics.java | 5 +++--
.../metrics/{ => server}/ResourceMetrics.java | 5 +++--
.../metrics/{ => server}/RestoreMetrics.java | 6 +++--
.../metrics/{ => server}/SchemaMetrics.java | 6 +++--
.../metrics/server/SchemaReportingMetrics.java | 3 +--
.../metrics/{ => server}/ServerMetrics.java | 3 +--
.../metrics/{ => server}/ServerMetricsImpl.java | 3 +--
.../restore/RestoreJobConsistencyChecker.java | 3 +--
.../sidecar/restore/RestoreJobDiscoverer.java | 3 +--
.../sidecar/restore/RestoreRangeTask.java | 3 +--
.../sidecar/tasks/CdcRawDirectorySpaceCleaner.java | 3 +--
.../sidecar/tasks/HealthCheckPeriodicTask.java | 3 +--
.../ClusterLeaseClaimTaskIntegrationTest.java | 2 +-
.../tasks/CdcRawDirectorySpaceCleanerTest.java | 5 ++---
25 files changed, 64 insertions(+), 43 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index ff2fab10..d985ced0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.2.0
-----
+ * Schema Reporting Metrics Improvements (CASSSIDECAR-231)
* Fixing incorrect creation of MinuteBoundConfiguration &
MillisecondBoundConfiguration in CdcConfigImpl (CASSSIDECAR-236)
* Improvements to CDCConfig classes (CASSSIDECAR-235)
* Hot Reload client and server SSL certificates (CASSSIDECAR-228)
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTask.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTask.java
index 49ace97d..6177ec64 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTask.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTask.java
@@ -23,7 +23,6 @@ import java.time.temporal.ChronoUnit;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,8 +37,8 @@ import
org.apache.cassandra.sidecar.common.server.utils.SecondBoundConfiguration
import org.apache.cassandra.sidecar.config.ClusterLeaseClaimConfiguration;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
import org.apache.cassandra.sidecar.db.SidecarLeaseDatabaseAccessor;
-import org.apache.cassandra.sidecar.metrics.CoordinationMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.CoordinationMetrics;
import org.apache.cassandra.sidecar.tasks.PeriodicTask;
import org.apache.cassandra.sidecar.tasks.PeriodicTaskExecutor;
import org.apache.cassandra.sidecar.tasks.ScheduleDecision;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/datahub/SchemaReporter.java
b/server/src/main/java/org/apache/cassandra/sidecar/datahub/SchemaReporter.java
index 8e8d7fcc..832980b8 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/datahub/SchemaReporter.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/datahub/SchemaReporter.java
@@ -69,10 +69,7 @@ public class SchemaReporter
protected final SchemaReportingMetrics reportingMetrics;
/**
- * The public constructor that instantiates {@link SchemaReporter} with
default configuration.
- * <p>
- * The specific combination of converters used by this constructor should
be considered a part
- * of the API and should not generally be changed, as any change will
break existing users.
+ * The public constructor that instantiates {@link SchemaReporter} with
default configuration
*
* @param identifiersProvider an instance of {@link IdentifiersProvider}
to use
* @param emitterFactory an instance of {@link EmitterFactory} to use
@@ -82,6 +79,25 @@ public class SchemaReporter
public SchemaReporter(@NotNull IdentifiersProvider identifiersProvider,
@NotNull EmitterFactory emitterFactory,
@NotNull SidecarMetrics sidecarMetrics)
+ {
+ this(identifiersProvider,
+ emitterFactory,
+ sidecarMetrics.server().schemaReporting());
+ }
+
+ /**
+ * A protected constructor that can be used to instantiate {@link
SchemaReporter} with custom configuration
+ * <p>
+ * NOTE: The specific combination of converters used by this constructor
should be considered a part
+ * of the API and should not generally be changed, as any change
will break existing users
+ *
+ * @param identifiersProvider an instance of {@link IdentifiersProvider}
to use
+ * @param emitterFactory an instance of {@link EmitterFactory} to use
+ * @param reportingMetrics an instance of {@link SchemaReportingMetrics}
to use
+ */
+ protected SchemaReporter(@NotNull IdentifiersProvider identifiersProvider,
+ @NotNull EmitterFactory emitterFactory,
+ @NotNull SchemaReportingMetrics reportingMetrics)
{
this(identifiersProvider,
ImmutableList.of(new
ClusterToDataPlatformInfoConverter(identifiersProvider),
@@ -98,7 +114,7 @@ public class SchemaReporter
new
TableToBrowsePathsV2Converter(identifiersProvider),
new
TableToBrowsePathsConverter(identifiersProvider)),
emitterFactory,
- sidecarMetrics.server().schemaReporting());
+ reportingMetrics);
}
/**
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/db/schema/SidecarSchemaInitializer.java
b/server/src/main/java/org/apache/cassandra/sidecar/db/schema/SidecarSchemaInitializer.java
index f5157805..b0092943 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/db/schema/SidecarSchemaInitializer.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/db/schema/SidecarSchemaInitializer.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.sidecar.coordination.ClusterLease;
import
org.apache.cassandra.sidecar.coordination.ExecuteOnClusterLeaseholderOnly;
import org.apache.cassandra.sidecar.exceptions.CassandraUnavailableException;
import
org.apache.cassandra.sidecar.exceptions.SidecarSchemaModificationException;
-import org.apache.cassandra.sidecar.metrics.SchemaMetrics;
+import org.apache.cassandra.sidecar.metrics.server.SchemaMetrics;
import org.apache.cassandra.sidecar.tasks.PeriodicTask;
import org.apache.cassandra.sidecar.tasks.PeriodicTaskExecutor;
import org.apache.cassandra.sidecar.tasks.ScheduleDecision;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/AbortRestoreJobHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/AbortRestoreJobHandler.java
index 799e51b0..3270901d 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/AbortRestoreJobHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/AbortRestoreJobHandler.java
@@ -35,8 +35,8 @@ import org.apache.cassandra.sidecar.concurrent.ExecutorPools;
import org.apache.cassandra.sidecar.db.RestoreJobDatabaseAccessor;
import org.apache.cassandra.sidecar.handlers.AbstractHandler;
import org.apache.cassandra.sidecar.handlers.AccessProtected;
-import org.apache.cassandra.sidecar.metrics.RestoreMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.RestoreMetrics;
import org.apache.cassandra.sidecar.routes.RoutingContextUtils;
import org.apache.cassandra.sidecar.utils.CassandraInputValidator;
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/UpdateRestoreJobHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/UpdateRestoreJobHandler.java
index 979034da..566603dd 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/UpdateRestoreJobHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/UpdateRestoreJobHandler.java
@@ -41,8 +41,8 @@ import org.apache.cassandra.sidecar.db.RestoreJob;
import org.apache.cassandra.sidecar.db.RestoreJobDatabaseAccessor;
import org.apache.cassandra.sidecar.handlers.AbstractHandler;
import org.apache.cassandra.sidecar.handlers.AccessProtected;
-import org.apache.cassandra.sidecar.metrics.RestoreMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.RestoreMetrics;
import org.apache.cassandra.sidecar.routes.RoutingContextUtils;
import org.apache.cassandra.sidecar.utils.CassandraInputValidator;
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetrics.java
index 0b490572..f14711d4 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetrics.java
@@ -19,6 +19,7 @@
package org.apache.cassandra.sidecar.metrics;
import org.apache.cassandra.sidecar.metrics.instance.InstanceMetrics;
+import org.apache.cassandra.sidecar.metrics.server.ServerMetrics;
import org.jetbrains.annotations.NotNull;
/**
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetricsImpl.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetricsImpl.java
index 97855117..d6f71741 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetricsImpl.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/SidecarMetricsImpl.java
@@ -22,6 +22,8 @@ import com.codahale.metrics.MetricRegistry;
import org.apache.cassandra.sidecar.exceptions.CassandraUnavailableException;
import
org.apache.cassandra.sidecar.exceptions.NoSuchCassandraInstanceException;
import org.apache.cassandra.sidecar.metrics.instance.InstanceMetrics;
+import org.apache.cassandra.sidecar.metrics.server.ServerMetrics;
+import org.apache.cassandra.sidecar.metrics.server.ServerMetricsImpl;
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
import org.jetbrains.annotations.NotNull;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CacheMetrics.java
similarity index 91%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CacheMetrics.java
index 9f5ca5a0..4b612ade 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CacheMetrics.java
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import com.codahale.metrics.MetricRegistry;
+import org.apache.cassandra.sidecar.metrics.CacheStatsCounter;
import static
org.apache.cassandra.sidecar.handlers.snapshots.ListSnapshotHandler.SNAPSHOT_CACHE_NAME;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CdcMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CdcMetrics.java
similarity index 92%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/CdcMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CdcMetrics.java
index ac847d49..1f0765e6 100644
--- a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CdcMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CdcMetrics.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import java.util.Objects;
import java.util.function.Function;
@@ -24,8 +24,10 @@ import java.util.function.Function;
import com.codahale.metrics.DefaultSettableGauge;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricRegistry;
+import org.apache.cassandra.sidecar.metrics.DeltaGauge;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks metrics related to cdc functionality provided by Sidecar.
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CoordinationMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CoordinationMetrics.java
similarity index 88%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/CoordinationMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CoordinationMetrics.java
index aa6bb528..c01e95a4 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CoordinationMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/CoordinationMetrics.java
@@ -15,11 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import com.codahale.metrics.MetricRegistry;
+import org.apache.cassandra.sidecar.metrics.DeltaGauge;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks information about Sidecar coordination functionality
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/HealthMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/HealthMetrics.java
similarity index 91%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/HealthMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/HealthMetrics.java
index 7e143fda..a1f03820 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/HealthMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/HealthMetrics.java
@@ -16,14 +16,15 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import java.util.Objects;
import com.codahale.metrics.DefaultSettableGauge;
import com.codahale.metrics.MetricRegistry;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks availability of Cassandra instances maintained by Sidecar.
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ResourceMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ResourceMetrics.java
similarity index 89%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/ResourceMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ResourceMetrics.java
index fbbd271e..a3b7d449 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ResourceMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ResourceMetrics.java
@@ -16,14 +16,15 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import java.util.Objects;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks resource metrics, for resources maintained by Sidecar.
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/RestoreMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/RestoreMetrics.java
similarity index 92%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/RestoreMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/RestoreMetrics.java
index ba07169c..b17a4df0 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/RestoreMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/RestoreMetrics.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import java.util.Objects;
import java.util.function.Function;
@@ -25,8 +25,10 @@ import com.codahale.metrics.DefaultSettableGauge;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
+import org.apache.cassandra.sidecar.metrics.DeltaGauge;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks metrics related to restore functionality provided by Sidecar.
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SchemaMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaMetrics.java
similarity index 88%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/SchemaMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaMetrics.java
index 127b099d..53c178ac 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/SchemaMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaMetrics.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import com.codahale.metrics.MetricRegistry;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
+import org.apache.cassandra.sidecar.metrics.DeltaGauge;
+import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import static org.apache.cassandra.sidecar.metrics.ServerMetrics.SERVER_PREFIX;
+import static
org.apache.cassandra.sidecar.metrics.server.ServerMetrics.SERVER_PREFIX;
/**
* Tracks metrics for {@link SidecarSchema} and other schema related handling
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaReportingMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaReportingMetrics.java
index 1b576ce5..85aa15b9 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaReportingMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/SchemaReportingMetrics.java
@@ -23,7 +23,6 @@ import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
import org.apache.cassandra.sidecar.metrics.DeltaGauge;
import org.apache.cassandra.sidecar.metrics.NamedMetric;
-import org.apache.cassandra.sidecar.metrics.ServerMetrics;
import org.jetbrains.annotations.NotNull;
/**
@@ -31,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class SchemaReportingMetrics
{
- protected static final String DOMAIN = ServerMetrics.SERVER_PREFIX +
".SchemaReporting";
+ public static final String DOMAIN = ServerMetrics.SERVER_PREFIX +
".SchemaReporting";
public final NamedMetric<DeltaGauge> startedRequest;
public final NamedMetric<DeltaGauge> startedSchedule;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetrics.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetrics.java
similarity index 94%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetrics.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetrics.java
index fb8be759..1c05a301 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetrics.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetrics.java
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
-import org.apache.cassandra.sidecar.metrics.server.SchemaReportingMetrics;
import static org.apache.cassandra.sidecar.metrics.SidecarMetrics.APP_PREFIX;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetricsImpl.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetricsImpl.java
similarity index 96%
rename from
server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetricsImpl.java
rename to
server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetricsImpl.java
index 2d4e7da1..26684be5 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetricsImpl.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/server/ServerMetricsImpl.java
@@ -16,12 +16,11 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.metrics;
+package org.apache.cassandra.sidecar.metrics.server;
import java.util.Objects;
import com.codahale.metrics.MetricRegistry;
-import org.apache.cassandra.sidecar.metrics.server.SchemaReportingMetrics;
/**
* {@link ServerMetrics} tracks metrics related to Sidecar server.
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobConsistencyChecker.java
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobConsistencyChecker.java
index 477648ef..b330f3d7 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobConsistencyChecker.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobConsistencyChecker.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-
import com.google.common.collect.Range;
import com.google.common.collect.RangeMap;
import com.google.common.collect.TreeRangeMap;
@@ -53,9 +52,9 @@ import
org.apache.cassandra.sidecar.concurrent.TaskExecutorPool;
import org.apache.cassandra.sidecar.db.RestoreJob;
import org.apache.cassandra.sidecar.db.RestoreRange;
import org.apache.cassandra.sidecar.db.RestoreRangeDatabaseAccessor;
-import org.apache.cassandra.sidecar.metrics.RestoreMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
import org.apache.cassandra.sidecar.metrics.StopWatch;
+import org.apache.cassandra.sidecar.metrics.server.RestoreMetrics;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.VisibleForTesting;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobDiscoverer.java
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobDiscoverer.java
index 1d0f78bc..a2fe92d2 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobDiscoverer.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobDiscoverer.java
@@ -29,7 +29,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
@@ -58,8 +57,8 @@ import org.apache.cassandra.sidecar.db.RestoreSlice;
import org.apache.cassandra.sidecar.db.RestoreSliceDatabaseAccessor;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
import org.apache.cassandra.sidecar.exceptions.RestoreJobFatalException;
-import org.apache.cassandra.sidecar.metrics.RestoreMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.RestoreMetrics;
import org.apache.cassandra.sidecar.tasks.PeriodicTask;
import org.apache.cassandra.sidecar.tasks.PeriodicTaskExecutor;
import org.apache.cassandra.sidecar.tasks.ScheduleDecision;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreRangeTask.java
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreRangeTask.java
index 203d011a..aec74fd6 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreRangeTask.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreRangeTask.java
@@ -27,7 +27,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,10 +47,10 @@ import
org.apache.cassandra.sidecar.db.RestoreRangeDatabaseAccessor;
import org.apache.cassandra.sidecar.exceptions.RestoreJobException;
import org.apache.cassandra.sidecar.exceptions.RestoreJobExceptions;
import org.apache.cassandra.sidecar.exceptions.RestoreJobFatalException;
-import org.apache.cassandra.sidecar.metrics.RestoreMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
import org.apache.cassandra.sidecar.metrics.StopWatch;
import org.apache.cassandra.sidecar.metrics.instance.InstanceMetrics;
+import org.apache.cassandra.sidecar.metrics.server.RestoreMetrics;
import org.apache.cassandra.sidecar.utils.SSTableImporter;
import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleaner.java
b/server/src/main/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleaner.java
index ba5bb3ed..6247bb1f 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleaner.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleaner.java
@@ -33,7 +33,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,8 +47,8 @@ import org.apache.cassandra.sidecar.config.CdcConfiguration;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
import org.apache.cassandra.sidecar.db.SystemViewsDatabaseAccessor;
import org.apache.cassandra.sidecar.exceptions.SchemaUnavailableException;
-import org.apache.cassandra.sidecar.metrics.CdcMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.CdcMetrics;
import org.apache.cassandra.sidecar.utils.CdcUtil;
import org.apache.cassandra.sidecar.utils.FileUtils;
import org.apache.cassandra.sidecar.utils.TimeProvider;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/tasks/HealthCheckPeriodicTask.java
b/server/src/main/java/org/apache/cassandra/sidecar/tasks/HealthCheckPeriodicTask.java
index 645e8757..e3b6af37 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/tasks/HealthCheckPeriodicTask.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/tasks/HealthCheckPeriodicTask.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.sidecar.tasks;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,8 +33,8 @@ import org.apache.cassandra.sidecar.concurrent.ExecutorPools;
import org.apache.cassandra.sidecar.concurrent.TaskExecutorPool;
import org.apache.cassandra.sidecar.config.PeriodicTaskConfiguration;
import org.apache.cassandra.sidecar.config.SidecarConfiguration;
-import org.apache.cassandra.sidecar.metrics.HealthMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.HealthMetrics;
/**
* Periodically checks the health of every instance configured in the {@link
InstancesMetadata}.
diff --git
a/server/src/test/integration/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTaskIntegrationTest.java
b/server/src/test/integration/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTaskIntegrationTest.java
index 902eabf6..fbf808d4 100644
---
a/server/src/test/integration/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTaskIntegrationTest.java
+++
b/server/src/test/integration/org/apache/cassandra/sidecar/coordination/ClusterLeaseClaimTaskIntegrationTest.java
@@ -64,10 +64,10 @@ import
org.apache.cassandra.sidecar.config.yaml.ServiceConfigurationImpl;
import org.apache.cassandra.sidecar.db.SidecarLeaseDatabaseAccessor;
import org.apache.cassandra.sidecar.db.schema.SidecarLeaseSchema;
import org.apache.cassandra.sidecar.exceptions.CassandraUnavailableException;
-import org.apache.cassandra.sidecar.metrics.CoordinationMetrics;
import org.apache.cassandra.sidecar.metrics.MetricRegistryFactory;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetricsImpl;
+import org.apache.cassandra.sidecar.metrics.server.CoordinationMetrics;
import org.apache.cassandra.sidecar.tasks.ScheduleDecision;
import org.apache.cassandra.sidecar.testing.SharedExecutorNettyOptions;
import org.apache.cassandra.testing.TestVersion;
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleanerTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleanerTest.java
index b0366569..c26aebd7 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleanerTest.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/tasks/CdcRawDirectorySpaceCleanerTest.java
@@ -27,7 +27,6 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang3.RandomUtils;
import org.junit.jupiter.api.Test;
@@ -42,9 +41,9 @@ import org.apache.cassandra.sidecar.config.CdcConfiguration;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
import org.apache.cassandra.sidecar.config.yaml.CdcConfigurationImpl;
import org.apache.cassandra.sidecar.db.SystemViewsDatabaseAccessor;
-import org.apache.cassandra.sidecar.metrics.CdcMetrics;
-import org.apache.cassandra.sidecar.metrics.ServerMetrics;
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
+import org.apache.cassandra.sidecar.metrics.server.CdcMetrics;
+import org.apache.cassandra.sidecar.metrics.server.ServerMetrics;
import org.apache.cassandra.sidecar.utils.CdcUtil;
import org.apache.cassandra.sidecar.utils.TimeProvider;
import org.mockito.stubbing.Answer;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
