Fixes issue where client_request_latency metric families were includi…

…ng aggregate totals per operation (missing the "consistency" label). These are now ignored.

Added some TODOs.

common/src/main/java/com/zegelin/cassandra/exporter/FactoriesSupplier.java

@@ -184,13 +184,17 @@ private Factory clientRequestMetricFactory(final FactoryBuilder.CollectorConstru
 
  final ImmutableMap.Builder<String, String> labelsBuilder = ImmutableMap.builder();
 
- labelsBuilder.put("operation", matcher.group("operation").toLowerCase());
+ final String operation = matcher.group("operation").toLowerCase();
+ final String consistency = matcher.group("consistency");
 
- {
- final String consistency = matcher.group("consistency");
- if (consistency != null) {
- labelsBuilder.put("consistency", consistency);
- }
+ labelsBuilder.put("operation", operation);
+
+ if (consistency == null && (operation.equals("read") || operation.equals("write"))) {
+ // read/write without a consistency level is a total -- exclude
+ return null;
+
+ } else if (consistency != null) {
+ labelsBuilder.put("consistency", consistency);
  }
 
  return labelsBuilder.build();
@@ -514,6 +518,7 @@ public List<Factory> get() {
 
  // org.apache.cassandra.metrics.CommitLogMetrics
  {
+ // TODO: Rename completed_tasks_total and pending_tasks to something more appropriate
  builder.add(commitLogMetricFactory(functionalCollectorConstructor(numericGaugeAsCounter()), "CompletedTasks", "completed_tasks_total", "Total number of commit log messages written (since server start)."));
  builder.add(commitLogMetricFactory(functionalCollectorConstructor(numericGaugeAsGauge()), "PendingTasks", "pending_tasks", "Number of commit log messages written not yet fsync’d."));
  builder.add(commitLogMetricFactory(functionalCollectorConstructor(numericGaugeAsGauge()), "TotalCommitLogSize", "size_bytes", "Total size used by all current commit log segments."));

common/src/main/java/com/zegelin/cassandra/exporter/collector/StorageServiceMBeanMetricFamilyCollector.java

@@ -60,6 +60,8 @@ private StorageServiceMBeanMetricFamilyCollector(final StorageServiceMBean stora
 
  final Map<Labels, FileStore> labeledFileStores = new HashMap<>();
 
+ // TODO: make available the directory name and type (data, commitlog, etc)
+
  for (final String directory : directories) {
  try {
  final FileStore fileStore = Files.getFileStore(Paths.get(directory));