From 144f1b918b40887a223e2033d20fa409b27f189d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 2 Dec 2022 13:24:12 -1000
Subject: [PATCH] Fix logging the wrong bluetooth adapter while connecting and
 out of slots (#83158)

---
 homeassistant/components/bluetooth/manifest.json |  2 +-
 homeassistant/components/bluetooth/wrappers.py   | 12 ++++++++++--
 homeassistant/package_constraints.txt            |  2 +-
 requirements_all.txt                             |  2 +-
 requirements_test_all.txt                        |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index a59411aae5a..f7f5847cabc 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -7,7 +7,7 @@
   "quality_scale": "internal",
   "requirements": [
     "bleak==0.19.2",
-    "bleak-retry-connector==2.8.7",
+    "bleak-retry-connector==2.8.9",
     "bluetooth-adapters==0.11.0",
     "bluetooth-auto-recovery==0.5.3",
     "bluetooth-data-tools==0.3.0",
diff --git a/homeassistant/components/bluetooth/wrappers.py b/homeassistant/components/bluetooth/wrappers.py
index d81331af331..beaa2acc78a 100644
--- a/homeassistant/components/bluetooth/wrappers.py
+++ b/homeassistant/components/bluetooth/wrappers.py
@@ -12,7 +12,7 @@ from bleak import BleakClient, BleakError
 from bleak.backends.client import BaseBleakClient, get_platform_client_backend_type
 from bleak.backends.device import BLEDevice
 from bleak.backends.scanner import AdvertisementDataCallback, BaseBleakScanner
-from bleak_retry_connector import NO_RSSI_VALUE
+from bleak_retry_connector import NO_RSSI_VALUE, ble_device_description
 
 from homeassistant.core import CALLBACK_TYPE, callback as hass_callback
 from homeassistant.helpers.frame import report
@@ -189,7 +189,15 @@ class HaBleakClientWrapper(BleakClient):
             timeout=self.__timeout,
             hass=models.MANAGER.hass,
         )
-        return await super().connect(**kwargs)
+        if debug_logging := _LOGGER.isEnabledFor(logging.DEBUG):
+            # Only lookup the description if we are going to log it
+            description = ble_device_description(wrapped_backend.device)
+            rssi = wrapped_backend.device.rssi
+            _LOGGER.debug("%s: Connecting (last rssi: %s)", description, rssi)
+        connected = await super().connect(**kwargs)
+        if debug_logging:
+            _LOGGER.debug("%s: Connected (last rssi: %s)", description, rssi)
+        return connected
 
     @hass_callback
     def _async_get_backend_for_ble_device(
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 223a395a813..5bbf35f4f07 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -10,7 +10,7 @@ atomicwrites-homeassistant==1.4.1
 attrs==21.2.0
 awesomeversion==22.9.0
 bcrypt==3.1.7
-bleak-retry-connector==2.8.7
+bleak-retry-connector==2.8.9
 bleak==0.19.2
 bluetooth-adapters==0.11.0
 bluetooth-auto-recovery==0.5.3
diff --git a/requirements_all.txt b/requirements_all.txt
index d034b8eec0c..c00615c7f4d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -422,7 +422,7 @@ bimmer_connected==0.10.4
 bizkaibus==0.1.1
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==2.8.7
+bleak-retry-connector==2.8.9
 
 # homeassistant.components.bluetooth
 bleak==0.19.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6b3b6d3b1f0..c4d38523559 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -346,7 +346,7 @@ bellows==0.34.5
 bimmer_connected==0.10.4
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==2.8.7
+bleak-retry-connector==2.8.9
 
 # homeassistant.components.bluetooth
 bleak==0.19.2