Skip to content

Commit c822dc9

Browse files
juanjuxmabdinur
andauthored
chore: fixes for 1.20 build (#8455)
## Description - Comment-out this experimental extension to try to unblock 1.20 build. - Bump cbuildwheel to 2.16.5 to avoid failures related to windows builds. - Update gitlab benchmarks to use the new micro benchmarking platform ## Checklist - [X] Change(s) are motivated and described in the PR description - [X] Testing strategy is described if automated tests are not included in the PR - [X] Risks are described (performance impact, potential for breakage, maintainability) - [X] Change is maintainable (easy to change, telemetry, documentation) - [X] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed or label `changelog/no-changelog` is set - [X] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)) - [X] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [X] If this PR changes the public interface, I've notified `@DataDog/apm-tees`. - [X] If change touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. ## Reviewer Checklist - [x] Title is accurate - [x] All changes are related to the pull request's stated goal - [x] Description motivates each change - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - [x] Testing strategy adequately addresses listed risks - [x] Change is maintainable (easy to change, telemetry, documentation) - [x] Release note makes sense to a user of the library - [x] Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --------- Signed-off-by: Juanjo Alvarez <[email protected]> Co-authored-by: Munir Abdinur <[email protected]>
1 parent e2fccd4 commit c822dc9

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/build_python_3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
platforms: all
4646

4747
- name: Build wheels python 3.6 and above
48-
uses: pypa/cibuildwheel@v2.14.0
48+
uses: pypa/cibuildwheel@v2.16.5
4949
env:
5050
# configure cibuildwheel to build native archs ('auto'), and some
5151
# emulated ones

.gitlab/benchmarks.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
BASE_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/relenv-microbenchmarking-platform:dd-trace-py
2+
BASE_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-py
33

44
.benchmarks:
55
stage: benchmarks
@@ -12,16 +12,18 @@ variables:
1212
- export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)
1313
- export CMAKE_BUILD_PARALLEL_LEVEL=12
1414
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"
15-
- git clone --branch dd-trace-py https://github.com/DataDog/relenv-microbenchmarking-platform /platform && cd /platform
15+
- git clone --branch dd-trace-py https://github.com/DataDog/benchmarking-platform /platform && cd /platform
1616
- ./steps/capture-hardware-software-info.sh
1717
- ./steps/run-benchmarks.sh
1818
- ./steps/analyze-results.sh
1919
- "./steps/upload-results-to-s3.sh || :"
2020
artifacts:
2121
name: "reports"
22+
when: always
2223
paths:
2324
- reports/
2425
expire_in: 3 months
26+
allow_failure: true # Allow failure, so partial results are uploaded
2527
variables:
2628
UPSTREAM_PROJECT_ID: $CI_PROJECT_ID # The ID of the current project. This ID is unique across all projects on the GitLab instance.
2729
UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME # "dd-trace-py"
@@ -38,7 +40,7 @@ benchmarks-pr-comment:
3840
script:
3941
- export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)
4042
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"
41-
- git clone --branch dd-trace-py https://github.com/DataDog/relenv-microbenchmarking-platform /platform && cd /platform
43+
- git clone --branch dd-trace-py https://github.com/DataDog/benchmarking-platform /platform && cd /platform
4244
- "./steps/post-pr-comment.sh || :"
4345
variables:
4446
UPSTREAM_PROJECT_ID: $CI_PROJECT_ID # The ID of the current project. This ID is unique across all projects on the GitLab instance.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,5 @@ def get_ddup_ext():
667667
annotate=os.getenv("_DD_CYTHON_ANNOTATE") == "1",
668668
)
669669
+ get_exts_for("wrapt")
670-
+ get_exts_for("psutil")
671-
+ get_ddup_ext(),
670+
+ get_exts_for("psutil"),
672671
)

0 commit comments

Comments
 (0)