Fix Cassandra target

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java

@@ -9,13 +9,15 @@
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.cql.Statement;
+import com.datastax.oss.driver.api.core.metadata.EndPoint;
 import com.datastax.oss.driver.api.core.metadata.Node;
+import com.datastax.oss.driver.internal.core.metadata.DefaultEndPoint;
+import com.datastax.oss.driver.internal.core.metadata.SniEndPoint;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.SemanticAttributes;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class CassandraAttributesExtractor
@@ -38,12 +40,8 @@ public void onEnd(
 
     Node coordinator = executionInfo.getCoordinator();
     if (coordinator != null) {
-      SocketAddress address = coordinator.getEndPoint().resolve();
-      if (address instanceof InetSocketAddress) {
-        attributes.put(
-            SemanticAttributes.SERVER_ADDRESS, ((InetSocketAddress) address).getHostName());
-        attributes.put(SemanticAttributes.SERVER_PORT, ((InetSocketAddress) address).getPort());
-      }
+      updateServerAddressAndPort(attributes, coordinator);
+
       if (coordinator.getDatacenter() != null) {
         attributes.put(SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter());
       }
@@ -82,4 +80,22 @@ public void onEnd(
     }
     attributes.put(SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent);
   }
+
+  private static void updateServerAddressAndPort(AttributesBuilder attributes, Node coordinator) {
+    EndPoint endPoint = coordinator.getEndPoint();
+    if (endPoint instanceof DefaultEndPoint) {
+      InetSocketAddress address = ((DefaultEndPoint) endPoint).resolve();
+      attributes.put(SemanticAttributes.SERVER_ADDRESS, address.getHostName());
+      attributes.put(SemanticAttributes.SERVER_PORT, address.getPort());
+    } else if (endPoint instanceof SniEndPoint) {
+      String serverName = ((SniEndPoint) endPoint).getServerName();
+      // parse serverName to get hostname and port
+      int index = serverName.indexOf(":");
+      if (index != -1) {
+        attributes.put(SemanticAttributes.SERVER_ADDRESS, serverName.substring(0, index));
+        attributes.put(
+            SemanticAttributes.SERVER_PORT, Integer.parseInt(serverName.substring(index + 1)));
+      }
+    }
+  }
 }

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java

@@ -6,10 +6,12 @@
 package io.opentelemetry.instrumentation.cassandra.v4_4;
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
+import com.datastax.oss.driver.api.core.metadata.EndPoint;
 import com.datastax.oss.driver.api.core.metadata.Node;
+import com.datastax.oss.driver.internal.core.metadata.DefaultEndPoint;
+import com.datastax.oss.driver.internal.core.metadata.SniEndPoint;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class CassandraNetworkAttributesGetter
@@ -28,7 +30,12 @@ public InetSocketAddress getNetworkPeerInetSocketAddress(
     }
     // resolve() returns an existing InetSocketAddress, it does not do a dns resolve,
     // at least in the only current EndPoint implementation (DefaultEndPoint)
-    SocketAddress address = coordinator.getEndPoint().resolve();
-    return address instanceof InetSocketAddress ? (InetSocketAddress) address : null;
+    EndPoint endPoint = coordinator.getEndPoint();
+    if (endPoint instanceof DefaultEndPoint) {
+      return (InetSocketAddress) coordinator.getEndPoint().resolve();
+    } else if (endPoint instanceof SniEndPoint) {
+      return ((SniEndPoint) endPoint).resolve();
+    }
+    return null;
   }
 }

instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java

@@ -24,9 +24,14 @@
 import static org.junit.jupiter.api.Named.named;
 
 import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.internal.core.metadata.SniEndPoint;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest;
 import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes;
+import java.net.InetSocketAddress;
+import java.time.Duration;
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -139,4 +144,23 @@ private static Stream<Arguments> provideReactiveParameters() {
                     "SELECT",
                     "users"))));
   }
+
+  @Override
+  protected CqlSession getSession(String keyspace) {
+    DriverConfigLoader configLoader =
+        DriverConfigLoader.programmaticBuilder()
+            .withDuration(DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds(0))
+            .withDuration(DefaultDriverOption.CONNECTION_INIT_QUERY_TIMEOUT, Duration.ofSeconds(10))
+            .build();
+    return wrap(
+        CqlSession.builder()
+            .addContactEndPoint(
+                new SniEndPoint(
+                    new InetSocketAddress("localhost", cassandraPort),
+                    "localhost:" + cassandraPort))
+            .withConfigLoader(configLoader)
+            .withLocalDatacenter("datacenter1")
+            .withKeyspace(keyspace)
+            .build());
+  }
 }