Remove otel-instrument-est wraper and have ESM check in one wrapper

aws-observability · Oct 11, 2024 · 77add5a · 77add5a
1 parent 2df6d5d
commit 77add5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 48 deletions.
diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument
@@ -1,5 +1,5 @@
 #!/bin/bash
-isESMScript() {
+_is_esm_handler() {
   # Lambda function root directory
   TASK_DIR="/var/task"
 
@@ -28,7 +28,7 @@ isESMScript() {
   fi
 }
 
-if isESMScript; then
+if _is_esm_handler || [[ ${HANDLER_IS_ESM} == true ]]; then
   export NODE_OPTIONS="${NODE_OPTIONS} --import @aws/aws-distro-opentelemetry-node-autoinstrumentation/register --experimental-loader=@opentelemetry/instrumentation/hook.mjs"
   export HANDLER_IS_ESM=true
 else

diff --git a/lambda-layer/packages/layer/scripts/otel-instrument-esm b/lambda-layer/packages/layer/scripts/otel-instrument-esm