Add support for cflinuxfs4 stack

.gitignore

@@ -4,6 +4,7 @@
 lib/dogstatsd
 lib/agent
 lib/trace-agent
+lib/ruby_3.0.5.tgz
 venv
 tmp
 .DS_Store

LICENSE-3rdparty.csv

@@ -1 +1,2 @@
 Component,Origin,License,Copyright
+lib,ruby,BSD-2-Clause,Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.

bin/compile

@@ -1,21 +1,45 @@
 #!/usr/bin/env bash
 
-echo "-----> DatadogBuildpack/compile"
-
 
 BIN_DIR=$(cd $(dirname $0); pwd)
 ROOT_DIR=$(dirname ${BIN_DIR})
 BUILD_DIR=$1
 CACHE_DIR=$2
-ENV_DIR=$3
+DEPS_DIR=$3
+DEPS_IDX=$4
 DATADOG_DIR="${BUILD_DIR}/.datadog"
+BUILDPACK_VERSION="$(cat "${ROOT_DIR}/VERSION")"
+
+echo "-----> DatadogBuildpack/$(basename $0) version $BUILDPACK_VERSION"
 
 mkdir -p "${DATADOG_DIR}/scripts"
 cp "${ROOT_DIR}/lib/scripts/update_agent_config.sh" "${DATADOG_DIR}/scripts/update_agent_config.sh"
 chmod +x "${DATADOG_DIR}/scripts/update_agent_config.sh"
 cp "${ROOT_DIR}/lib/scripts/get_tags.rb" "${DATADOG_DIR}/scripts/get_tags.rb"
 
 
+RUBY_CMD=ruby
+
+# install ruby if needed (the case of cflinuxfs4 or custom stacks)
+if ! which ruby > /dev/null; then
+  echo "Installing Ruby"
+  tar -xzf "${ROOT_DIR}/lib/ruby_3.0.5.tgz" -C "$DEPS_DIR/$DEPS_IDX" && echo "Ruby Install finished"
+  export PATH=$PATH:/home/vcap/deps/$DEPS_IDX/bin
+  RUBY_CMD=$DEPS_DIR/$DEPS_IDX/bin/ruby
+fi
+
+# create a .global_env file to be sourced by external scripts
+# for now, it appends the buildpack deps/bin folder to the PATH env variable of the caller
+# this is needed for stacks where ruby is not installed since our scripts rely on it
+echo "if ! which ruby > /dev/null; then
+  export PATH=\$PATH:/home/vcap/deps/$DEPS_IDX/bin
+fi" > "$DATADOG_DIR/.global_env"
+
+# for subsquent buildpacks and for buildpack metadata detection
+echo "config: {}
+name: datadog
+version: ${BUILDPACK_VERSION}" > "$DEPS_DIR/$DEPS_IDX/config.yml"
+
 echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent"
 
 mkdir -p "${BUILD_DIR}/.profile.d"
@@ -37,6 +61,7 @@ cp "${ROOT_DIR}/lib/scripts/update_tags.rb" "${DATADOG_DIR}/scripts/update_tags.
 
 cp "${ROOT_DIR}/lib/scripts/parse_env_vars.rb" "${DATADOG_DIR}/scripts/parse_env_vars.rb"
 cp "${ROOT_DIR}/lib/scripts/nc.rb" "${DATADOG_DIR}/scripts/nc.rb"
+
 cp "${ROOT_DIR}/lib/scripts/utils.sh" "${DATADOG_DIR}/scripts/utils.sh"
 cp "${ROOT_DIR}/lib/scripts/check_datadog.sh" "${DATADOG_DIR}/scripts/check_datadog.sh"
 
@@ -67,8 +92,11 @@ chmod +x "${BUILD_DIR}/.profile.d/01-run-datadog.sh"
 # export DD environment variables
 dd_export_env "${DATADOG_DIR}/.raw_datadog_env"
 
+# for debugging purposes
+echo "ruby version check: $($RUBY_CMD -v)"
+
 # sanitize env vars and export a new a env file
-ruby "${DATADOG_DIR}/scripts/parse_env_vars.rb" "${DATADOG_DIR}/.raw_datadog_env" "${DATADOG_DIR}/.datadog_env"
+$RUBY_CMD "${DATADOG_DIR}/scripts/parse_env_vars.rb" "${DATADOG_DIR}/.raw_datadog_env" "${DATADOG_DIR}/.datadog_env"
 
 # export DD_TAGS for ddtrace
-export DD_TAGS=$(ruby "${DATADOG_DIR}"/scripts/get_tags.rb)
+export DD_TAGS=$($RUBY_CMD "${DATADOG_DIR}"/scripts/get_tags.rb)

bin/supply

@@ -1,21 +1,45 @@
 #!/usr/bin/env bash
 
-echo "-----> DatadogBuildpack/supply"
-
 
 BIN_DIR=$(cd $(dirname $0); pwd)
 ROOT_DIR=$(dirname ${BIN_DIR})
 BUILD_DIR=$1
 CACHE_DIR=$2
