fix trace context pattern and delete trace id.

Author: liuyunnnn

src/async_local_storage.ts

@@ -6,7 +6,6 @@ import type {AsyncLocalStorage} from 'node:async_hooks';
 
 export interface ExecutionContext {
   executionId?: string;
-  traceId?: string;
   spanId?: string;
 }
 
@@ -32,7 +31,6 @@ export async function asyncLocalStorageMiddleware(
   asyncLocalStorage.run(
     {
       executionId: req.executionId,
-      traceId: req.traceId,
       spanId: req.spanId,
     },
     () => {

src/execution_context.ts

@@ -5,7 +5,7 @@ const FUNCTION_EXECUTION_ID_HEADER_KEY = 'function-execution-id';
 const TRACE_CONTEXT_HEADER_KEY = 'X-Cloud-Trace-Context';
 
 const TRACE_CONTEXT_PATTERN =
-  /^(?<traceId>\w+)\/(?<spanId>\d+);o=(?<options>.+)$/;
+  /^(?<traceId>\w+)\/(?<spanId>\d+)(?:;o=(?<options>.+))?$/;
 
 function generateExecutionId() {
   const timestampPart = Date.now().toString(36).slice(-6);
@@ -29,7 +29,6 @@ export const executionContextMiddleware = (
     const match = cloudTraceContext.match(TRACE_CONTEXT_PATTERN);
     if (match?.groups) {
       const {traceId, spanId} = match.groups;
-      req.traceId = traceId;
       req.spanId = spanId;
     }
   }

src/logger.ts

@@ -18,7 +18,6 @@ import {getCurrentContext, ExecutionContext} from './async_local_storage';
 import {Buffer} from 'buffer';
 
 export const EXECUTION_CONTEXT_LABELS_KEY = 'logging.googleapis.com/labels';
-export const EXECUTION_CONTEXT_TRACE_KEY = 'logging.googleapis.com/trace';
 export const EXECUTION_CONTEXT_SPAN_ID_KEY = 'logging.googleapis.com/spanId';
 const SEVERITY = 'severity';
 
@@ -132,7 +131,6 @@ export function getModifiedData(
   let dataWithContext: {
     message: string | Uint8Array;
     'logging.googleapis.com/labels': {execution_id: string | undefined};
-    'logging.googleapis.com/trace': string | undefined;
     'logging.googleapis.com/spanId': string | undefined;
     severity?: string | undefined;
   };
@@ -155,7 +153,6 @@ function getTextWithContext(
   return {
     message: data,
     [EXECUTION_CONTEXT_LABELS_KEY]: {execution_id: context.executionId},
-    [EXECUTION_CONTEXT_TRACE_KEY]: context.traceId,
     [EXECUTION_CONTEXT_SPAN_ID_KEY]: context.spanId,
   };
 }
@@ -169,7 +166,6 @@ function getJSONWithContext(json: any, context: ExecutionContext) {
   }
   return {
     ...json,
-    [EXECUTION_CONTEXT_TRACE_KEY]: context.traceId,
     [EXECUTION_CONTEXT_SPAN_ID_KEY]: context.spanId,
   };
 }

test/async_local_storage.ts

@@ -15,7 +15,6 @@ describe('asyncLocalStorageMiddleware', () => {
     const req = {
       body: 'test body',
       executionId: 'testExecutionId',
-      traceId: 'testtrace',
       spanId: 'testSpanId',
     };
     let executionContext;
@@ -25,7 +24,6 @@ describe('asyncLocalStorageMiddleware', () => {
       assert(executionContext);
       assert.strictEqual(executionContext.executionId, req.executionId);
       assert.strictEqual(executionContext.spanId, req.spanId);
-      assert.strictEqual(executionContext.traceId, req.traceId);
     };
 
     await asyncLocalStorageMiddleware(

test/execution_context.ts

@@ -31,7 +31,6 @@ describe('executionContextMiddleware', () => {
 
     assert.strictEqual(req.executionId, validExecutionId);
     assert.strictEqual(req.spanId, testSpanId);
-    assert.strictEqual(req.traceId, testTrace);
   });
 
   it('generates execution ID if not in header', () => {
@@ -41,7 +40,6 @@ describe('executionContextMiddleware', () => {
 
     assert(req.executionId);
     assert.strictEqual(req.spanId, testSpanId);
-    assert.strictEqual(req.traceId, testTrace);
   });
 
   it('req trace undefined if not in header', () => {
@@ -51,6 +49,5 @@ describe('executionContextMiddleware', () => {
 
     assert(req.executionId);
     assert.strictEqual(req.spanId, undefined);
-    assert.strictEqual(req.traceId, undefined);
   });
 });

test/logger.ts

@@ -47,14 +47,12 @@ describe('getModifiedData', () => {
   const sampleUint8Arr = new Uint8Array(Buffer.from(sampleText));
   const expectedExecutionContext = {
     executionId: 'testExecutionId',
-    traceId: 'testTraceId',
     spanId: 'testSpanId',
   };
   const expectedMetadata = {
     'logging.googleapis.com/labels': {
       execution_id: 'testExecutionId',
     },
-    'logging.googleapis.com/trace': 'testTraceId',
     'logging.googleapis.com/spanId': 'testSpanId',
   };
   const expectedTextOutput =
@@ -102,7 +100,6 @@ describe('getModifiedData', () => {
           user_label_1: 'value_1',
           execution_id: 'testExecutionId',
         },
-        'logging.googleapis.com/trace': 'testTraceId',
         'logging.googleapis.com/spanId': 'testSpanId',
       }) + '\n';
     const modifiedData = getModifiedData(data);