fix-3976 fully propagate traceId to user executed code and into bot-i…

…njected medplum client (medplum#3977) * fix-3976 fully propagate traceId to user executed code and into bot-injected medplum client * refactor/simplify
dillonstreator · Feb 16, 2024 · de46769 · de46769
1 parent 7fdb50c
commit de46769
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
@@ -409,6 +409,7 @@ export interface BotEvent<T = Resource | Hl7Message | string | Record<string, an
  readonly contentType: string;
  readonly input: T;
  readonly secrets: Record<string, ProjectSecret>;
+ readonly traceId?: string;
 }
 
 export interface InviteRequest {

diff --git a/packages/server/src/fhir/operations/deploy.ts b/packages/server/src/fhir/operations/deploy.ts
@@ -35,10 +35,15 @@ const PdfPrinter = require("pdfmake");
 const userCode = require("./user.js");
 
 exports.handler = async (event, context) => {
- const { baseUrl, accessToken, contentType, secrets } = event;
+ const { baseUrl, accessToken, contentType, secrets, traceId } = event;
  const medplum = new MedplumClient({
  baseUrl,
- fetch,
+ fetch: function(url, options = {}) {
+ options.headers ||= {};
+ options.headers['X-Trace-Id'] = traceId;
+ options.headers['traceparent'] = traceId;
+ return fetch(url, options);
+ },
  createPdf,
  });
  medplum.setAccessToken(accessToken);
@@ -47,7 +52,7 @@ exports.handler = async (event, context) => {
  if (contentType === ContentType.HL7_V2 && input) {
  input = Hl7Message.parse(input);
  }
- let result = await userCode.handler(medplum, { input, contentType, secrets });
+ let result = await userCode.handler(medplum, { input, contentType, secrets, traceId });
  if (contentType === ContentType.HL7_V2 && result) {
  result = result.toString();
  }

diff --git a/packages/server/src/fhir/operations/execute.ts b/packages/server/src/fhir/operations/execute.ts
@@ -429,18 +429,23 @@ async function runInVmContext(request: BotExecutionRequest): Promise<BotExecutio
  // End user code
 
  (async () => {
- const { baseUrl, accessToken, contentType, secrets } = event;
+ const { baseUrl, accessToken, contentType, secrets, traceId } = event;
  const medplum = new MedplumClient({
  baseUrl,
- fetch,
+ fetch: function(url, options = {}) {
+ options.headers ||= {};
+ options.headers['X-Trace-Id'] = traceId;
+ options.headers['traceparent'] = traceId;
+ return fetch(url, options);
+ },
  });
  medplum.setAccessToken(accessToken);
  try {
  let input = event.input;
  if (contentType === ContentType.HL7_V2 && input) {
  input = Hl7Message.parse(input);
  }
- let result = await exports.handler(medplum, { input, contentType, secrets });
+ let result = await exports.handler(medplum, { input, contentType, secrets, traceId });
  if (contentType === ContentType.HL7_V2 && result) {
  result = result.toString();
  }