Skip to content

Commit 26d1087

Browse files
committed
Merge branch 'refs/heads/2025.3'
2 parents b8b3098 + c7e3d86 commit 26d1087

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ciso8601==2.3.2
88
colorlog==6.9.0
99
cpe==1.3.1
1010
cryptography==44.0.2
11-
debugpy==1.8.12
11+
debugpy==1.8.13
1212
deepmerge==2.0
1313
dirhash==0.5.0
1414
docker==7.1.0
@@ -24,6 +24,6 @@ securetar==2025.2.1
2424
sentry-sdk==2.22.0
2525
setuptools==75.8.2
2626
voluptuous==0.15.2
27-
dbus-fast==2.34.0
27+
dbus-fast==2.35.1
2828
typing_extensions==4.12.2
2929
zlib-fast==0.2.1

supervisor/bootstrap.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ async def initialize_coresys() -> CoreSys:
6060
coresys.resolution = await ResolutionManager(coresys).load_config()
6161
await coresys.resolution.load_modules()
6262
coresys.jobs = await JobManager(coresys).load_config()
63-
coresys.core = Core(coresys)
63+
coresys.core = await Core(coresys).post_init()
6464
coresys.plugins = await PluginManager(coresys).load_config()
6565
coresys.arch = CpuArch(coresys)
6666
coresys.auth = await Auth(coresys).load_config()

supervisor/utils/sentry.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from aiohttp.web_exceptions import HTTPBadGateway, HTTPServiceUnavailable
99
import sentry_sdk
1010
from sentry_sdk.integrations.aiohttp import AioHttpIntegration
11-
from sentry_sdk.integrations.asyncio import AsyncioIntegration
1211
from sentry_sdk.integrations.atexit import AtexitIntegration
1312
from sentry_sdk.integrations.dedupe import DedupeIntegration
1413
from sentry_sdk.integrations.excepthook import ExcepthookIntegration
@@ -28,6 +27,9 @@ def init_sentry(coresys: CoreSys) -> None:
2827
"""Initialize sentry client."""
2928
if not sentry_sdk.is_initialized():
3029
_LOGGER.info("Initializing Supervisor Sentry")
30+
# Don't use AsyncioIntegration(). We commonly handle task exceptions
31+
# outside of tasks. This would cause exception we gracefully handle to
32+
# be captured by sentry.
3133
sentry_sdk.init(
3234
dsn="https://[email protected]/5370612",
3335
before_send=partial(filter_data, coresys),
@@ -43,7 +45,6 @@ def init_sentry(coresys: CoreSys) -> None:
4345
}
4446
)
4547
),
46-
AsyncioIntegration(),
4748
ExcepthookIntegration(),
4849
DedupeIntegration(),
4950
AtexitIntegration(),

0 commit comments

Comments
 (0)