Add lambda-proxy to build image job

Author: florentinl

.github/workflows/ci.yml

@@ -91,6 +91,7 @@ jobs:
       build_python_base_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-python-base-images') }}
       build_buddies_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-buddies-images') }}
       build_proxy_image: ${{ contains(github.event.pull_request.labels.*.name, 'build-proxy-image') }}
+      build_lambda_proxy_image: ${{ contains(github.event.pull_request.labels.*.name, 'build-lambda-proxy-image') }}
       build_lib_injection_app_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-lib-injection-app-images') }}
       parametric_job_count: ${{ matrix.version == 'dev' && 2 || 1 }}  # test both use cases
       skip_empty_scenarios: true

.github/workflows/run-end-to-end.yml

@@ -49,6 +49,11 @@ on:
         default: false
         required: false
         type: boolean
+      build_lambda_proxy_image:
+        description: "Shall we build lambda proxy image"
+        default: false
+        required: false
+        type: boolean
       push_to_feature_parity_dashbaord:
         description: "Shall we push results to Feature Parity Dashbaord"
         default: false
@@ -104,6 +109,9 @@ jobs:
     - name: Build proxy image
       if: inputs.build_proxy_image
       run: ./build.sh -i proxy
+    - name: Build lambda proxy image
+      if: inputs.build_lambda_proxy_image
+      run: ./build.sh -i lambda-proxy
     - name: Pull images
       uses: ./.github/actions/pull_images
       with:

.github/workflows/system-tests.yml

@@ -54,6 +54,11 @@ on:
         default: false
         required: false
         type: boolean
+      build_lambda_proxy_image:
+        description: "Shall we build lambda proxy image"
+        default: false
+        required: false
+        type: boolean
       build_lib_injection_app_images:
         description: "Shall we build and push k8s lib injection weblog images"
         default: false
@@ -204,6 +209,7 @@ jobs:
       scenarios: ${{ toJson(matrix.job.scenarios) }}
       build_buddies_images: ${{ inputs.build_buddies_images }}
       build_proxy_image: ${{ inputs.build_proxy_image }}
+      build_lambda_proxy_image: ${{ inputs.build_lambda_proxy_image }}
       binaries_artifact: binaries_${{ needs.compute_parameters.outputs.ci_environment }}_${{ inputs.library }}_${{ matrix.job.weblog }}_${{ needs.compute_parameters.outputs.unique_id }}
       ci_environment: ${{ needs.compute_parameters.outputs.ci_environment }}
       skip_empty_scenarios: ${{ inputs.skip_empty_scenarios }}

utils/build/docker/python/build_lambda_layer.sh

@@ -29,12 +29,20 @@ fi
 if [[ $SKIP_BUILD -eq 0 ]]; then
     if [ -e "dd-trace-py" ]; then
         echo "Install from local folder /binaries/dd-trace-py"
-        sed -i '' 's|^ddtrace =.*$|ddtrace = { path = "./dd-trace-py" }|' datadog-lambda-python/pyproject.toml
+        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
         path=$(readlink -f "$(find . -maxdepth 1 -name "*.whl")")
         echo "Install ddtrace from ${path}"
-        sed -i '' "s|^ddtrace =.*$|ddtrace = { path = \"file://${path}\" }|" datadog-lambda-python/pyproject.toml
+        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)"
@@ -44,11 +52,19 @@ if [[ $SKIP_BUILD -eq 0 ]]; then
             # Format with revision: ddtrace @ git+https://...@revision
             git_url="${BASH_REMATCH[1]}"
             git_rev="${BASH_REMATCH[2]}"
-            sed -i '' "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\", rev = \"${git_rev}\" }|" datadog-lambda-python/pyproject.toml
+            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]}"
-            sed -i '' "s|^ddtrace =.*$|ddtrace = { git = \"${git_url}\" }|" datadog-lambda-python/pyproject.toml
+            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