Merge branch 'main' into ivan.topolcic/automatically-create-documentation-pr

Author: IvanTopolcic

package.json

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

src/index.ts

@@ -136,16 +136,16 @@ export function datadog<TEvent, TResult>(
         try {
           localResult = await promHandler(localEvent, localContext);
         } finally {
+          if (traceListener.currentSpan && finalConfig.captureLambdaPayload) {
+            tagObject(traceListener.currentSpan, "function.request", localEvent);
+            tagObject(traceListener.currentSpan, "function.response", localResult);
+          }
           if (traceListener.triggerTags) {
             const statusCode = extractHTTPStatusCodeTag(traceListener.triggerTags, localResult);
             if (statusCode) {
               // Store the status tag in the listener to send to Xray on invocation completion
               traceListener.triggerTags["http.status_code"] = statusCode;
               if (traceListener.currentSpan) {
-                if (finalConfig.captureLambdaPayload) {
-                  tagObject(traceListener.currentSpan, "function.request", localEvent);
-                  tagObject(traceListener.currentSpan, "function.response", localResult);
-                }
                 traceListener.currentSpan.setTag("http.status_code", statusCode);
               }
             }