Merge branch 'master' into enable-source-maps

packages/backend-core/src/logging/pino/logger.ts

@@ -5,6 +5,8 @@ import { IdentityType } from "@budibase/types"
 import env from "../../environment"
 import * as context from "../../context"
 import * as correlation from "../correlation"
+import tracer from "dd-trace"
+import { formats } from "dd-trace/ext"
 
 import { localFileDestination } from "../system"
 
@@ -115,6 +117,11 @@ if (!env.DISABLE_PINO_LOGGER) {
       correlationId: correlation.getId(),
     }
 
+    const span = tracer.scope().active()
+    if (span) {
+      tracer.inject(span.context(), formats.LOG, contextObject)
+    }
+
     const mergingObject: any = {
       err: error,
       pid: process.pid,