chore: address feedbacks

AllanZhengYP · trivikr · web-flow · commit 6f47b285e1a7 · 2022-06-03T11:00:24.000-07:00
Co-authored-by: Trivikram Kamat &lt;16024985+trivikr@users.noreply.github.com&gt;
diff --git a/packages/middleware-recursion-detection/src/index.ts b/packages/middleware-recursion-detection/src/index.ts
@@ -22,22 +22,22 @@ interface PreviouslyResolved {
  * Inject to trace ID to request header to detect recursion invocation in Lambda.
  * @internal
  */
-export function recursionDetectionMiddleware(options: PreviouslyResolved): BuildMiddleware<any, any> {
-  return <Output extends MetadataBearer>(next: BuildHandler<any, Output>): BuildHandler<any, Output> =>
+const recursionDetectionMiddleware = (options: PreviouslyResolved): BuildMiddleware<any, any>  => 
+  (next: BuildHandler<any, Output>): BuildHandler<any, Output> =>
     async (args: BuildHandlerArguments<any>): Promise<BuildHandlerOutput<Output>> => {
       const { request } = args;
-      if (!HttpRequest.isInstance(request) || options.runtime !== "node") {
+      if (
+        !HttpRequest.isInstance(request) ||
+        options.runtime !== "node" ||
+        request.headers.hasOwnProperty(TRACE_ID_HEADER_NAME)
+      ) {
         return next(args);
       }
 
       const functionName = process.env[ENV_LAMBDA_FUNCTION_NAME];
       const traceId = process.env[ENV_TRACE_ID];
       const nonEmptyString = (str: unknown): str is string => typeof str === "string" && str.length > 0;
-      if (
-        !request.headers.hasOwnProperty(TRACE_ID_HEADER_NAME) &&
-        nonEmptyString(functionName) &&
-        nonEmptyString(traceId)
-      ) {
+      if (nonEmptyString(functionName) && nonEmptyString(traceId)) {
         request.headers[TRACE_ID_HEADER_NAME] = traceId;
       }
       return next({
