From bd8158772d4f6fe38543b4b50ccf826fe13855f3 Mon Sep 17 00:00:00 2001
From: Will Dey <wdey@palantir.com>
Date: Mon, 30 Sep 2024 00:01:51 -0400
Subject: [PATCH] Cassandra 2.2.18 support

---
 .../exporter/InternalMetadataFactory.java     | 19 ++++++++++++-------
 .../java/com/zegelin/jmx/NamedObject.java     |  4 ++--
 .../prometheus/domain/MetricFamily.java       |  4 +---
 pom.xml                                       |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/agent/src/main/java/com/zegelin/cassandra/exporter/InternalMetadataFactory.java b/agent/src/main/java/com/zegelin/cassandra/exporter/InternalMetadataFactory.java
index 7eb07f2..bde44f7 100644
--- a/agent/src/main/java/com/zegelin/cassandra/exporter/InternalMetadataFactory.java
+++ b/agent/src/main/java/com/zegelin/cassandra/exporter/InternalMetadataFactory.java
@@ -11,6 +11,7 @@
 import java.net.InetAddress;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 public class InternalMetadataFactory extends MetadataFactory {
     private static Optional<CFMetaData> getCFMetaData(final String keyspaceName, final String tableName) {
@@ -20,10 +21,13 @@ private static Optional<CFMetaData> getCFMetaData(final String keyspaceName, fin
     @Override
     public Optional<IndexMetadata> indexMetadata(final String keyspaceName, final String tableName, final String indexName) {
         return getCFMetaData(keyspaceName, tableName)
-                .flatMap(m -> m.getIndexes().get(indexName))
-                .map(m -> {
-                    final IndexMetadata.IndexType indexType = IndexMetadata.IndexType.valueOf(m.kind.toString());
-                    final Optional<String> className = Optional.ofNullable(m.options.get("class_name"));
+                .map(Stream::of)
+                .orElseGet(Stream::empty)
+                .flatMap(m -> m.allColumns().stream())
+                .filter(m -> indexName.equals(m.getIndexName()))
+                .<IndexMetadata>map(m -> {
+                    final IndexMetadata.IndexType indexType = IndexMetadata.IndexType.valueOf(m.getIndexType().toString());
+                    final Optional<String> className = Optional.ofNullable(m.getIndexOptions().get("class_name"));
 
                     return new IndexMetadata() {
                         @Override
@@ -36,7 +40,8 @@ public Optional<String> customClassName() {
                             return className;
                         }
                     };
-                });
+                })
+                .findAny();
     }
 
     @Override
@@ -45,12 +50,12 @@ public Optional<TableMetadata> tableOrViewMetadata(final String keyspaceName, fi
                 .map(m -> new TableMetadata() {
                     @Override
                     public String compactionStrategyClassName() {
-                        return m.params.compaction.klass().getCanonicalName();
+                        return m.compactionStrategyClass.getCanonicalName();
                     }
 
                     @Override
                     public boolean isView() {
-                        return m.isView();
+                        return false;
                     }
                 });
     }
diff --git a/common/src/main/java/com/zegelin/jmx/NamedObject.java b/common/src/main/java/com/zegelin/jmx/NamedObject.java
index 947aaed..1393012 100644
--- a/common/src/main/java/com/zegelin/jmx/NamedObject.java
+++ b/common/src/main/java/com/zegelin/jmx/NamedObject.java
@@ -1,6 +1,6 @@
 package com.zegelin.jmx;
 
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 
 import javax.management.ObjectName;
@@ -36,7 +36,7 @@ public <U> NamedObject<U> map(final BiFunction<ObjectName, ? super T, ? extends
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
+        return Objects.toStringHelper(this)
                 .add("name", name)
                 .add("object", object)
                 .toString();
diff --git a/common/src/main/java/com/zegelin/prometheus/domain/MetricFamily.java b/common/src/main/java/com/zegelin/prometheus/domain/MetricFamily.java
index 11856f0..d43b753 100644
--- a/common/src/main/java/com/zegelin/prometheus/domain/MetricFamily.java
+++ b/common/src/main/java/com/zegelin/prometheus/domain/MetricFamily.java
@@ -1,7 +1,5 @@
 package com.zegelin.prometheus.domain;
 
-import com.google.common.base.MoreObjects;
-
 import java.util.Objects;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -41,7 +39,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
+        return com.google.common.base.Objects.toStringHelper(this)
                 .add("name", name)
                 .add("help", help)
                 .toString();
diff --git a/pom.xml b/pom.xml
index 8216e31..7680ce7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     </modules>
 
     <properties>
-        <version.cassandra.all>3.11.2</version.cassandra.all>
+        <version.cassandra.all>2.2.18</version.cassandra.all>
 
         <version.maven.release.plugin>2.5.3</version.maven.release.plugin>
         <version.maven.dependency.plugin>3.1.1</version.maven.dependency.plugin>