Merge branch 'christophe-papazian/django_endpoint_discovery_improvements' of github.com:DataDog/dd-trace-py into christophe-papazian/django_endpoint_discovery_improvements

Author: christophe-papazian

.github/workflows/build_python_3.yml

@@ -69,20 +69,16 @@ jobs:
       # See: https://stackoverflow.com/a/65402241
       CIBW_ENVIRONMENT_MACOS: CMAKE_BUILD_PARALLEL_LEVEL=24 SYSTEM_VERSION_COMPAT=0 CMAKE_ARGS="-DNATIVE_TESTING=OFF"
       CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
+        python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
         mkdir ./tempwheelhouse &&
         unzip -l {wheel} | grep '\.so' &&
         auditwheel repair -w ./tempwheelhouse {wheel} &&
-        for w in ./tempwheelhouse/*.whl; do
-          python scripts/zip_filter.py $w \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md
-          mv $w {dest_dir}
-        done &&
+        mv ./tempwheelhouse/*.whl {dest_dir} &&
         rm -rf ./tempwheelhouse
       CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
-        zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
+        python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
         MACOSX_DEPLOYMENT_TARGET=12.7 delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
-      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: choco install -y 7zip &&
-        7z d -r "{wheel}" *.c *.cpp *.cc *.h *.hpp *.pyx *.md &&
-        move "{wheel}" "{dest_dir}"
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python scripts/zip_filter.py "{wheel}" "*.c" "*.cpp" "*.cc" "*.h" "*.hpp" "*.pyx" "*.md" && mv "{wheel}" "{dest_dir}"
       CIBW_TEST_COMMAND: "python {project}/tests/smoke_test.py"
 
     steps:
@@ -107,6 +103,16 @@ jobs:
         with:
           only: ${{ matrix.only }}
 
+      - name: Validate wheel RECORD files
+        shell: bash
+        run: |
+          for wheel in ./wheelhouse/*.whl; do
+            if [ -f "$wheel" ]; then
+              echo "Validating $(basename $wheel)..."
+              python scripts/validate_wheel.py "$wheel"
+            fi
+          done
+
       - if: runner.os != 'Windows'
         run: |
           echo "ARTIFACT_NAME=${{ matrix.only }}" >> $GITHUB_ENV

.gitlab/benchmarks/steps/detect-baseline.sh

@@ -27,7 +27,7 @@ elif [[ "${UPSTREAM_BRANCH}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
   BASELINE_BRANCH=$(echo "${UPSTREAM_BRANCH:1}" | cut -d. -f1-2)
 
   # Check if a release branch exists or not
-  if git ls-remote --exit-code --heads origin "${BASELINE_BRANCH}" > /dev/null; then
+  if git ls-remote --exit-code --heads origin "refs/heads/${BASELINE_BRANCH}" > /dev/null; then
     echo "Found remote branch origin/${BASELINE_BRANCH}"
   else
     echo "Remote branch origin/${BASELINE_BRANCH} not found. Falling back to main."

.gitlab/download-wheels-from-gh-actions.sh

@@ -1,12 +1,29 @@
 #!/bin/bash
 set -eo pipefail
 
+get_run_id() {
+    RUN_ID=$(
+        gh run ls \
+        --repo DataDog/dd-trace-py \
+        --commit="$CI_COMMIT_SHA" \
+        $([ -z "$TRIGGERING_EVENT" ] && echo "" || echo "--event=$TRIGGERING_EVENT") \
+        --workflow=build_deploy.yml \
+        --json databaseId \
+        --jq "first (.[]) | .databaseId"
+    )
+}
+
 if [ -z "$CI_COMMIT_SHA" ]; then
   echo "Error: CI_COMMIT_SHA was not provided"
   exit 1
 fi
 
-RUN_ID=$(gh run ls --repo DataDog/dd-trace-py --commit=$CI_COMMIT_SHA --workflow=build_deploy.yml --json databaseId --jq "first (.[]) | .databaseId")
+if [ -v "$CI_COMMIT_TAG" ]; then
+    TRIGGERING_EVENT="release"
+fi
+
+get_run_id
+
 if [ -z "$RUN_ID" ]; then
   echo "No RUN_ID found waiting for job to start"
   # The job has not started yet. Give it time to start
@@ -19,7 +36,7 @@ if [ -z "$RUN_ID" ]; then
   end_time=$((start_time + timeout))
   # Loop for 10 minutes waiting for run to appear in github
   while [ $(date +%s) -lt $end_time ]; do
-    RUN_ID=$(gh run ls --repo DataDog/dd-trace-py --commit=$CI_COMMIT_SHA --workflow=build_deploy.yml --json databaseId --jq "first (.[]) | .databaseId")
+    get_run_id
     if [ -n "$RUN_ID" ]; then
       break;
     fi