Merge branch 'master' into sergio.prada/task-improve-int-tests

* master:
  Update condition for setting dd parent source (#95)

Author: Czechh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "datadog-lambda-js",
-  "version": "3.26.0",
+  "version": "3.27.0",
   "description": "Lambda client library that supports hybrid tracing in node js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/trace/listener.spec.ts

@@ -150,8 +150,7 @@ describe("TraceListener", () => {
           function_arn: "arn:aws:lambda:us-east-1:123456789101:function:my-lambda",
           function_version: "$LATEST",
           request_id: "1234",
-          resource_names: "my-lambda",
-          "_dd.parent_source": "xray",
+          resource_names: "my-lambda"
         },
         type: "serverless",
       },

src/trace/listener.ts

@@ -90,16 +90,19 @@ export class TraceListener {
     if (this.context) {
       logDebug("Applying lambda context to datadog traces");
       const functionArn = (this.context.invokedFunctionArn ?? "").toLowerCase();
-      const tk = functionArn.split(":")
+      const tk = functionArn.split(":");
       options.tags = {
         cold_start: didFunctionColdStart(),
         function_arn: tk.length > 7 ? tk.slice(0, 7).join(":") : functionArn,
         function_version: tk.length > 7 ? tk[7] : "$LATEST",
         request_id: this.context.awsRequestId,
         resource_names: this.context.functionName,
       };
-      if (this.contextService.traceSource !== Source.DDTrace) {
-        options.tags['_dd.parent_source'] = this.contextService.traceSource;
+      if (
+        (this.contextService.traceSource === Source.Xray && this.config.mergeDatadogXrayTraces) ||
+        this.contextService.traceSource === Source.Event
+      ) {
+        options.tags["_dd.parent_source"] = this.contextService.traceSource;
       }
     }
     if (this.stepFunctionContext) {