@@ -15,6 +15,7 @@ import * as DesktopApplicationMenu from "../window/DesktopApplicationMenu.ts";
1515import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts" ;
1616import * as DesktopEnvironment from "./DesktopEnvironment.ts" ;
1717import * as DesktopLifecycle from "./DesktopLifecycle.ts" ;
18+ import * as DesktopObservability from "./DesktopObservability.ts" ;
1819import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts" ;
1920import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts" ;
2021import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts" ;
@@ -49,6 +50,12 @@ class DesktopDevelopmentBackendPortRequiredError extends Data.TaggedError(
4950 }
5051}
5152
53+ const { logInfo : logBootstrapInfo , logWarning : logBootstrapWarning } =
54+ DesktopObservability . makeComponentLogger ( "desktop-bootstrap" ) ;
55+
56+ const { logInfo : logStartupInfo , logError : logStartupError } =
57+ DesktopObservability . makeComponentLogger ( "desktop-startup" ) ;
58+
5259const resolveDesktopBackendPort = Effect . fn ( "resolveDesktopBackendPort" ) ( function * (
5360 configuredPort : Option . Option < number > ,
5461) {
@@ -103,13 +110,11 @@ const handleFatalStartupError = Effect.fn("desktop.startup.handleFatalStartupErr
103110 const message = error instanceof Error ? error . message : String ( error ) ;
104111 const detail =
105112 error instanceof Error && typeof error . stack === "string" ? `\n${ error . stack } ` : "" ;
106- yield * Effect . logError ( "fatal startup error" ) . pipe (
107- Effect . annotateLogs ( {
108- stage,
109- message,
110- ...( detail . length > 0 ? { detail } : { } ) ,
111- } ) ,
112- ) ;
113+ yield * logStartupError ( "fatal startup error" , {
114+ stage,
115+ message,
116+ ...( detail . length > 0 ? { detail } : { } ) ,
117+ } ) ;
113118 const wasQuitting = yield * Ref . getAndSet ( state . quitting , true ) ;
114119 if ( ! wasQuitting ) {
115120 yield * electronDialog . showErrorBox (
@@ -130,52 +135,51 @@ const bootstrap = Effect.gen(function* () {
130135 const environment = yield * DesktopEnvironment . DesktopEnvironment ;
131136 const desktopSettings = yield * DesktopAppSettings . DesktopAppSettings ;
132137 const serverExposure = yield * DesktopServerExposure . DesktopServerExposure ;
133- yield * Effect . logInfo ( "bootstrap start" ) ;
138+ yield * logBootstrapInfo ( "bootstrap start" ) ;
134139
135140 if ( environment . isDevelopment && Option . isNone ( environment . configuredBackendPort ) ) {
136141 return yield * new DesktopDevelopmentBackendPortRequiredError ( ) ;
137142 }
138143
139144 const backendPortSelection = yield * resolveDesktopBackendPort ( environment . configuredBackendPort ) ;
140145 const backendPort = backendPortSelection . port ;
141- yield * Effect . logInfo (
146+ yield * logBootstrapInfo (
142147 backendPortSelection . selectedByScan
143148 ? "selected backend port via sequential scan"
144149 : "using configured backend port" ,
145- ) . pipe (
146- Effect . annotateLogs ( {
150+ {
147151 port : backendPort ,
148152 ...( backendPortSelection . selectedByScan ? { startPort : DEFAULT_DESKTOP_BACKEND_PORT } : { } ) ,
149- } ) ,
153+ } ,
150154 ) ;
151155
152156 const settings = yield * desktopSettings . get ;
153157 if ( settings . serverExposureMode !== environment . defaultDesktopSettings . serverExposureMode ) {
154- yield * Effect . logInfo ( "bootstrap restoring persisted server exposure mode" ) . pipe (
155- Effect . annotateLogs ( { mode : settings . serverExposureMode } ) ,
156- ) ;
158+ yield * logBootstrapInfo ( "bootstrap restoring persisted server exposure mode" , {
159+ mode : settings . serverExposureMode ,
160+ } ) ;
157161 }
158162 const serverExposureState = yield * serverExposure . configureFromSettings ( { port : backendPort } ) ;
159163 const backendConfig = yield * serverExposure . backendConfig ;
160- yield * Effect . logInfo ( "bootstrap resolved backend endpoint" ) . pipe (
161- Effect . annotateLogs ( { baseUrl : backendConfig . httpBaseUrl . href } ) ,
162- ) ;
164+ yield * logBootstrapInfo ( "bootstrap resolved backend endpoint" , {
165+ baseUrl : backendConfig . httpBaseUrl . href ,
166+ } ) ;
163167 if ( serverExposureState . endpointUrl ) {
164- yield * Effect . logInfo ( "bootstrap enabled network access" ) . pipe (
165- Effect . annotateLogs ( { endpointUrl : serverExposureState . endpointUrl } ) ,
166- ) ;
168+ yield * logBootstrapInfo ( "bootstrap enabled network access" , {
169+ endpointUrl : serverExposureState . endpointUrl ,
170+ } ) ;
167171 } else if ( settings . serverExposureMode === "network-accessible" ) {
168- yield * Effect . logWarning (
172+ yield * logBootstrapWarning (
169173 "bootstrap fell back to local-only because no advertised network host was available" ,
170174 ) ;
171175 }
172176
173177 yield * installDesktopIpcHandlers ;
174- yield * Effect . logInfo ( "bootstrap ipc handlers registered" ) ;
178+ yield * logBootstrapInfo ( "bootstrap ipc handlers registered" ) ;
175179
176180 if ( ! ( yield * Ref . get ( state . quitting ) ) ) {
177181 yield * backendManager . start ;
178- yield * Effect . logInfo ( "bootstrap backend start requested" ) ;
182+ yield * logBootstrapInfo ( "bootstrap backend start requested" ) ;
179183 }
180184} ) . pipe ( Effect . withSpan ( "desktop.bootstrap" ) ) ;
181185
@@ -193,9 +197,7 @@ const startup = Effect.gen(function* () {
193197 yield * shellEnvironment . installIntoProcess ;
194198 const userDataPath = yield * appIdentity . resolveUserDataPath ;
195199 yield * electronApp . setPath ( "userData" , userDataPath ) ;
196- yield * Effect . logInfo ( "runtime logging configured" ) . pipe (
197- Effect . annotateLogs ( { logDir : environment . logDir } ) ,
198- ) ;
200+ yield * logStartupInfo ( "runtime logging configured" , { logDir : environment . logDir } ) ;
199201 yield * desktopSettings . load ;
200202
201203 if ( environment . platform === "linux" ) {
@@ -209,7 +211,7 @@ const startup = Effect.gen(function* () {
209211 Effect . withSpan ( "desktop.electron.whenReady" ) ,
210212 Effect . catchCause ( ( cause ) => fatalStartupCause ( "whenReady" , cause ) ) ,
211213 ) ;
212- yield * Effect . logInfo ( "app ready" ) ;
214+ yield * logStartupInfo ( "app ready" ) ;
213215 yield * appIdentity . configure ;
214216 yield * applicationMenu . configure ;
215217 yield * electronProtocol . registerDesktopFileProtocol ;
0 commit comments