fix: remove trace id and respect logging span id field.

Author: liuyunnnn

src/execution_context.ts

@@ -28,8 +28,7 @@ export const executionContextMiddleware = (
   if (cloudTraceContext) {
     const match = cloudTraceContext.match(TRACE_CONTEXT_PATTERN);
     if (match?.groups) {
-      const {traceId, spanId} = match.groups;
-      req.spanId = spanId;
+      req.spanId = match.groups.spanId;
     }
   }
   next();

src/functions.ts

@@ -36,10 +36,6 @@ export interface Request extends ExpressRequest {
    * Request-specified execution ID.
    */
   executionId?: string;
-  /**
-   * Cloud Trace trace ID.
-   */
-  traceId?: string;
   /**
    * Cloud Trace span ID.
    */

src/logger.ts

@@ -164,10 +164,10 @@ function getJSONWithContext(json: any, context: ExecutionContext) {
   } else {
     json[EXECUTION_CONTEXT_LABELS_KEY] = {execution_id: context.executionId};
   }
-  return {
-    ...json,
-    [EXECUTION_CONTEXT_SPAN_ID_KEY]: context.spanId,
-  };
+  if (!(EXECUTION_CONTEXT_SPAN_ID_KEY in json)) {
+    json[EXECUTION_CONTEXT_SPAN_ID_KEY] = context.spanId;
+  }
+  return json;
 }
 
 function processData(data: Uint8Array | string, encoding?: BufferEncoding) {

test/logger.ts

@@ -106,6 +106,25 @@ describe('getModifiedData', () => {
     assert.equal(modifiedData, expectedOutput);
   });
 
+  it('json with user span id', () => {
+    const data = JSON.stringify({
+      text: 'default text.',
+      component: 'arbitrary-property',
+      'logging.googleapis.com/spanId': 'mySpanId',
+    });
+    const expectedOutput =
+      JSON.stringify({
+        text: 'default text.',
+        component: 'arbitrary-property',
+        'logging.googleapis.com/spanId': 'mySpanId',
+        'logging.googleapis.com/labels': {
+          execution_id: 'testExecutionId',
+        },
+      }) + '\n';
+    const modifiedData = getModifiedData(data);
+    assert.equal(modifiedData, expectedOutput);
+  });
+
   it('uint8array', () => {
     const modifiedData = getModifiedData(sampleUint8Arr);
     assert.equal(modifiedData, expectedTextOutput);