Logger improvements (#7729)

* Remove enablement

* Refactor context and filtering

* Fix imports, simplify transports config

* Migrate usages of debug context

* Re-org, add colors and grouping to console logging

* Remove temp default context

* Remove manual prefix

* Move colorizing out of console transport body

* Reduce reuse

* Pass through context

* Ensure bitdrift is enabled in dev

* Enable Sentry on web only

* Clean up types

* Docs

* Format

* Update tests

* Clean up tests

* No positional args

* Revert Sentry changes

* Clean up context, use it, pass metadata through to Bitdrift

* Fix up debugging

* Clean up metadata before passing to Bitdrift

* Correct transports

* Reserve context prop on metadata and include in transports

* Update tests
This commit is contained in:
Eric Bailey
2025-02-28 12:09:36 -06:00
committed by GitHub
parent 9e9ffd5c6e
commit 7c36ea1158
27 changed files with 577 additions and 508 deletions
+18 -23
View File
@@ -10,7 +10,7 @@ import EventEmitter from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
import {logger} from '#/logger'
import {Logger} from '#/logger'
import {isNative} from '#/platform/detection'
import {
ACTIVE_POLL_INTERVAL,
@@ -34,6 +34,8 @@ import {MessagesEventBus} from '#/state/messages/events/agent'
import {MessagesEventBusError} from '#/state/messages/events/types'
import {DM_SERVICE_HEADERS} from '#/state/queries/messages/const'
const logger = Logger.create(Logger.Context.ConversationAgent)
export function isConvoItemMessage(
item: ConvoItem,
): item is ConvoItem & {type: 'message'} {
@@ -125,7 +127,7 @@ export class Convo {
getSnapshot(): ConvoState {
if (!this.snapshot) this.snapshot = this.generateSnapshot()
// logger.debug('Convo: snapshotted', {}, logger.DebugContext.convo)
// logger.debug('Convo: snapshotted', {})
return this.snapshot
}
@@ -375,15 +377,11 @@ export class Convo {
break
}
logger.debug(
`Convo: dispatch '${action.event}'`,
{
id: this.id,
prev: prevStatus,
next: this.status,
},
logger.DebugContext.convo,
)
logger.debug(`Convo: dispatch '${action.event}'`, {
id: this.id,
prev: prevStatus,
next: this.status,
})
this.updateLastActiveTimestamp()
this.commit()
@@ -471,7 +469,7 @@ export class Convo {
this.dispatch({event: ConvoDispatchEvent.Ready})
}
} catch (e: any) {
logger.error(e, {context: 'Convo: setup failed'})
logger.error(e, {message: 'Convo: setup failed'})
this.dispatch({
event: ConvoDispatchEvent.Error,
@@ -576,7 +574,7 @@ export class Convo {
this.sender = sender || this.sender
this.recipients = recipients || this.recipients
} catch (e: any) {
logger.error(e, {context: `Convo: failed to refresh convo`})
logger.error(e, {message: `Convo: failed to refresh convo`})
}
}
@@ -586,7 +584,7 @@ export class Convo {
}
| undefined
async fetchMessageHistory() {
logger.debug('Convo: fetch message history', {}, logger.DebugContext.convo)
logger.debug('Convo: fetch message history', {})
/*
* If oldestRev is null, we've fetched all history.
@@ -773,7 +771,7 @@ export class Convo {
// Ignore empty messages for now since they have no other purpose atm
if (!message.text.trim() && !message.embed) return
logger.debug('Convo: send message', {}, logger.DebugContext.convo)
logger.debug('Convo: send message', {})
const tempId = nanoid()
@@ -793,7 +791,6 @@ export class Convo {
logger.debug(
`Convo: processing messages (${this.pendingMessages.size} remaining)`,
{},
logger.DebugContext.convo,
)
const pendingMessage = Array.from(this.pendingMessages.values()).shift()
@@ -837,7 +834,7 @@ export class Convo {
// continue queue processing
await this.processPendingMessages()
} catch (e: any) {
logger.error(e, {context: `Convo: failed to send message`})
logger.error(e, {message: `Convo: failed to send message`})
this.handleSendMessageFailure(e)
this.isProcessingPendingMessages = false
}
@@ -883,7 +880,7 @@ export class Convo {
} else {
this.pendingMessageFailure = 'unrecoverable'
logger.error(e, {
context: `Convo handleSendMessageFailure received unknown error`,
message: `Convo handleSendMessageFailure received unknown error`,
})
}
@@ -902,7 +899,6 @@ export class Convo {
logger.debug(
`Convo: batch retrying ${this.pendingMessages.size} pending messages`,
{},
logger.DebugContext.convo,
)
try {
@@ -937,16 +933,15 @@ export class Convo {
logger.debug(
`Convo: sent ${this.pendingMessages.size} pending messages`,
{},
logger.DebugContext.convo,
)
} catch (e: any) {
logger.error(e, {context: `Convo: failed to batch retry messages`})
logger.error(e, {message: `Convo: failed to batch retry messages`})
this.handleSendMessageFailure(e)
}
}
async deleteMessage(messageId: string) {
logger.debug('Convo: delete message', {}, logger.DebugContext.convo)
logger.debug('Convo: delete message', {})
this.deletedMessages.add(messageId)
this.commit()
@@ -962,7 +957,7 @@ export class Convo {
)
})
} catch (e: any) {
logger.error(e, {context: `Convo: failed to delete message`})
logger.error(e, {message: `Convo: failed to delete message`})
this.deletedMessages.delete(messageId)
this.commit()
throw e
+14 -18
View File
@@ -3,7 +3,7 @@ import EventEmitter from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
import {logger} from '#/logger'
import {Logger} from '#/logger'
import {
BACKGROUND_POLL_INTERVAL,
DEFAULT_POLL_INTERVAL,
@@ -19,6 +19,7 @@ import {
import {DM_SERVICE_HEADERS} from '#/state/queries/messages/const'
const LOGGER_CONTEXT = 'MessagesEventBus'
const logger = Logger.create(Logger.Context.DMsAgent)
export class MessagesEventBus {
private id: string
@@ -90,17 +91,17 @@ export class MessagesEventBus {
}
background() {
logger.debug(`${LOGGER_CONTEXT}: background`, {}, logger.DebugContext.convo)
logger.debug(`${LOGGER_CONTEXT}: background`, {})
this.dispatch({event: MessagesEventBusDispatchEvent.Background})
}
suspend() {
logger.debug(`${LOGGER_CONTEXT}: suspend`, {}, logger.DebugContext.convo)
logger.debug(`${LOGGER_CONTEXT}: suspend`, {})
this.dispatch({event: MessagesEventBusDispatchEvent.Suspend})
}
resume() {
logger.debug(`${LOGGER_CONTEXT}: resume`, {}, logger.DebugContext.convo)
logger.debug(`${LOGGER_CONTEXT}: resume`, {})
this.dispatch({event: MessagesEventBusDispatchEvent.Resume})
}
@@ -222,19 +223,15 @@ export class MessagesEventBus {
break
}
logger.debug(
`${LOGGER_CONTEXT}: dispatch '${action.event}'`,
{
id: this.id,
prev: prevStatus,
next: this.status,
},
logger.DebugContext.convo,
)
logger.debug(`${LOGGER_CONTEXT}: dispatch '${action.event}'`, {
id: this.id,
prev: prevStatus,
next: this.status,
})
}
private async init() {
logger.debug(`${LOGGER_CONTEXT}: init`, {}, logger.DebugContext.convo)
logger.debug(`${LOGGER_CONTEXT}: init`, {})
try {
const response = await networkRetry(2, () => {
@@ -258,7 +255,7 @@ export class MessagesEventBus {
this.dispatch({event: MessagesEventBusDispatchEvent.Ready})
} catch (e: any) {
logger.error(e, {
context: `${LOGGER_CONTEXT}: init failed`,
message: `${LOGGER_CONTEXT}: init failed`,
})
this.dispatch({
@@ -327,7 +324,6 @@ export class MessagesEventBus {
// this.requestedPollIntervals.values(),
// ),
// },
// logger.DebugContext.convo,
// )
try {
@@ -372,12 +368,12 @@ export class MessagesEventBus {
this.emitter.emit('event', {type: 'logs', logs: batch})
} catch (e: any) {
logger.error(e, {
context: `${LOGGER_CONTEXT}: process latest events`,
message: `${LOGGER_CONTEXT}: process latest events`,
})
}
}
} catch (e: any) {
logger.error(e, {context: `${LOGGER_CONTEXT}: poll events failed`})
logger.error(e, {message: `${LOGGER_CONTEXT}: poll events failed`})
this.dispatch({
event: MessagesEventBusDispatchEvent.Error,
+2 -2
View File
@@ -166,7 +166,7 @@ export async function createAgentAndCreateAccount(
})
} catch (e: any) {
logger.error(e, {
context: `session: createAgentAndCreateAccount failed to save personal details and feeds`,
message: `session: createAgentAndCreateAccount failed to save personal details and feeds`,
})
}
} else {
@@ -177,7 +177,7 @@ export async function createAgentAndCreateAccount(
// snooze first prompt after signup, defer to next prompt
snoozeEmailConfirmationPrompt()
} catch (e: any) {
logger.error(e, {context: `session: failed snoozeEmailConfirmationPrompt`})
logger.error(e, {message: `session: failed snoozeEmailConfirmationPrompt`})
}
return agent.prepare(gates, moderation, onSessionChange)