Skip to content

Commit ca1c0e5

Browse files
committed
fix: resolve Rollup identifier collision for log export
1 parent b5e5bb3 commit ca1c0e5

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

packages/evlog/src/logger.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,15 @@ function createLogMethod(level: LogLevel) {
230230
* log.error({ action: 'payment', error: 'failed' })
231231
* ```
232232
*/
233-
export const log: Log = {
233+
const _log: Log = {
234234
info: createLogMethod('info'),
235235
error: createLogMethod('error'),
236236
warn: createLogMethod('warn'),
237237
debug: createLogMethod('debug'),
238238
}
239239

240+
export { _log as log }
241+
240242
const noopLogger: RequestLogger = {
241243
set() {},
242244
error() {},

packages/evlog/src/nitro/plugin.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export default defineNitroPlugin((nitroApp) => {
183183
if (cfRay) requestIdOverride = cfRay
184184
}
185185

186-
const log = createRequestLogger({
186+
const requestLog = createRequestLogger({
187187
method: e.method,
188188
path: e.path,
189189
requestId: requestIdOverride || e.context.requestId || crypto.randomUUID(),
@@ -192,23 +192,23 @@ export default defineNitroPlugin((nitroApp) => {
192192
// Apply route-based service configuration if a matching route is found
193193
const routeService = getServiceForPath(e.path, evlogConfig?.routes)
194194
if (routeService) {
195-
log.set({ service: routeService })
195+
requestLog.set({ service: routeService })
196196
}
197197

198-
e.context.log = log
198+
e.context.log = requestLog
199199
})
200200

201201
nitroApp.hooks.hook('error', async (error, { event }) => {
202202
const e = event as ServerEvent | undefined
203203
if (!e) return
204204

205-
const log = e.context.log as RequestLogger | undefined
206-
if (log) {
207-
log.error(error as Error)
205+
const requestLog = e.context.log as RequestLogger | undefined
206+
if (requestLog) {
207+
requestLog.error(error as Error)
208208

209209
// Get the actual error status code
210210
const errorStatus = (error as { statusCode?: number }).statusCode ?? 500
211-
log.set({ status: errorStatus })
211+
requestLog.set({ status: errorStatus })
212212

213213
// Build tail sampling context
214214
const startTime = e.context._evlogStartTime as number | undefined
@@ -219,7 +219,7 @@ export default defineNitroPlugin((nitroApp) => {
219219
duration: durationMs,
220220
path: e.path,
221221
method: e.method,
222-
context: log.getContext(),
222+
context: requestLog.getContext(),
223223
shouldKeep: false,
224224
}
225225

@@ -228,7 +228,7 @@ export default defineNitroPlugin((nitroApp) => {
228228

229229
e.context._evlogEmitted = true
230230

231-
const emittedEvent = log.emit({ _forceKeep: tailCtx.shouldKeep })
231+
const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })
232232
await callEnrichAndDrain(nitroApp, emittedEvent, e)
233233
}
234234
})
@@ -238,10 +238,10 @@ export default defineNitroPlugin((nitroApp) => {
238238
// Skip if already emitted by error hook
239239
if (e.context._evlogEmitted) return
240240

241-
const log = e.context.log as RequestLogger | undefined
242-
if (log) {
241+
const requestLog = e.context.log as RequestLogger | undefined
242+
if (requestLog) {
243243
const status = getResponseStatus(e)
244-
log.set({ status })
244+
requestLog.set({ status })
245245

246246
const startTime = e.context._evlogStartTime as number | undefined
247247
const durationMs = startTime ? Date.now() - startTime : undefined
@@ -251,13 +251,13 @@ export default defineNitroPlugin((nitroApp) => {
251251
duration: durationMs,
252252
path: e.path,
253253
method: e.method,
254-
context: log.getContext(),
254+
context: requestLog.getContext(),
255255
shouldKeep: false,
256256
}
257257

258258
await nitroApp.hooks.callHook('evlog:emit:keep', tailCtx)
259259

260-
const emittedEvent = log.emit({ _forceKeep: tailCtx.shouldKeep })
260+
const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })
261261
await callEnrichAndDrain(nitroApp, emittedEvent, e)
262262
}
263263
})

packages/evlog/src/runtime/client/log.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,11 @@ function createLogMethod(level: LogLevel) {
9595
}
9696
}
9797

98-
export const log: Log = {
98+
const _clientLog: Log = {
9999
info: createLogMethod('info'),
100100
error: createLogMethod('error'),
101101
warn: createLogMethod('warn'),
102102
debug: createLogMethod('debug'),
103103
}
104+
105+
export { _clientLog as log }

0 commit comments

Comments
 (0)