Nodejs slim layers (#384)

* publish slim layers

Author: chaudharysaket

libBuild.sh

@@ -207,12 +207,48 @@ function hash_file() {
     fi
 }
 
+function publish_public_layer {
+  layer_name=$1
+  bucket_name=$2
+  s3_key=$3
+  description=$4
+  arch_flag=$5
+  region=$6
+  runtime_name=$7
+  compat_list=("${@:8}")
+
+
+  layer_version=$(aws lambda publish-layer-version \
+    --layer-name ${layer_name} \
+    --content "S3Bucket=${bucket_name},S3Key=${s3_key}" \
+    --description "${description}"\
+    --license-info "Apache-2.0" $arch_flag \
+    --compatible-runtimes ${compat_list[*]} \
+    --region "$region" \
+    --output text \
+    --query Version)
+  echo "Published ${runtime_name} layer version ${layer_version} to ${region}"
+
+  echo "Setting public permissions for ${runtime_name} layer version ${layer_version} in ${region}"
+  aws lambda add-layer-version-permission \
+    --layer-name ${layer_name} \
+    --version-number "$layer_version" \
+    --statement-id public \
+    --action lambda:GetLayerVersion \
+    --principal "*" \
+    --region "$region"
+  echo "Public permissions set for ${runtime_name} layer version ${layer_version} in region ${region}"
+
+}
+
+
 function publish_layer {
     layer_archive=$1
     region=$2
     runtime_name=$3
     arch=$4
     newrelic_agent_version=${5:-"none"}
+    slim=${6:-""}
     agent_name=$( agent_name_str $runtime_name )
     layer_name=$( layer_name_str $runtime_name $arch )
 
@@ -256,26 +292,13 @@ function publish_layer {
     fi
 
     echo "Publishing ${runtime_name} layer to ${region}"
-    layer_version=$(aws lambda publish-layer-version \
-      --layer-name ${layer_name} \
-      --content "S3Bucket=${bucket_name},S3Key=${s3_key}" \
-      --description "${description}"\
-      --license-info "Apache-2.0" $arch_flag \
-      --compatible-runtimes ${compat_list[*]} \
-      --region "$region" \
-      --output text \
-      --query Version)
-    echo "Published ${runtime_name} layer version ${layer_version} to ${region}"
-
-    echo "Setting public permissions for ${runtime_name} layer version ${layer_version} in ${region}"
-    aws lambda add-layer-version-permission \
-      --layer-name ${layer_name} \
-      --version-number "$layer_version" \
-      --statement-id public \
-      --action lambda:GetLayerVersion \
-      --principal "*" \
-      --region "$region"
-    echo "Public permissions set for ${runtime_name} layer version ${layer_version} in region ${region}"
+    if [[ $slim == "slim" ]]; then
+        echo "Publishing ${runtime_name} slim layer to ${region}"
+        layer_name="${layer_name}-slim"
+        base_description="New Relic slim Layer without opentelemetry for ${runtime_name} (${arch})"
+        description="${base_description}${extension_info}${agent_info}"
+    fi
+    publish_public_layer $layer_name $bucket_name $s3_key "$description" "$arch_flag" "$region" "$runtime_name" "${compat_list[@]}"
 
 }
 

nodejs/publish-layers.sh

@@ -23,11 +23,19 @@ EOM
 function build_wrapper {
   node_version=$1
   arch=$2
+  slim=${3:-""}
   echo "Building new relic layer for nodejs${node_version}.x (${arch})"
   ZIP=$DIST_DIR/nodejs${node_version}x.${arch}.zip
+  if [ "$slim" == "slim" ]; then
+    ZIP=$DIST_DIR/nodejs${node_version}x.${arch}.slim.zip
+  fi
   rm -rf $BUILD_DIR $ZIP
   mkdir -p $DIST_DIR
-  npm install --prefix $BUILD_DIR newrelic@latest
+  npm install --install-strategy=nested --prefix $BUILD_DIR newrelic@latest
+  if [ "$slim" == "slim" ]; then
+    echo "Slim build, removing opentelemetry dependencies"
+    rm -rf $BUILD_DIR/node_modules/newrelic/node_modules/@opentelemetry
+  fi
   NEWRELIC_AGENT_VERSION=$(npm list newrelic --prefix $BUILD_DIR | grep newrelic@ | awk -F '@' '{print $2}')
   touch $DIST_DIR/nr-env
   echo "NEWRELIC_AGENT_VERSION=$NEWRELIC_AGENT_VERSION" > $DIST_DIR/nr-env
@@ -46,40 +54,53 @@ function build_wrapper {
 function publish_wrapper {
   node_version=$1
   arch=$2
+  slim=${3:-""}
   ZIP=$DIST_DIR/nodejs${node_version}x.${arch}.zip
+  if [ "$slim" == "slim" ]; then
+    echo "Publishing slim build for nodejs${node_version}.x (${arch})"
+    ZIP=$DIST_DIR/nodejs${node_version}x.${arch}.slim.zip
+  fi
   source $DIST_DIR/nr-env
   if [ ! -f $ZIP ]; then
     echo "Package not found: ${ZIP}"
     exit 1
   fi
 
   for region in "${REGIONS[@]}"; do
-    publish_layer $ZIP $region nodejs${node_version}.x ${arch} $NEWRELIC_AGENT_VERSION
+    publish_layer $ZIP $region nodejs${node_version}.x ${arch} $NEWRELIC_AGENT_VERSION $slim
   done
 }
 
 case "$1" in
 "build_wrapper")
-  build_wrapper $2 $3
+  build_wrapper $2 $3 $4
   ;;
 "publish_wrapper")
   publish_wrapper $2 $3
   ;;
 "build-20")
   build_wrapper 20 arm64 
   build_wrapper 20 x86_64 
+  build_wrapper 20 arm64 slim
+  build_wrapper 20 x86_64 slim
 	;;
 "publish-20")
   publish_wrapper 20 arm64
   publish_wrapper 20 x86_64 
+  publish_wrapper 20 arm64 slim
+  publish_wrapper 20 x86_64 slim
 	;;
 "build-22")
   build_wrapper 22 arm64 
   build_wrapper 22 x86_64 
+  build_wrapper 22 arm64 slim
+  build_wrapper 22 x86_64 slim
 	;;
 "publish-22")
   publish_wrapper 22 arm64
   publish_wrapper 22 x86_64 
+  publish_wrapper 22 arm64 slim
+  publish_wrapper 22 x86_64 slim
 	;;
 "build-publish-20-ecr-image")
   build_wrapper 20 arm64