-ENV_DIR=$3
+DEPS_DIR=$3
+DEPS_IDX=$4
 DATADOG_DIR="${BUILD_DIR}/.datadog"
+BUILDPACK_VERSION="$(cat "${ROOT_DIR}/VERSION")"
+
+echo "-----> DatadogBuildpack/$(basename $0) version $BUILDPACK_VERSION"
 
 mkdir -p "${DATADOG_DIR}/scripts"
 cp "${ROOT_DIR}/lib/scripts/update_agent_config.sh" "${DATADOG_DIR}/scripts/update_agent_config.sh"
 chmod +x "${DATADOG_DIR}/scripts/update_agent_config.sh"
 cp "${ROOT_DIR}/lib/scripts/get_tags.rb" "${DATADOG_DIR}/scripts/get_tags.rb"
 
 
+RUBY_CMD=ruby
+
+# install ruby if needed (the case of cflinuxfs4 or custom stacks)
+if ! which ruby > /dev/null; then
+  echo "Installing Ruby"
+  tar -xzf "${ROOT_DIR}/lib/ruby_3.0.5.tgz" -C "$DEPS_DIR/$DEPS_IDX" && echo "Ruby Install finished"
+  export PATH=$PATH:/home/vcap/deps/$DEPS_IDX/bin
+  RUBY_CMD=$DEPS_DIR/$DEPS_IDX/bin/ruby
+fi
+
+# create a .global_env file to be sourced by external scripts
+# for now, it appends the buildpack deps/bin folder to the PATH env variable of the caller
+# this is needed for stacks where ruby is not installed since our scripts rely on it
+echo "if ! which ruby > /dev/null; then
+  export PATH=\$PATH:/home/vcap/deps/$DEPS_IDX/bin
+fi" > "$DATADOG_DIR/.global_env"
+
+# for subsquent buildpacks and for buildpack metadata detection
+echo "config: {}
+name: datadog
+version: ${BUILDPACK_VERSION}" > "$DEPS_DIR/$DEPS_IDX/config.yml"
+
 echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent"
 
 mkdir -p "${BUILD_DIR}/.profile.d"
@@ -37,6 +61,7 @@ cp "${ROOT_DIR}/lib/scripts/update_tags.rb" "${DATADOG_DIR}/scripts/update_tags.
 
 cp "${ROOT_DIR}/lib/scripts/parse_env_vars.rb" "${DATADOG_DIR}/scripts/parse_env_vars.rb"
 cp "${ROOT_DIR}/lib/scripts/nc.rb" "${DATADOG_DIR}/scripts/nc.rb"
+
 cp "${ROOT_DIR}/lib/scripts/utils.sh" "${DATADOG_DIR}/scripts/utils.sh"
 cp "${ROOT_DIR}/lib/scripts/check_datadog.sh" "${DATADOG_DIR}/scripts/check_datadog.sh"
 
@@ -67,8 +92,11 @@ chmod +x "${BUILD_DIR}/.profile.d/01-run-datadog.sh"
 # export DD environment variables
 dd_export_env "${DATADOG_DIR}/.raw_datadog_env"
 
+# for debugging purposes
+echo "ruby version check: $($RUBY_CMD -v)"
+
 # sanitize env vars and export a new a env file
-ruby "${DATADOG_DIR}/scripts/parse_env_vars.rb" "${DATADOG_DIR}/.raw_datadog_env" "${DATADOG_DIR}/.datadog_env"
+$RUBY_CMD "${DATADOG_DIR}/scripts/parse_env_vars.rb" "${DATADOG_DIR}/.raw_datadog_env" "${DATADOG_DIR}/.datadog_env"
 
 # export DD_TAGS for ddtrace
-export DD_TAGS=$(ruby "${DATADOG_DIR}"/scripts/get_tags.rb)
+export DD_TAGS=$($RUBY_CMD "${DATADOG_DIR}"/scripts/get_tags.rb)

lib/redirect-logs.sh

@@ -11,6 +11,9 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}"
 
 source "${DATADOG_DIR}/scripts/utils.sh"
 
+# source updated PATH
+. "$DATADOG_DIR/.global_env"
+
 DD_EU_API_SITE="https://api.datadoghq.eu/api/"
 DD_US_API_SITE="https://api.datadoghq.com/api/"
 DD_API_SITE=${DD_US_API_SITE}

lib/run-datadog.sh

@@ -9,12 +9,16 @@ SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}"
 DD_ENABLE_CAPI_METADATA_COLLECTION="${DD_ENABLE_CAPI_METADATA_COLLECTION:-false}"
 LOCKFILE="${DATADOG_DIR}/lock"
 FIRST_RUN="${FIRST_RUN:-true}"
