Add extra trace tagging

This commit is contained in:
Tom Moor
2023-12-08 20:15:07 -05:00
parent fb790c0688
commit cb0d84a803
2 changed files with 20 additions and 0 deletions

View File

@@ -18,6 +18,7 @@ import {
} from "@shared/utils/date";
import attachmentCreator from "@server/commands/attachmentCreator";
import { parser, schema } from "@server/editor";
import { addTags } from "@server/logging/tracer";
import { trace } from "@server/logging/tracing";
import { Document, Revision, User } from "@server/models";
import FileStorage from "@server/storage/files";
@@ -113,6 +114,11 @@ export default class DocumentHelper {
centered: options?.centered,
});
addTags({
documentId: document.id,
options,
});
if (options?.signedUrls) {
const teamId =
document instanceof Document
@@ -157,6 +163,12 @@ export default class DocumentHelper {
after: Revision,
{ signedUrls, ...options }: HTMLOptions = {}
) {
addTags({
beforeId: before?.id,
documentId: after.documentId,
options,
});
if (!before) {
return await DocumentHelper.toHTML(after, { ...options, signedUrls });
}

View File

@@ -1,9 +1,17 @@
import stream from "stream";
import { Context, Next } from "koa";
import { Readable } from "readable-stream";
import { addTags } from "@server/logging/tracer";
export default function apiWrapper() {
return async function apiWrapperMiddleware(ctx: Context, next: Next) {
const id = ctx.request.body?.id ?? ctx.request.query?.id;
if (id) {
addTags({
"resource.id": `${id}`,
});
}
await next();
const ok = ctx.status < 400;