Hacky hack for instaclustr#112

sonman · Sep 21, 2023 · 9327250 · 9327250
1 parent 406b05b
commit 9327250
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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
@@ -88,6 +88,6 @@ public String clusterName() {
 
     @Override
     public InetAddress localBroadcastAddress() {
-        return FBUtilities.getBroadcastAddressAndPort().toString(false);
+        return FBUtilities.getBroadcastAddressAndPort().getAddress();
     }
 }
diff --git a/.../com/zegelin/cassandra/exporter/collector/InternalGossiperMBeanMetricFamilyCollector.java b/.../com/zegelin/cassandra/exporter/collector/InternalGossiperMBeanMetricFamilyCollector.java
@@ -40,7 +40,7 @@ protected void collect(final Stream.Builder<NumericMetric> generationNumberMetri
             final InetAddress endpointAddress = endpoint.getAddress();
             final EndpointState state = gossiper.getEndpointStateForEndpoint(endpoint);
 
-            final Labels labels = metadataFactory.endpointLabels(endpoint.toString(false));
+            final Labels labels = metadataFactory.endpointLabels(endpointAddress);
 
             generationNumberMetrics.add(new NumericMetric(labels, gossiper.getCurrentGenerationNumber(endpoint)));
             downtimeMetrics.add(new NumericMetric(labels, millisecondsToSeconds(gossiper.getEndpointDowntime(endpoint))));

diff --git a/common/src/main/java/com/zegelin/cassandra/exporter/MetadataFactory.java b/common/src/main/java/com/zegelin/cassandra/exporter/MetadataFactory.java
@@ -68,7 +68,9 @@ public Labels endpointLabels(final InetAddress endpoint) {
     }
 
     public Labels endpointLabels(final String endpoint) {
-        return endpointLabels(InetAddresses.forString(endpoint));
+        // hacky workaround to fix https://github.com/instaclustr/cassandra-exporter/issues/112
+        String[] parts = endpoint.split("_");
+        return endpointLabels(InetAddresses.forString(parts[0]));
     }
 
     public abstract String clusterName();