Update index.ts

firebase · Jul 18, 2023 · 170be0a · 170be0a
1 parent 41d616f
commit 170be0a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/logger/index.ts b/src/logger/index.ts
@@ -87,6 +87,11 @@ function removeCircular(obj: any, refs: any[] = []): any {
  * @public
  */
 export function write(entry: LogEntry) {
+  const ctx = traceContext.getStore();
+  if (ctx?.traceId) {
+    entry["logging.googleapis.com/trace"] = `projects/${process.env.GCLOUD_PROJECT}/traces/${ctx.traceId}`;
+  }
+
   UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(removeCircular(entry)));
 }
 
@@ -147,17 +152,13 @@ function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry {
   if (lastArg && typeof lastArg === "object" && lastArg.constructor === Object) {
     entry = args.pop();
   }
-  const ctx = traceContext.getStore();
 
   // mimic `console.*` behavior, see https://nodejs.org/api/console.html#console_console_log_data_args
   let message = format(...args);
   if (severity === "ERROR" && !args.find((arg) => arg instanceof Error)) {
     message = new Error(message).stack || message;
   }
   const out: LogEntry = {
-    "logging.googleapis.com/trace": ctx?.traceId
-      ? `projects/${process.env.GCLOUD_PROJECT}/traces/${ctx.traceId}`
-      : undefined,
     ...entry,
     severity,
   };