fix: cannot use endpoint to knwon ip

Author: aygalinc

projects/RabbitMQ.Client/Impl/RabbitMQActivitySource.cs

@@ -205,6 +205,15 @@ internal static void SetNetworkTags(this Activity? activity, IFrameHandler frame
         {
             if (activity?.IsAllDataRequested ?? false)
             {
+                switch (frameHandler.RemoteEndPoint.AddressFamily)
+                {
+                    case AddressFamily.InterNetworkV6:
+                        activity.SetTag("network.type", "ipv6");
+                        break;
+                    case AddressFamily.InterNetwork:
+                        activity.SetTag("network.type", "ipv4");
+                        break;
+                }
                 activity.SetServerTags(frameHandler.Endpoint);
 
                 if (frameHandler.RemoteEndPoint is IPEndPoint ipEndpoint)
@@ -235,16 +244,6 @@ internal static void SetNetworkTags(this Activity? activity, IFrameHandler frame
 
         internal static void SetServerTags(this Activity activity, AmqpTcpEndpoint endpoint)
         {
-            switch (endpoint.AddressFamily)
-            {
-                case AddressFamily.InterNetworkV6:
-                    activity.SetTag("network.type", "ipv6");
-                    break;
-                case AddressFamily.InterNetwork:
-                    activity.SetTag("network.type", "ipv4");
-                    break;
-            }
-
             if (!string.IsNullOrEmpty(endpoint.HostName))
             {
                 activity

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -6,4 +6,3 @@ RabbitMQ.Client.Exceptions.PublishReturnException.ReplyCode.get -> ushort
 RabbitMQ.Client.Exceptions.PublishReturnException.ReplyText.get -> string!
 RabbitMQ.Client.Exceptions.PublishReturnException.RoutingKey.get -> string!
 const RabbitMQ.Client.RabbitMQActivitySource.ConnectionSourceName = "RabbitMQ.Client.Connection" -> string!
-static RabbitMQ.Client.EndpointResolverExtensions.SelectOneAsync<T>(this RabbitMQ.Client.IEndpointResolver! resolver, System.Func<RabbitMQ.Client.AmqpTcpEndpoint!, System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! selector, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<(T, System.Diagnostics.Activity?)>!

projects/Test/Integration/Integration.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>

projects/Test/Integration/TestConnectionFactory.cs

@@ -447,7 +447,18 @@ public async Task TestCreateConnectionRegisterAnActivity()
             ConnectionFactory cf = CreateConnectionFactory();
             await using IConnection conn = await cf.CreateConnectionAsync();
             var connectionActivity = connectionRecorder.VerifyActivityRecordedOnce();
+            connectionActivity.HasTag("network.peer.address");
+            connectionActivity.HasTag("network.local.address");
+            connectionActivity.HasTag("server.address");
+            connectionActivity.HasTag("client.address");
+            connectionActivity.HasTag("network.peer.port");
+            connectionActivity.HasTag("network.local.port");
+            connectionActivity.HasTag("server.port");
+            connectionActivity.HasTag("client.port");
+            connectionActivity.HasTag("network.type");
             var tcpConnectionActivity = tcpConnectionRecorder.VerifyActivityRecordedOnce();
+            tcpConnectionActivity.HasTag("server.port");
+            tcpConnectionActivity.HasTag("server.address");
             Assert.Equal(connectionActivity, tcpConnectionActivity.Parent);
             await conn.CloseAsync();
         }

projects/Test/SequentialIntegration/SequentialIntegration.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>