+USER_TAGS="${DD_TAGS}"
+
+. "${DATADOG_DIR}/scripts/utils.sh"
+
+# source updated PATH
+. "$DATADOG_DIR/.global_env"
 
 export DD_TAGS=$(ruby "${DATADOG_DIR}/scripts/get_tags.rb")
 echo "${DD_TAGS}" > "${DATADOG_DIR}/.dd_tags.txt"
 
-source "${DATADOG_DIR}/scripts/utils.sh"
-
 setup_datadog() {
   pushd "${DATADOG_DIR}"
 
@@ -231,7 +235,7 @@ main() {
       exec 9>&-
     fi
   fi
-  
+
   # wait for the trace agent startup
   if [ "${DD_WAIT_TRACE_AGENT}" = "true" ]; then
     timeout=120

lib/scripts/create_logs_config.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2022-Present Datadog, Inc.

lib/scripts/get_tags.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2017-Present Datadog, Inc.

lib/scripts/parse_env_vars.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2022-Present Datadog, Inc.

lib/scripts/update_agent_config.sh

@@ -7,6 +7,9 @@
 DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}"
 LOCK="${DATADOG_DIR}/update_agent_config.lock"
 
+# source updated PATH
+. "$DATADOG_DIR/.global_env"
+
 # import utils function such as log_message
 release_lock() {
     log_info "releasing lock '${LOCK}'"
@@ -15,7 +18,7 @@ release_lock() {
 
 write_tags_to_file() {
     export DD_TAGS=$(ruby "${DATADOG_DIR}"/scripts/get_tags.rb)
-    
+
     export LOGS_CONFIG_DIR="${DATADOG_DIR}/dist/conf.d/logs.d"
     export LOGS_CONFIG
 
@@ -60,7 +63,7 @@ main() {
     done
 
     log_info "acquired lock '${LOCK}'"
-   
+
     # ensures the lock is released on exit
     trap release_lock INT TERM EXIT
 
@@ -72,10 +75,10 @@ main() {
         sleep 2
     done
 
-    timeout 300s "${DATADOG_DIR}/scripts/check_datadog.sh" 
+    timeout 300s "${DATADOG_DIR}/scripts/check_datadog.sh"
     exit_code=$?
-    
-    # verify that check_datadog exited successfully 
+
+    # verify that check_datadog exited successfully
     if [ ${exit_code} -ne  0 ]; then
         log_error "could not find agent, aborting update script!"
         exit ${exit_code}

lib/scripts/update_tags.rb

@@ -1,8 +1,8 @@
+#!/usr/bin/env ruby
 # Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2022-Present Datadog, Inc.
 
-#!/usr/bin/env ruby
 
 DATADOG_DIR = ENV.fetch("DATADOG_DIR", "/home/vcap/app/.datadog")
 DD_UPDATE_SCRIPT_WARMUP = ENV.fetch("DD_UPDATE_SCRIPT_WARMUP", "180")

lib/scripts/utils.sh

@@ -53,6 +53,9 @@ dd_export_env() {
   if [ -n "${TAGS}" ]; then
     echo "export TAGS='${TAGS}'" >> "${env_file}"
   fi
+  if [ -n "${PATH}" ]; then
+    echo "export PATH='${PATH}'" >> "${env_file}"
+  fi
   if [ -n "${DD_UPDATE_SCRIPT_WARMUP}" ]; then
     echo "export DD_UPDATE_SCRIPT_WARMUP='${DD_UPDATE_SCRIPT_WARMUP}'" >> "${env_file}"
   fi

lib/test-endpoint.sh

@@ -4,6 +4,11 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2017-Present Datadog, Inc.
 
+DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}"
+
+# source updated PATH
+. "$DATADOG_DIR/.global_env"
+
 unset DD_LOGS_VALID_ENDPOINT
 DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}"
 DD_EU_API_SITE="https://api.datadoghq.eu/api/"

scripts/prepare.sh

@@ -50,6 +50,10 @@ function download_dogstatsd() {
   cp ${TMPDIR}/opt/datadog-dogstatsd/bin/dogstatsd ${SRCDIR}/lib/dogstatsd
 }
 
+function download_ruby() {
+  curl -LS "https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.0.5_linux_x64_cflinuxfs3_098393c3.tgz" -o  ${SRCDIR}/lib/ruby_3.0.5.tgz
+}
+
 function cleanup() {
   rm -rf ${TMPDIR}
 }
@@ -70,6 +74,7 @@ function main() {
     rm -f ${SRCDIR}/lib/agent
     rm -f ${SRCDIR}/lib/dogstatsd
     rm -f ${SRCDIR}/lib/trace-agent
+    rm -f ${SRCDIR}/lib/ruby_3.0.5.tgz
 
     # Download the new ones
     download_trace_agent ${VERSION}
@@ -80,6 +85,8 @@ function main() {
 
     download_dogstatsd ${VERSION}
     chmod +x ${SRCDIR}/lib/dogstatsd
+
+    download_ruby
   fi
 }