Avoid potential for reverse name lookup (#5305)

open-telemetry · Feb 8, 2022 · 186c657 · 186c657
1 parent 1bdd88d
commit 186c657
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java b/...io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java
@@ -20,7 +20,8 @@ public String transport(ChannelAndMethod channelAndMethod, @Nullable Void unused
   @Nullable
   @Override
   public String peerName(ChannelAndMethod channelAndMethod, @Nullable Void unused) {
-    return channelAndMethod.getChannel().getConnection().getAddress().getHostName();
+    // not using InetAddress.getHostName() since that can trigger reverse name lookup
+    return null;
   }
 
   @Nullable

diff --git a/...io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java b/...io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java
@@ -21,7 +21,8 @@ public String transport(ReceiveRequest request, @Nullable GetResponse response)
   @Nullable
   @Override
   public String peerName(ReceiveRequest request, @Nullable GetResponse response) {
-    return request.getConnection().getAddress().getHostName();
+    // not using InetAddress.getHostName() since that can trigger reverse name lookup
+    return null;
   }
 
   @Nullable

diff --git a/...y/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java b/...y/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java
@@ -37,7 +37,7 @@ public String url(HttpClientConfig request) {
     if (hostAddress instanceof InetSocketAddress) {
       InetSocketAddress inetHostAddress = (InetSocketAddress) hostAddress;
       return (request.isSecure() ? "https://" : "http://")
-          + inetHostAddress.getHostName()
+          + inetHostAddress.getHostString()
           + ":"
           + inetHostAddress.getPort()
           + (uri.startsWith("/") ? "" : "/")