Merge branch 'coralogix-nodejs-autoinstrumentation' of github.com:coralogix/opentelemetry-lambda into coralogix-nodejs-autoinstrumentation

Author: iblancasa

.github/workflows/publish-nodejs.yml

@@ -104,5 +104,5 @@ jobs:
     - name: Publish layer
       env:
         LAYER_NAME: "coralogix-opentelemetry-nodejs-wrapper"
-        COMPATIBLE_RUNTIMES: "nodejs16.x nodejs18.x nodejs20.x"
+        COMPATIBLE_RUNTIMES: "nodejs18.x nodejs20.x nodejs22.x"
       run: ./ci-scripts/publish_${{ inputs.environment }}.sh

ci-scripts/build_nodejs_layer.sh

@@ -30,53 +30,56 @@ echo "CWD=$CWD"
 npm cache clean --force
 
 pushd "$OPENTELEMETRY_JS_CONTRIB_PATH" > /dev/null
-# Generate version files in opentelemetry-js-contrib
-npx lerna@6.6.2 run version:update # Newer versions have trouble with our lerna.json which contains `useWorkspaces`
 # Prepare opentelemetry-js-contrib
 npm install
+# Generate version files in opentelemetry-js-contrib
+# Lerna 9 no longer requires useWorkspaces configuration - it uses npm workspaces by default
+npm run version:update
 popd > /dev/null
 
-# Build opentelemetry-test-utils
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/opentelemetry-test-utils" > /dev/null
+# Build contrib-test-utils
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/contrib-test-utils" > /dev/null
 npm install && npm run compile
 popd > /dev/null
 
 # Build opentelemetry-propagator-aws-xray
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/propagators/propagator-aws-xray" > /dev/null
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/propagator-aws-xray" > /dev/null
 npm install --ignore-scripts && npm run compile
 popd > /dev/null
 
 # Build opentelemetry-propagator-aws-xray-lambda
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/propagators/propagator-aws-xray-lambda" > /dev/null
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/propagator-aws-xray-lambda" > /dev/null
 npm install && npm run compile
 popd > /dev/null
 
-# Build opentelemetry-propagation-utils
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/opentelemetry-propagation-utils" > /dev/null
+# Build propagation-utils
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/propagation-utils" > /dev/null
 npm install && npm run compile
 popd > /dev/null
 
 # Build opentelemetry-instrumentation-aws-lambda
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/plugins/node/opentelemetry-instrumentation-aws-lambda" > /dev/null
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/instrumentation-aws-lambda" > /dev/null
 rm -f opentelemetry-instrumentation-aws-lambda-*.tgz
 npm install --ignore-scripts && npm run compile && npm pack --ignore-scripts
 popd > /dev/null
 
 # Build opentelemetry-instrumentation-mongodb
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/plugins/node/opentelemetry-instrumentation-mongodb" > /dev/null
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/instrumentation-mongodb" > /dev/null
 rm -f opentelemetry-instrumentation-mongodb-*.tgz
 npm install --ignore-scripts && npm run compile && npm pack --ignore-scripts
 popd > /dev/null
 
 # Build opentelemetry-instrumentation-aws-sdk
-pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/plugins/node/opentelemetry-instrumentation-aws-sdk" > /dev/null
+pushd "$OPENTELEMETRY_JS_CONTRIB_PATH/packages/instrumentation-aws-sdk" > /dev/null
 rm -f opentelemetry-instrumentation-aws-sdk-*.tgz
 npm install --ignore-scripts && npm run compile && npm pack --ignore-scripts
 popd > /dev/null
 
 # Prepare opentelemetry-js
 pushd "$OPENTELEMETRY_JS_PATH" > /dev/null
 npm install
+# Generate version files in opentelemetry-js (required for TypeScript compilation)
+npx nx run-many -t version
 popd > /dev/null
 
 # Build sdk-logs
