From cb0d84a8034e16aa9eba5c855ae97c58928515ab Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Fri, 8 Dec 2023 20:15:07 -0500
Subject: [PATCH] Add extra trace tagging

---
 server/models/helpers/DocumentHelper.tsx    | 12 ++++++++++++
 server/routes/api/middlewares/apiWrapper.ts |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/server/models/helpers/DocumentHelper.tsx b/server/models/helpers/DocumentHelper.tsx
index 91a0e422c..68f4ddc21 100644
--- a/server/models/helpers/DocumentHelper.tsx
+++ b/server/models/helpers/DocumentHelper.tsx
@@ -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 });
     }
diff --git a/server/routes/api/middlewares/apiWrapper.ts b/server/routes/api/middlewares/apiWrapper.ts
index 757d51162..6c0a12709 100644
--- a/server/routes/api/middlewares/apiWrapper.ts
+++ b/server/routes/api/middlewares/apiWrapper.ts
@@ -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;