-
Notifications
You must be signed in to change notification settings - Fork 599
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rework logging #1695
Draft
dholms
wants to merge
1
commit into
main
Choose a base branch
from
refactor-logging
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Rework logging #1695
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,70 @@ | ||
| import pino from 'pino' | ||
| import pinoHttp from 'pino-http' | ||
| import { subsystemLogger } from '@atproto/common' | ||
| import * as pino from 'pino' | ||
| import * as pinoHttp from 'pino-http' | ||
| import * as jwt from 'jsonwebtoken' | ||
| import { parseBasicAuth } from './auth' | ||
| import * as xrpc from '@atproto/xrpc-server' | ||
|
|
||
| export const dbLogger = subsystemLogger('pds:db') | ||
| export const readStickyLogger = subsystemLogger('pds:read-sticky') | ||
| export const redisLogger = subsystemLogger('pds:redis') | ||
| export const seqLogger = subsystemLogger('pds:sequencer') | ||
| export const mailerLogger = subsystemLogger('pds:mailer') | ||
| export const labelerLogger = subsystemLogger('pds:labler') | ||
| export const crawlerLogger = subsystemLogger('pds:crawler') | ||
| export const httpLogger = subsystemLogger('pds') | ||
| export type Logger = xrpc.Logger & { | ||
| http: pino.Logger | ||
| db: pino.Logger | ||
| seq: pino.Logger | ||
| redis: pino.Logger | ||
| mailer: pino.Logger | ||
| labeler: pino.Logger | ||
| crawler: pino.Logger | ||
| munge: pino.Logger | ||
| } | ||
|
|
||
| export const loggerMiddleware = pinoHttp({ | ||
| logger: httpLogger, | ||
| serializers: { | ||
| req: (req) => { | ||
| const serialized = pino.stdSerializers.req(req) | ||
| const authHeader = serialized.headers.authorization || '' | ||
| let auth: string | undefined = undefined | ||
| if (authHeader.startsWith('Bearer ')) { | ||
| const token = authHeader.slice('Bearer '.length) | ||
| const sub = jwt.decode(token)?.sub | ||
| if (sub) { | ||
| auth = 'Bearer ' + sub | ||
| } else { | ||
| auth = 'Bearer Invalid' | ||
| export const createLogger = ( | ||
| opts: Partial<xrpc.LoggerOpts> = {}, | ||
| ): { logger: Logger; logMiddleware: pinoHttp.HttpLogger } => { | ||
| const logger = xrpc.createLogger(opts) | ||
| const http = logger.child({ name: 'pds' }) | ||
| logger['http'] = http | ||
| logger['db'] = logger.child({ name: 'pds:db' }) | ||
| logger['seq'] = logger.child({ name: 'pds:sequencer' }) | ||
| logger['redis'] = logger.child({ name: 'pds:redis' }) | ||
| logger['mailer'] = logger.child({ name: 'pds:mailer' }) | ||
| logger['labeler'] = logger.child({ name: 'pds:labeler' }) | ||
| logger['crawler'] = logger.child({ name: 'pds:crawler' }) | ||
| logger['munge'] = logger.child({ name: 'pds:munge' }) | ||
| const logMiddleware = createLoggerMiddleware(http) | ||
| return { logger: logger as Logger, logMiddleware } | ||
| } | ||
|
|
||
| export const createLoggerMiddleware = (logger: pino.Logger) => { | ||
| return pinoHttp.default({ | ||
| logger, | ||
| serializers: { | ||
| req: (req) => { | ||
| const serialized = pino.stdSerializers.req(req) | ||
| const authHeader = serialized.headers.authorization || '' | ||
| let auth: string | undefined = undefined | ||
| if (authHeader.startsWith('Bearer ')) { | ||
| const token = authHeader.slice('Bearer '.length) | ||
| const sub = jwt.decode(token)?.sub | ||
| if (sub) { | ||
| auth = 'Bearer ' + sub | ||
| } else { | ||
| auth = 'Bearer Invalid' | ||
| } | ||
| } | ||
| if (authHeader.startsWith('Basic ')) { | ||
| const parsed = parseBasicAuth(authHeader) | ||
| if (!parsed) { | ||
| auth = 'Basic Invalid' | ||
| } else { | ||
| auth = 'Basic ' + parsed.username | ||
| } | ||
| } | ||
| } | ||
| if (authHeader.startsWith('Basic ')) { | ||
| const parsed = parseBasicAuth(authHeader) | ||
| if (!parsed) { | ||
| auth = 'Basic Invalid' | ||
| } else { | ||
| auth = 'Basic ' + parsed.username | ||
| return { | ||
| ...serialized, | ||
| headers: { | ||
| ...serialized.headers, | ||
| authorization: auth, | ||
| }, | ||
| } | ||
| } | ||
| return { | ||
| ...serialized, | ||
| headers: { | ||
| ...serialized.headers, | ||
| authorization: auth, | ||
| }, | ||
| } | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| }) | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.