@@ -106,9 +109,9 @@ popd > /dev/null
 # Install forked libraries in cx-wrapper
 pushd "./nodejs/packages/cx-wrapper" > /dev/null
 npm install \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
     "${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
     "${IITM_PATH}"/import-in-the-middle-*.tgz
 popd > /dev/null
@@ -122,9 +125,9 @@ popd > /dev/null
 # Install libraries in layer
 pushd "./nodejs/packages/layer" > /dev/null
 npm install \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
-    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/plugins/node/opentelemetry-instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
+    "${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
     "${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
     "${IITM_PATH}"/import-in-the-middle-*.tgz \
     "${CWD}"/nodejs/packages/cx-wrapper/cx-wrapper-*.tgz
@@ -135,6 +138,13 @@ npm install -g copyfiles bestzip rimraf
 
 # Build layer
 pushd "./nodejs/packages/layer" > /dev/null
-npm run clean && npm install
+npm run clean && npm install --production
+# Dedupe dependencies to remove duplicates and reduce size
+npm dedupe
+# Remove unnecessary files to reduce layer size
+find node_modules -name "*.map" -delete
+find node_modules -type d \( -name "test" -o -name "tests" -o -name "docs" -o -name "doc" \) -exec rm -rf {} + 2>/dev/null || true
+# Rebuild layer with optimized dependencies
+npm run clean && npm run compile
 ls -lah build/layer.zip
-popd > /dev/null
+popd > /dev/null

dev/build-nodejs.sh

@@ -3,21 +3,24 @@
 #
 # The script expects the dependencies to be cloned in specific locations
 # relative to this repository's root directory.
+#
+# If you encounter build issues, try cleaning first:
+#   git clean -xdf nodejs
 
 set -euo pipefail
 
 ROOT_DIR=$(git rev-parse --show-toplevel)
 
 # Expected by build_nodejs_layer.sh
-if [ -z "$OPENTELEMETRY_JS_CONTRIB_PATH" ]; then
+if [ -z "${OPENTELEMETRY_JS_CONTRIB_PATH:-}" ]; then
 	export OPENTELEMETRY_JS_CONTRIB_PATH="$ROOT_DIR/opentelemetry-js-contrib-cx"
 fi
 
-if [ -z "$OPENTELEMETRY_JS_PATH" ]; then
+if [ -z "${OPENTELEMETRY_JS_PATH:-}" ]; then
 	export OPENTELEMETRY_JS_PATH="$ROOT_DIR/opentelemetry-js"
 fi
 
-if [ -z "$IITM_PATH" ]; then
+if [ -z "${IITM_PATH:-}" ]; then
 	export IITM_PATH="$ROOT_DIR/import-in-the-middle"
 fi
 

dev/deploy-nodejs.sh

@@ -13,19 +13,20 @@ if [ -z "$LAMBDA_LAYER_PREFIX" ]; then
     exit 1
 fi
 
-if [ -z "$AWS_PROFILE" ]; then
-    echo "AWS_PROFILE is not set"
-    exit 1
+if [ -z "${AWS_PROFILE:-}" ]; then
+    export AWS_PROFILE=default
+    echo "AWS_PROFILE not set, using default: $AWS_PROFILE"
 fi
 
 "$ROOT_DIR/dev/build-nodejs.sh"
 
 output=$(aws lambda publish-layer-version \
   --layer-name "$LAMBDA_LAYER_PREFIX-coralogix-opentelemetry-nodejs-wrapper-development" \
   --compatible-architectures x86_64 arm64 \
-  --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x \
+  --compatible-runtimes nodejs18.x nodejs20.x nodejs22.x \
   --zip-file fileb://nodejs/packages/layer/build/layer.zip \
   --region eu-west-1 \
-  --profile "$AWS_PROFILE")
+  --profile "$AWS_PROFILE" \
+  --output json)
 versionArn=$(echo "$output" | jq -r .LayerVersionArn)
 echo "$versionArn"