Merge pull request #8355 from rabbitmq/mergify/bp/v3.11.x/pr-8354

When available, use user-provided ip address for listener metadata (backport #8353) (backport #8354)

Author: michaelklishin

deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl

@@ -157,8 +157,17 @@ listener_info(Listener) ->
                        P
                end,
     Port = pget(port, Listener),
-    [{IPAddress, _Port, _Family} | _]
-        = rabbit_networking:tcp_listener_addresses(Port),
+    IPAddress = case rabbit_misc:pget(ip, Listener) of
+                    undefined ->
+                        [{AutoIPAddress, _Port, _Family} | _]
+                            = rabbit_networking:tcp_listener_addresses(Port),
+                        AutoIPAddress;
+                    IP when is_tuple(IP) ->
+                        IP;
+                    IP when is_list(IP) ->
+                        {ok, ParsedIP} = inet_parse:address(IP),
+                        ParsedIP
+                end,
     [{Protocol, IPAddress, Port}].
 
 lookup_dispatch(Lsnr) ->

deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl

@@ -155,10 +155,20 @@ start_tls_listener(TLSConf0, CowboyOpts) ->
 
 listener_started(Protocol, Listener) ->
     Port = rabbit_misc:pget(port, Listener),
-    [rabbit_networking:tcp_listener_started(Protocol, Listener,
-                                            IPAddress, Port)
-     || {IPAddress, _Port, _Family}
-        <- rabbit_networking:tcp_listener_addresses(Port)],
+    case rabbit_misc:pget(ip, Listener) of
+        undefined ->
+            [rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                    IPAddress, Port)
+             || {IPAddress, _Port, _Family}
+                    <- rabbit_networking:tcp_listener_addresses(Port)];
+        IP when is_tuple(IP) ->
+            rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                   IP, Port);
+        IP when is_list(IP) ->
+            {ok, ParsedIP} = inet_parse:address(IP),
+            rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                   ParsedIP, Port)
+    end,
     ok.
 
 get_tcp_conf(TCPConf0) ->

deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl

@@ -165,10 +165,20 @@ start_tls_listener(TLSConf0, CowboyOpts0, Routes) ->
 
 listener_started(Protocol, Listener) ->
     Port = rabbit_misc:pget(port, Listener),
-    [rabbit_networking:tcp_listener_started(Protocol, Listener,
-                                            IPAddress, Port)
-     || {IPAddress, _Port, _Family}
-        <- rabbit_networking:tcp_listener_addresses(Port)],
+    case rabbit_misc:pget(ip, Listener) of
+        undefined ->
+            [rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                    IPAddress, Port)
+             || {IPAddress, _Port, _Family}
+                    <- rabbit_networking:tcp_listener_addresses(Port)];
+        IP when is_tuple(IP) ->
+            rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                   IP, Port);
+        IP when is_list(IP) ->
+            {ok, ParsedIP} = inet_parse:address(IP),
+            rabbit_networking:tcp_listener_started(Protocol, Listener,
+                                                   ParsedIP, Port)
+    end,
     ok.
 
 get_env(Key, Default) ->