Skip to content

Commit 02f1ad8

Browse files
committed
remove jmx calls metrics
1 parent 456caa4 commit 02f1ad8

File tree

5 files changed

+4
-106
lines changed

5 files changed

+4
-106
lines changed

server/src/main/java/org/apache/cassandra/sidecar/metrics/JmxOperationsMetrics.java

-60
This file was deleted.

server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetrics.java

-5
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,4 @@ public interface ServerMetrics
5353
* @return metrics related to internal caches that are tracked.
5454
*/
5555
CacheMetrics cacheMetrics();
56-
57-
/**
58-
* @return metrics related to invocation of C* JMX operations
59-
*/
60-
JmxOperationsMetrics jmxOperationsMetrics();
6156
}

server/src/main/java/org/apache/cassandra/sidecar/metrics/ServerMetricsImpl.java

-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public class ServerMetricsImpl implements ServerMetrics
3333
protected final RestoreMetrics restoreMetrics;
3434
protected final SchemaMetrics schemaMetrics;
3535
protected final CacheMetrics cacheMetrics;
36-
protected final JmxOperationsMetrics jmxOperationsMetrics;
3736

3837
public ServerMetricsImpl(MetricRegistry metricRegistry)
3938
{
@@ -44,7 +43,6 @@ public ServerMetricsImpl(MetricRegistry metricRegistry)
4443
this.restoreMetrics = new RestoreMetrics(metricRegistry);
4544
this.schemaMetrics = new SchemaMetrics(metricRegistry);
4645
this.cacheMetrics = new CacheMetrics(metricRegistry);
47-
this.jmxOperationsMetrics = new JmxOperationsMetrics(metricRegistry);
4846
}
4947

5048
@Override
@@ -76,10 +74,4 @@ public CacheMetrics cacheMetrics()
7674
{
7775
return cacheMetrics;
7876
}
79-
80-
@Override
81-
public JmxOperationsMetrics jmxOperationsMetrics()
82-
{
83-
return jmxOperationsMetrics;
84-
}
8577
}

server/src/main/java/org/apache/cassandra/sidecar/routes/AbstractHandler.java

-19
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.apache.cassandra.sidecar.common.server.exceptions.JmxAuthenticationException;
4343
import org.apache.cassandra.sidecar.concurrent.ExecutorPools;
4444
import org.apache.cassandra.sidecar.exceptions.NoSuchSidecarInstanceException;
45-
import org.apache.cassandra.sidecar.metrics.JmxOperationsMetrics;
4645
import org.apache.cassandra.sidecar.utils.CassandraInputValidator;
4746
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
4847

@@ -344,24 +343,6 @@ protected StorageOperations getStorageOperations(String host)
344343
throw cassandraServiceUnavailable();
345344
}
346345

347-
348346
return storageOperations;
349347
}
350-
351-
protected <V> void updateJmxMetric(AsyncResult<V> result,
352-
JmxOperationsMetrics jmxOperationsMetrics,
353-
String operationName,
354-
long startTime)
355-
{
356-
if (result.succeeded())
357-
{
358-
jmxOperationsMetrics.recordTimeTaken(operationName + "Succeeded",
359-
System.nanoTime() - startTime);
360-
}
361-
else
362-
{
363-
jmxOperationsMetrics.recordTimeTaken(operationName + "Failed",
364-
System.nanoTime() - startTime);
365-
}
366-
}
367348
}

server/src/main/java/org/apache/cassandra/sidecar/routes/cassandra/GetPreemptiveOpenIntervalHandler.java

+4-14
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.cassandra.sidecar.common.response.GetPreemptiveOpenIntervalResponse;
2929
import org.apache.cassandra.sidecar.common.server.StorageOperations;
3030
import org.apache.cassandra.sidecar.concurrent.ExecutorPools;
31-
import org.apache.cassandra.sidecar.metrics.JmxOperationsMetrics;
3231
import org.apache.cassandra.sidecar.metrics.SidecarMetrics;
3332
import org.apache.cassandra.sidecar.routes.AbstractHandler;
3433
import org.apache.cassandra.sidecar.utils.CassandraInputValidator;
@@ -40,7 +39,6 @@
4039
@Singleton
4140
public class GetPreemptiveOpenIntervalHandler extends AbstractHandler<Void>
4241
{
43-
private final JmxOperationsMetrics jmxOperationsMetrics;
4442

4543
@Inject
4644
protected GetPreemptiveOpenIntervalHandler(InstanceMetadataFetcher metadataFetcher,
@@ -49,7 +47,6 @@ protected GetPreemptiveOpenIntervalHandler(InstanceMetadataFetcher metadataFetch
4947
SidecarMetrics sidecarMetrics)
5048
{
5149
super(metadataFetcher, executorPools, validator);
52-
this.jmxOperationsMetrics = sidecarMetrics.server().jmxOperationsMetrics();
5350
}
5451

5552
@Override
@@ -65,20 +62,13 @@ protected void handleInternal(RoutingContext context,
6562
SocketAddress remoteAddress,
6663
Void request)
6764
{
68-
getSSTablePreemptiveOpenInterval(host, remoteAddress)
69-
.onSuccess(context::json)
70-
.onFailure(cause -> processFailure(cause, context, host, remoteAddress, request));
71-
}
72-
73-
protected Future<GetPreemptiveOpenIntervalResponse> getSSTablePreemptiveOpenInterval(String host, SocketAddress remoteAddress)
74-
{
75-
long startTime = System.nanoTime();
7665
StorageOperations storageOperations = getStorageOperations(host);
7766
logger.debug("Retrieving SSTable's preemptiveOpenInterval, remoteAddress={}, instance={}",
7867
remoteAddress, host);
7968

80-
return executorPools.service()
81-
.executeBlocking(storageOperations::getSSTablePreemptiveOpenIntervalInMB)
82-
.onComplete(ar -> updateJmxMetric(ar, jmxOperationsMetrics, "getSSTablePreemptiveOpenInterval", startTime));
69+
executorPools.service()
70+
.executeBlocking(storageOperations::getSSTablePreemptiveOpenIntervalInMB)
71+
.onSuccess(context::json)
72+
.onFailure(cause -> processFailure(cause, context, host, remoteAddress, request));
8373
}
8474
}

0 commit comments

Comments
 (0)