feat: expose flag to set baggageFilePath

netlify · Oct 24, 2023 · 1955ea5 · 1955ea5
1 parent cd7d0d6
commit 1955ea5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/packages/build/src/core/flags.js b/packages/build/src/core/flags.js
@@ -244,6 +244,11 @@ Default: false`,
     describe: 'Trace flags containing the trace settings for the given trace ID',
     hidden: true,
   },
+  'tracing.baggageFilePath': {
+    string: true,
+    describe: '',
+    hidden: true,
+  },
   offline: {
     boolean: true,
     describe: `Do not send requests to the Netlify API to retrieve site settings.

diff --git a/packages/build/src/core/normalize_flags.ts b/packages/build/src/core/normalize_flags.ts
@@ -106,6 +106,7 @@ const getDefaultFlags = function ({ env: envOpt = {} }, combinedEnv) {
       sampleRate: 1,
       httpProtocol: DEFAULT_OTEL_ENDPOINT_PROTOCOL,
       port: DEFAULT_OTEL_TRACING_PORT,
+      baggageFilePath: '',
     },
     timeline: 'build',
     quiet: false,

diff --git a/packages/build/src/core/types.ts b/packages/build/src/core/types.ts
@@ -86,4 +86,5 @@ export type TracingOptions = {
   traceId: string
   traceFlags: number
   parentSpanId: string
+  baggageFilePath: string
 }
diff --git a/packages/build/src/tracing/main.ts b/packages/build/src/tracing/main.ts
@@ -49,12 +49,17 @@ export const startTracing = function (options: TracingOptions, logger: (...args:
 
   // Sets the current trace ID and span ID based on the options received
   // this is used as a way to propagate trace context from Buildbot
-  return trace.setSpanContext(context.active(), {
+  const ctx = trace.setSpanContext(context.active(), {
     traceId: options.traceId,
     spanId: options.parentSpanId,
     traceFlags: options.traceFlags,
     isRemote: true,
   })
+
+  // Loads the contents of the passed baggageFilePath into the baggage
+  loadBaggageFromFile(options.baggageFilePath)
+
+  return ctx
 }
 
 /** Stops the tracing service if there's one running. This will flush any ongoing events */