less

Author: trask

instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java

@@ -8,12 +8,9 @@
 import static java.util.Collections.singleton;
 
 import com.datastax.driver.core.ExecutionInfo;
-import com.datastax.driver.core.Host;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
 import java.util.Collection;
 import javax.annotation.Nullable;
 
@@ -52,25 +49,7 @@ public Integer getServerPort(CassandraRequest request) {
   @Nullable
   @Override
   public InetSocketAddress getNetworkPeerInetSocketAddress(
-      CassandraRequest request, @Nullable ExecutionInfo response) {
-    if (response == null) {
-      return null;
-    }
-    Host queriedHost = response.getQueriedHost();
-    if (queriedHost == null) {
-      return null;
-    }
-    InetSocketAddress address = queriedHost.getSocketAddress();
-    if (address != null && address.getAddress() == null) {
-      // Address is unresolved, need to resolve it explicitly
-      try {
-        InetAddress resolved = InetAddress.getByName(address.getHostString());
-        return new InetSocketAddress(resolved, address.getPort());
-      } catch (UnknownHostException e) {
-        // If resolution fails, return the unresolved address anyway
-        return address;
-      }
-    }
-    return address;
+      CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
+    return executionInfo == null ? null : executionInfo.getQueriedHost().getSocketAddress();
   }
 }

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java

@@ -9,14 +9,11 @@
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 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 io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
+import java.net.SocketAddress;
 import java.util.Collection;
 import javax.annotation.Nullable;
 
@@ -55,29 +52,17 @@ public Integer getServerPort(CassandraRequest request) {
   @Nullable
   @Override
   public InetSocketAddress getNetworkPeerInetSocketAddress(
-      CassandraRequest request, @Nullable ExecutionInfo response) {
-    if (response == null) {
+      CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
+    if (executionInfo == null) {
       return null;
     }
-    Node coordinator = response.getCoordinator();
+    Node coordinator = executionInfo.getCoordinator();
     if (coordinator == null) {
       return null;
     }
-    EndPoint endPoint = coordinator.getEndPoint();
-    if (endPoint instanceof DefaultEndPoint) {
-      InetSocketAddress address = ((DefaultEndPoint) endPoint).resolve();
-      if (address != null && address.getAddress() == null) {
-        // Address is unresolved, need to resolve it explicitly
-        try {
-          InetAddress resolved = InetAddress.getByName(address.getHostString());
-          return new InetSocketAddress(resolved, address.getPort());
-        } catch (UnknownHostException e) {
-          // If resolution fails, return the unresolved address anyway
-          return address;
-        }
-      }
-      return address;
-    }
-    return null;
+    // 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;
   }
 }

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

@@ -12,27 +12,16 @@
 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.incubator.semconv.db.SqlClientAttributesGetter;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
 import java.util.Collection;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 final class CassandraSqlAttributesGetter
     implements SqlClientAttributesGetter<CassandraRequest, ExecutionInfo> {
   // copied from DbIncubatingAttributes.DbSystemIncubatingValues
   private static final String CASSANDRA = "cassandra";
 
-  private static final Logger logger =
-      Logger.getLogger(CassandraSqlAttributesGetter.class.getName());
-
-  private static final Field proxyAddressField = getProxyAddressField();
-
   @Override
   public String getDbSystem(CassandraRequest request) {
     return CASSANDRA;
@@ -64,55 +53,19 @@ public Integer getServerPort(CassandraRequest request) {
   @Nullable
   @Override
   public InetSocketAddress getNetworkPeerInetSocketAddress(
-      CassandraRequest request, @Nullable ExecutionInfo response) {
-    if (response == null) {
+      CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
+    if (executionInfo == null) {
       return null;
     }
-    Node coordinator = response.getCoordinator();
+    Node coordinator = executionInfo.getCoordinator();
     if (coordinator == null) {
       return null;
     }
     EndPoint endPoint = coordinator.getEndPoint();
-    InetSocketAddress address = null;
     if (endPoint instanceof DefaultEndPoint) {
-      address = ((DefaultEndPoint) endPoint).resolve();
-    } else if (endPoint instanceof SniEndPoint && proxyAddressField != null) {
-      SniEndPoint sniEndPoint = (SniEndPoint) endPoint;
-      Object object = null;
-      try {
-        object = proxyAddressField.get(sniEndPoint);
-      } catch (Exception e) {
-        logger.log(
-            Level.FINE,
-            "Error when accessing the private field proxyAddress of SniEndPoint using reflection.",
-            e);
-      }
-      if (object instanceof InetSocketAddress) {
-        address = (InetSocketAddress) object;
-      }
-    }
-
-    // Ensure address is resolved
-    if (address != null && address.getAddress() == null) {
-      try {
-        InetAddress resolved = InetAddress.getByName(address.getHostString());
-        return new InetSocketAddress(resolved, address.getPort());
-      } catch (UnknownHostException e) {
-        // If resolution fails, return the unresolved address anyway
-        return address;
-      }
-    }
-    return address;
-  }
-
-  @Nullable
-  private static Field getProxyAddressField() {
-    try {
-      Field field = SniEndPoint.class.getDeclaredField("proxyAddress");
-      field.setAccessible(true);
-      return field;
-    } catch (Exception e) {
-      return null;
+      // resolve() returns an existing InetSocketAddress, it does not do a dns resolve,
+      return (InetSocketAddress) endPoint.resolve();
     }
+    return null;
   }
 }