Fix build lambda layer issue

Author: florentinl

.github/workflows/compute-workflow-parameters.yml

@@ -165,7 +165,7 @@ jobs:
       with:
         name: binaries_dev_${{ inputs.library }}
         path: binaries/
-        include-hidden-files: ${{ inputs.library == 'python' }}
+        include-hidden-files: ${{ inputs.library == 'python' || inputs.library == 'python_lambda' }}
     - name: Set unique ID
       id: unique_id
       run: echo "value=$(openssl rand -hex 8)" >> $GITHUB_OUTPUT

conftest.py

@@ -106,7 +106,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         action="store",
         default="",
         help="Library to test (e.g. 'python', 'ruby')",
-        choices=["cpp", "golang", "dotnet", "java", "nodejs", "php", "python", "ruby"],
+        choices=["cpp", "golang", "dotnet", "java", "nodejs", "php", "python", "ruby", "python_lambda"],
     )
 
     # report data to feature parity dashboard

utils/build/docker/python_lambda/build_lambda_layer.sh

@@ -21,8 +21,6 @@ SKIP_BUILD=0
 for var in $(compgen -v SYSTEM_TESTS_AWS_); do
     export "${var/SYSTEM_TESTS_AWS_/AWS_}"
 done
-echo "Following AWS variables are set:"
-env | grep '^AWS_'
 
 if [ -e "datadog-lambda-python" ]; then
     echo "datadog-lambda-python already exists, skipping clone."
@@ -60,66 +58,41 @@ elif command -v aws >/dev/null 2>&1 && aws sts get-caller-identity >/dev/null 2>
             SKIP_BUILD=1
         else
             echo "Failed to get download URL for layer. Falling back to git clone..."
+            exit 1
         fi
     else
         echo "No layer version found. Falling back to git clone..."
+        exit 1
     fi
 else
     echo "Impossible to download datadog-lambda-python layer from AWS and no local layer provided, Aborting."
     exit 1
 fi
 
-# Patch the ddtrace dependency in datadog-lambda-python based on the same rules as install_ddtrace.sh
 if [[ $SKIP_BUILD -eq 0 ]]; then
-    if [ -e "dd-trace-py" ]; then
-        echo "Install from local folder /binaries/dd-trace-py"
+    if [ -e "datdog-lambda-python/dd-trace-py" ]; then
+        echo "Install from local folder /binaries/datadog-lambda-python/dd-trace-py"
         if [[ "$OSTYPE" == "darwin"* ]]; then
             sed -i '' 's|^ddtrace =.*$|ddtrace = { path = "./dd-trace-py" }|' datadog-lambda-python/pyproject.toml
         else
             sed -i 's|^ddtrace =.*$|ddtrace = { path = "./dd-trace-py" }|' datadog-lambda-python/pyproject.toml
         fi
-        cp -r dd-trace-py datadog-lambda-python/dd-trace-py
-    elif [ "$(find . -maxdepth 1 -name "*.whl" | wc -l)" = "1" ]; then
+    elif [ "$(find . -maxdepth 1 -name "datadog-lambda-python/*.whl" | wc -l)" = "1" ]; then
         path=$(readlink -f "$(find . -maxdepth 1 -name "*.whl")")
         echo "Install ddtrace from ${path}"
         if [[ "$OSTYPE" == "darwin"* ]]; then
             sed -i '' "s|^ddtrace =.*$|ddtrace = { path = \"file://${path}\" }|" datadog-lambda-python/pyproject.toml
         else
             sed -i "s|^ddtrace =.*$|ddtrace = { path = \"file://${path}\" }|" datadog-lambda-python/pyproject.toml
         fi
-        cp -r ./*.whl datadog-lambda-python/
-    elif [ "$(find . -maxdepth 1 -name "python-load-from-pip" | wc -l)" = "1" ]; then
-        echo "Install ddtrace from $(cat python-load-from-pip)"
-
-        pip_spec=$(cat python-load-from-pip)
-        if [[ $pip_spec =~ ddtrace\ @\ git\+(.*)@(.*)$ ]]; then
-            # Format with revision: ddtrace @ git+https://...@revision
-            git_url="${BASH_REMATCH[1]}"
-            git_rev="${BASH_REMATCH[2]}"
-            if [[ "$OSTYPE" == "darwin"* ]]; then
-                sed -i '' "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\", rev = \"${git_rev}\" }|" datadog-lambda-python/pyproject.toml
-            else
-                sed -i "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\", rev = \"${git_rev}\" }|" datadog-lambda-python/pyproject.toml
-            fi
-        elif [[ $pip_spec =~ ddtrace\ @\ git\+(.*)$ ]]; then
-            # Format without revision: ddtrace @ git+https://... (defaults to main)
-            git_url="${BASH_REMATCH[1]}"
-            if [[ "$OSTYPE" == "darwin"* ]]; then
-                sed -i '' "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\" }|" datadog-lambda-python/pyproject.toml
-            else
-                sed -i "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\" }|" datadog-lambda-python/pyproject.toml
-            fi
-        else
-            echo "ERROR: Unable to parse git URL from python-load-from-pip format: $pip_spec"
-            exit 1
-        fi
     elif [ "$(find . -maxdepth 1 -name "*.whl" | wc -l)" = "0" ]; then
         echo "Install ddtrace from pypi"
         # Keep the default ddtrace dependency in pyproject.toml
     else
         echo "ERROR: Found several wheel files in binaries/, abort."
         exit 1
     fi
+
     # Build the datadog-lambda-python package
     cd datadog-lambda-python
     ARCH=$ARCH PYTHON_VERSION=$PYTHON_VERSION bash ./scripts/build_layers.sh

utils/scripts/load-binary.sh

@@ -300,17 +300,18 @@ elif [ "$TARGET" = "python_lambda" ]; then
     assert_version_is_dev
     assert_target_branch_is_not_set
 
-    rm -rf dd-trace-py/
     rm -rf datadog-lambda-python/
+
+    git clone https://github.com/DataDog/datadog-lambda-python.git
+    cd datadog-lambda-python
+    echo "Checking out the datadog_lambda ref"
+    git log -1 --format=%H
+
     # do not use `--depth 1`, setuptools_scm, does not like it
     git clone https://github.com/DataDog/dd-trace-py.git
-    git clone https://github.com/DataDog/datadog-lambda-python.git
     cd dd-trace-py
     echo "Checking out the ddtrace ref"
     git log -1 --format=%H
-    cd ../datadog-lambda-python
-    echo "Checking out the datadog_lambda ref"
-    git log -1 --format=%H
 
 else
     echo "Unknown target: $1"