From 40c6e5128871833fa1d09dbc2a1858619bc9a788 Mon Sep 17 00:00:00 2001
From: AllanZhengYP <zheallan@amazon.com>
Date: Sun, 29 May 2022 07:09:26 +0000
Subject: [PATCH] address feedbacks

---
 lib/event_listeners.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/event_listeners.js b/lib/event_listeners.js
index 334b61f2bf..b6fb841089 100644
--- a/lib/event_listeners.js
+++ b/lib/event_listeners.js
@@ -212,7 +212,7 @@ AWS.EventListeners = {
     });
 
     add('SET_TRACE_ID', 'afterBuild', function SET_TRACE_ID(req) {
-      if (AWS.util.isNode()) {
+      if (AWS.util.isNode() && !Object.hasOwnProperty.call(req.httpRequest.headers, traceIdHeaderName)) {
         var ENV_LAMBDA_FUNCTION_NAME = 'AWS_LAMBDA_FUNCTION_NAME';
         var ENV_TRACE_ID = '_X_AMZN_TRACE_ID';
         var traceIdHeaderName = 'X-Amzn-Trace-Id';
@@ -222,8 +222,7 @@ AWS.EventListeners = {
           typeof functionName === 'string' &&
           functionName.length > 0 &&
           typeof traceId === 'string' &&
-          traceId.length > 0 &&
-          !Object.hasOwnProperty.call(req.httpRequest.headers, traceIdHeaderName)
+          traceId.length > 0
         ) {
           req.httpRequest.headers[traceIdHeaderName] = traceId;
         }