Pass node instrumentations and modify build script

Author: vasireddy99

nodejs/build.sh

@@ -22,9 +22,7 @@ mv ./packages/layer/build/workspace/otel-handler ./packages/layer/build/workspac
 cp "$SOURCEDIR"/scripts/otel-handler ./packages/layer/build/workspace/otel-handler
 # This assumes that generators and propagators does not have additional dependencies outside of normal OTel ones.
 # It's inconceivable for this to ever be incorrect.
-cp -r "$SOURCEDIR"/wrapper-adot/node_modules/@opentelemetry/id-generator-aws-xray ./packages/layer/build/workspace/nodejs/node_modules/@opentelemetry
-cp -r "$SOURCEDIR"/wrapper-adot/node_modules/@opentelemetry/propagator-aws-xray ./packages/layer/build/workspace/nodejs/node_modules/@opentelemetry
-cp -r "$SOURCEDIR"/wrapper-adot/node_modules/@opentelemetry/propagator-b3 ./packages/layer/build/workspace/nodejs/node_modules/@opentelemetry
+cp -r "$SOURCEDIR"/wrapper-adot/node_modules/@opentelemetry ./packages/layer/build/workspace/node_modules/
 cp "$SOURCEDIR"/wrapper-adot/build/src/adot-extension.* ./packages/layer/build/workspace/
 
 cd ./packages/layer/build/workspace || exit

nodejs/scripts/otel-handler

@@ -2,6 +2,24 @@
 
 export NODE_OPTIONS="--require /opt/adot-extension.js ${NODE_OPTIONS}"
 
+# If both OTEL_NODE_ENABLED_INSTRUMENTATIONS and OTEL_NODE_DISABLED_INSTRUMENTATIONS are not configured,
+# set OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda,http"
+if [ -z "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -z "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then
+    export OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda,http"
+
+# Else if OTEL_NODE_ENABLED_INSTRUMENTATIONS is configured and OTEL_NODE_DISABLED_INSTRUMENTATIONS is not,
+# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda,http"
+elif [ -n "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -z "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then
+    export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda,http"
+
+# Else if both OTEL_NODE_ENABLED_INSTRUMENTATIONS and OTEL_NODE_DISABLED_INSTRUMENTATIONS are configured,
+# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda,http"
+elif [ -n "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -n "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then
+    export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda,http"
+
+# Else do nothing
+fi
+
 if [[ -z "$OTEL_PROPAGATORS" ]]; then
   export OTEL_PROPAGATORS="tracecontext,baggage,xray-lambda"
 fi

nodejs/wrapper-adot/package.json

@@ -37,11 +37,11 @@
     "typescript": "5.8.3"
   },
   "dependencies": {
-    "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/id-generator-aws-xray": "^2.0.0",
-    "@opentelemetry/sdk-trace-node": "^2.0.0",
-    "@opentelemetry/propagator-aws-xray": "^2.0.0",
-    "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-trace-base": "^2.0.0"
+    "@opentelemetry/core": "^1.30.0",
+    "@opentelemetry/id-generator-aws-xray": "^1.2.3",
+    "@opentelemetry/sdk-trace-node": "^1.30.0",
+    "@opentelemetry/propagator-aws-xray": "^1.26.2",
+    "@opentelemetry/propagator-b3": "^1.30.0",
+    "@opentelemetry/sdk-trace-base": "^1.30.0"
   }
 }