-
Notifications
You must be signed in to change notification settings - Fork 469
fix: guard against potential pkg_resources race [backport 3.12] #14502
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
|
Bootstrap import analysisComparison of import times between this PR and base. SummaryThe average import time from this PR is: 279 ± 3 ms. The average import time from base is: 287 ± 4 ms. The import time difference between this PR and base is: -8.2 ± 0.2 ms. Import time breakdownThe following import paths have shrunk:
|
Performance SLOsComparing candidate backport-14456-to-3.12 (e32431a) with baseline 3.12 (6e4b335) 📈 Performance Regressions (2 suites)📈 iastaspects - 118/118✅ add_aspectTime: ✅ 0.329µs (SLO: <10.000µs 📉 -96.7%) vs baseline: ~same Memory: ✅ 36.805MB (SLO: <39.000MB -5.6%) vs baseline: +3.7% ✅ add_inplace_aspectTime: ✅ 0.331µs (SLO: <10.000µs 📉 -96.7%) vs baseline: +0.3% Memory: ✅ 37.139MB (SLO: <39.000MB -4.8%) vs baseline: +4.5% ✅ add_inplace_noaspectTime: ✅ 0.314µs (SLO: <10.000µs 📉 -96.9%) vs baseline: -0.5% Memory: ✅ 36.844MB (SLO: <39.000MB -5.5%) vs baseline: +4.0% ✅ add_noaspectTime: ✅ 0.279µs (SLO: <10.000µs 📉 -97.2%) vs baseline: +1.1% Memory: ✅ 36.943MB (SLO: <39.000MB -5.3%) vs baseline: +4.3% ✅ bytearray_aspectTime: ✅ 1.870µs (SLO: <10.000µs 📉 -81.3%) vs baseline: +0.6% Memory: ✅ 37.061MB (SLO: <39.000MB -5.0%) vs baseline: +4.5% ✅ bytearray_extend_aspectTime: ✅ 1.390µs (SLO: <10.000µs 📉 -86.1%) vs baseline: +1.5% Memory: ✅ 37.100MB (SLO: <39.000MB -4.9%) vs baseline: +4.4% ✅ bytearray_extend_noaspectTime: ✅ 0.617µs (SLO: <10.000µs 📉 -93.8%) vs baseline: +0.6% Memory: ✅ 37.179MB (SLO: <39.000MB -4.7%) vs baseline: +4.7% ✅ bytearray_noaspectTime: ✅ 0.480µs (SLO: <10.000µs 📉 -95.2%) vs baseline: -0.3% Memory: ✅ 36.825MB (SLO: <39.000MB -5.6%) vs baseline: +4.2% ✅ bytes_aspectTime: ✅ 1.859µs (SLO: <10.000µs 📉 -81.4%) vs baseline: -0.3% Memory: ✅ 36.746MB (SLO: <39.000MB -5.8%) vs baseline: +3.5% ✅ bytes_noaspectTime: ✅ 0.490µs (SLO: <10.000µs 📉 -95.1%) vs baseline: -1.0% Memory: ✅ 37.041MB (SLO: <39.000MB -5.0%) vs baseline: +4.5% ✅ bytesio_aspectTime: ✅ 1.910µs (SLO: <10.000µs 📉 -80.9%) vs baseline: +0.6% Memory: ✅ 37.139MB (SLO: <39.000MB -4.8%) vs baseline: +4.6% ✅ bytesio_noaspectTime: ✅ 0.498µs (SLO: <10.000µs 📉 -95.0%) vs baseline: +0.5% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.5% ✅ capitalize_aspectTime: ✅ 0.737µs (SLO: <10.000µs 📉 -92.6%) vs baseline: ~same Memory: ✅ 37.198MB (SLO: <39.000MB -4.6%) vs baseline: +5.0% ✅ capitalize_noaspectTime: ✅ 0.434µs (SLO: <10.000µs 📉 -95.7%) vs baseline: +1.0% Memory: ✅ 36.903MB (SLO: <39.000MB -5.4%) vs baseline: +4.2% ✅ casefold_aspectTime: ✅ 0.735µs (SLO: <10.000µs 📉 -92.7%) vs baseline: -0.3% Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.4% ✅ casefold_noaspectTime: ✅ 0.371µs (SLO: <10.000µs 📉 -96.3%) vs baseline: +1.0% Memory: ✅ 37.179MB (SLO: <39.000MB -4.7%) vs baseline: +5.1% ✅ decode_aspectTime: ✅ 0.725µs (SLO: <10.000µs 📉 -92.8%) vs baseline: +0.5% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.4% ✅ decode_noaspectTime: ✅ 0.417µs (SLO: <10.000µs 📉 -95.8%) vs baseline: -2.9% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.4% ✅ encode_aspectTime: ✅ 0.711µs (SLO: <10.000µs 📉 -92.9%) vs baseline: +0.3% Memory: ✅ 37.139MB (SLO: <39.000MB -4.8%) vs baseline: +4.5% ✅ encode_noaspectTime: ✅ 0.405µs (SLO: <10.000µs 📉 -96.0%) vs baseline: +0.8% Memory: ✅ 37.120MB (SLO: <39.000MB -4.8%) vs baseline: +4.8% ✅ format_aspectTime: ✅ 3.574µs (SLO: <10.000µs 📉 -64.3%) vs baseline: +2.8% Memory: ✅ 36.746MB (SLO: <39.000MB -5.8%) vs baseline: +3.6% ✅ format_map_aspectTime: ✅ 3.940µs (SLO: <10.000µs 📉 -60.6%) vs baseline: 📈 +20.0% Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.1% ✅ format_map_noaspectTime: ✅ 0.783µs (SLO: <10.000µs 📉 -92.2%) vs baseline: +1.3% Memory: ✅ 36.864MB (SLO: <39.000MB -5.5%) vs baseline: +4.0% ✅ format_noaspectTime: ✅ 0.593µs (SLO: <10.000µs 📉 -94.1%) vs baseline: +0.3% Memory: ✅ 37.120MB (SLO: <39.000MB -4.8%) vs baseline: +4.7% ✅ index_aspectTime: ✅ 0.341µs (SLO: <10.000µs 📉 -96.6%) vs baseline: +0.5% Memory: ✅ 36.707MB (SLO: <39.000MB -5.9%) vs baseline: +3.6% ✅ index_noaspectTime: ✅ 0.276µs (SLO: <10.000µs 📉 -97.2%) vs baseline: -0.5% Memory: ✅ 37.179MB (SLO: <39.000MB -4.7%) vs baseline: +4.8% ✅ join_aspectTime: ✅ 1.236µs (SLO: <10.000µs 📉 -87.6%) vs baseline: -0.1% Memory: ✅ 36.746MB (SLO: <39.000MB -5.8%) vs baseline: +3.5% ✅ join_noaspectTime: ✅ 0.488µs (SLO: <10.000µs 📉 -95.1%) vs baseline: -0.8% Memory: ✅ 37.002MB (SLO: <39.000MB -5.1%) vs baseline: +4.1% ✅ ljust_aspectTime: ✅ 10.255µs (SLO: <20.000µs 📉 -48.7%) vs baseline: +0.6% Memory: ✅ 36.884MB (SLO: <39.000MB -5.4%) vs baseline: +3.6% ✅ ljust_noaspectTime: ✅ 0.403µs (SLO: <10.000µs 📉 -96.0%) vs baseline: -1.0% Memory: ✅ 37.061MB (SLO: <39.000MB -5.0%) vs baseline: +4.5% ✅ lower_aspectTime: ✅ 2.238µs (SLO: <10.000µs 📉 -77.6%) vs baseline: +0.7% Memory: ✅ 36.864MB (SLO: <39.000MB -5.5%) vs baseline: +3.9% ✅ lower_noaspectTime: ✅ 0.370µs (SLO: <10.000µs 📉 -96.3%) vs baseline: +0.7% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.6% ✅ lstrip_aspectTime: ✅ 11.102µs (SLO: <20.000µs 📉 -44.5%) vs baseline: +7.7% Memory: ✅ 36.903MB (SLO: <39.000MB -5.4%) vs baseline: +3.6% ✅ lstrip_noaspectTime: ✅ 0.382µs (SLO: <10.000µs 📉 -96.2%) vs baseline: +0.1% Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.2% ✅ modulo_aspectTime: ✅ 0.582µs (SLO: <10.000µs 📉 -94.2%) vs baseline: ~same Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.0% ✅ modulo_aspect_for_bytearray_bytearrayTime: ✅ 1.276µs (SLO: <10.000µs 📉 -87.2%) vs baseline: +1.8% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.4% ✅ modulo_aspect_for_bytesTime: ✅ 0.752µs (SLO: <10.000µs 📉 -92.5%) vs baseline: -0.8% Memory: ✅ 37.139MB (SLO: <39.000MB -4.8%) vs baseline: +4.7% ✅ modulo_aspect_for_bytes_bytearrayTime: ✅ 0.973µs (SLO: <10.000µs 📉 -90.3%) vs baseline: +1.1% Memory: ✅ 37.277MB (SLO: <39.000MB -4.4%) vs baseline: +5.0% ✅ modulo_noaspectTime: ✅ 0.621µs (SLO: <10.000µs 📉 -93.8%) vs baseline: -0.5% Memory: ✅ 37.100MB (SLO: <39.000MB -4.9%) vs baseline: +4.7% ✅ replace_aspectTime: ✅ 4.721µs (SLO: <10.000µs 📉 -52.8%) vs baseline: +0.9% Memory: ✅ 37.257MB (SLO: <39.000MB -4.5%) vs baseline: +4.9% ✅ replace_noaspectTime: ✅ 0.462µs (SLO: <10.000µs 📉 -95.4%) vs baseline: +0.6% Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.2% ✅ repr_aspectTime: ✅ 0.916µs (SLO: <10.000µs 📉 -90.8%) vs baseline: +0.8% Memory: ✅ 36.766MB (SLO: <39.000MB -5.7%) vs baseline: +3.8% ✅ repr_noaspectTime: ✅ 0.427µs (SLO: <10.000µs 📉 -95.7%) vs baseline: +3.1% Memory: ✅ 37.021MB (SLO: <39.000MB -5.1%) vs baseline: +4.4% ✅ rstrip_aspectTime: ✅ 10.218µs (SLO: <20.000µs 📉 -48.9%) vs baseline: +0.1% Memory: ✅ 36.923MB (SLO: <39.000MB -5.3%) vs baseline: +3.8% ✅ rstrip_noaspectTime: ✅ 0.376µs (SLO: <10.000µs 📉 -96.2%) vs baseline: -0.7% Memory: ✅ 37.120MB (SLO: <39.000MB -4.8%) vs baseline: +4.8% ✅ slice_aspectTime: ✅ 0.477µs (SLO: <10.000µs 📉 -95.2%) vs baseline: -0.3% Memory: ✅ 36.825MB (SLO: <39.000MB -5.6%) vs baseline: +3.9% ✅ slice_noaspectTime: ✅ 0.444µs (SLO: <10.000µs 📉 -95.6%) vs baseline: -1.4% Memory: ✅ 37.041MB (SLO: <39.000MB -5.0%) vs baseline: +4.6% ✅ stringio_aspectTime: ✅ 2.213µs (SLO: <10.000µs 📉 -77.9%) vs baseline: +0.3% Memory: ✅ 37.139MB (SLO: <39.000MB -4.8%) vs baseline: +4.7% ✅ stringio_noaspectTime: ✅ 0.711µs (SLO: <10.000µs 📉 -92.9%) vs baseline: -0.6% Memory: ✅ 37.159MB (SLO: <39.000MB -4.7%) vs baseline: +4.7% ✅ strip_aspectTime: ✅ 10.281µs (SLO: <20.000µs 📉 -48.6%) vs baseline: -0.4% Memory: ✅ 36.864MB (SLO: <39.000MB -5.5%) vs baseline: +3.6% ✅ strip_noaspectTime: ✅ 0.385µs (SLO: <10.000µs 📉 -96.2%) vs baseline: +1.3% Memory: ✅ 37.061MB (SLO: <39.000MB -5.0%) vs baseline: +4.5% ✅ swapcase_aspectTime: ✅ 2.428µs (SLO: <10.000µs 📉 -75.7%) vs baseline: -1.5% Memory: ✅ 36.982MB (SLO: <39.000MB -5.2%) vs baseline: +4.3% ✅ swapcase_noaspectTime: ✅ 0.536µs (SLO: <10.000µs 📉 -94.6%) vs baseline: +0.4% Memory: ✅ 37.120MB (SLO: <39.000MB -4.8%) vs baseline: +4.5% ✅ title_aspectTime: ✅ 2.377µs (SLO: <10.000µs 📉 -76.2%) vs baseline: -2.3% Memory: ✅ 36.864MB (SLO: <39.000MB -5.5%) vs baseline: +4.0% ✅ title_noaspectTime: ✅ 0.500µs (SLO: <10.000µs 📉 -95.0%) vs baseline: -0.2% Memory: ✅ 37.061MB (SLO: <39.000MB -5.0%) vs baseline: +4.5% ✅ translate_aspectTime: ✅ 3.296µs (SLO: <10.000µs 📉 -67.0%) vs baseline: -1.3% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.6% ✅ translate_noaspectTime: ✅ 1.044µs (SLO: <10.000µs 📉 -89.6%) vs baseline: +0.8% Memory: ✅ 36.825MB (SLO: <39.000MB -5.6%) vs baseline: +3.7% ✅ upper_aspectTime: ✅ 2.254µs (SLO: <10.000µs 📉 -77.5%) vs baseline: +1.7% Memory: ✅ 36.864MB (SLO: <39.000MB -5.5%) vs baseline: +4.0% ✅ upper_noaspectTime: ✅ 0.367µs (SLO: <10.000µs 📉 -96.3%) vs baseline: -1.9% Memory: ✅ 37.080MB (SLO: <39.000MB -4.9%) vs baseline: +4.6% 📈 telemetryaddmetric - 30/30✅ 1-count-metric-1-timesTime: ✅ 3.286µs (SLO: <10.000µs 📉 -67.1%) vs baseline: +3.0% Memory: ✅ 31.300MB (SLO: <34.000MB -7.9%) vs baseline: +5.0% ✅ 1-count-metrics-100-timesTime: ✅ 222.624µs (SLO: <240.000µs -7.2%) vs baseline: +1.4% Memory: ✅ 31.261MB (SLO: <34.000MB -8.1%) vs baseline: +5.1% ✅ 1-distribution-metric-1-timesTime: ✅ 2.979µs (SLO: <10.000µs 📉 -70.2%) vs baseline: +0.5% Memory: ✅ 31.261MB (SLO: <34.000MB -8.1%) vs baseline: +4.8% ✅ 1-distribution-metrics-100-timesTime: ✅ 199.282µs (SLO: <210.000µs -5.1%) vs baseline: +0.8% Memory: ✅ 31.300MB (SLO: <34.000MB -7.9%) vs baseline: +5.1% ✅ 1-gauge-metric-1-timesTime: ✅ 2.134µs (SLO: <10.000µs 📉 -78.7%) vs baseline: +1.7% Memory: ✅ 31.320MB (SLO: <34.000MB -7.9%) vs baseline: +5.2% ✅ 1-gauge-metrics-100-timesTime: ✅ 124.801µs (SLO: <140.000µs 📉 -10.9%) vs baseline: +0.4% Memory: ✅ 31.339MB (SLO: <34.000MB -7.8%) vs baseline: +5.1% ✅ 1-rate-metric-1-timesTime: ✅ 3.338µs (SLO: <10.000µs 📉 -66.6%) vs baseline: +4.6% Memory: ✅ 31.182MB (SLO: <34.000MB -8.3%) vs baseline: +4.4% ✅ 1-rate-metrics-100-timesTime: ✅ 231.569µs (SLO: <240.000µs -3.5%) vs baseline: +5.7% Memory: ✅ 31.320MB (SLO: <34.000MB -7.9%) vs baseline: +5.0% ✅ 100-count-metrics-100-timesTime: ✅ 22.753ms (SLO: <23.000ms 🟡 -1.1%) vs baseline: +2.8% Memory: ✅ 31.320MB (SLO: <34.000MB -7.9%) vs baseline: +5.1% ✅ 100-distribution-metrics-100-timesTime: ✅ 2.080ms (SLO: <2.200ms -5.4%) vs baseline: +1.7% Memory: ✅ 31.182MB (SLO: <34.000MB -8.3%) vs baseline: +4.5% ✅ 100-gauge-metrics-100-timesTime: ✅ 1.294ms (SLO: <1.500ms 📉 -13.7%) vs baseline: +1.4% Memory: ✅ 31.280MB (SLO: <34.000MB -8.0%) vs baseline: +5.2% ✅ 100-rate-metrics-100-timesTime: ✅ 2.286ms (SLO: <2.500ms -8.6%) vs baseline: +1.8% Memory: ✅ 31.261MB (SLO: <34.000MB -8.1%) vs baseline: +4.7% ✅ flush-1-metricTime: ✅ 4.741µs (SLO: <10.000µs 📉 -52.6%) vs baseline: 📈 +12.6% Memory: ✅ 31.300MB (SLO: <34.000MB -7.9%) vs baseline: +4.9% ✅ flush-100-metricsTime: ✅ 184.281µs (SLO: <200.000µs -7.9%) vs baseline: ~same Memory: ✅ 31.241MB (SLO: <34.000MB -8.1%) vs baseline: +4.6% ✅ flush-1000-metricsTime: ✅ 2.242ms (SLO: <2.450ms -8.5%) vs baseline: +0.5% Memory: ✅ 32.440MB (SLO: <34.500MB -6.0%) vs baseline: +4.8% 🟡 Near SLO Breach (2 suites)🟡 flasksimple - 15/15✅ appsec-getTime: ✅ 4.618ms (SLO: <4.750ms -2.8%) vs baseline: -0.1% Memory: ✅ 61.774MB (SLO: <64.500MB -4.2%) vs baseline: +4.8% ✅ appsec-postTime: ✅ 6.658ms (SLO: <6.750ms 🟡 -1.4%) vs baseline: -0.2% Memory: ✅ 62.128MB (SLO: <64.500MB -3.7%) vs baseline: +4.9% ✅ appsec-telemetryTime: ✅ 4.612ms (SLO: <4.750ms -2.9%) vs baseline: -0.6% Memory: ✅ 61.814MB (SLO: <64.500MB -4.2%) vs baseline: +5.0% ✅ debuggerTime: ✅ 1.861ms (SLO: <2.000ms -7.0%) vs baseline: -0.1% Memory: ✅ 44.482MB (SLO: <45.000MB 🟡 -1.2%) vs baseline: +4.8% ✅ iast-getTime: ✅ 1.877ms (SLO: <2.000ms -6.1%) vs baseline: +1.1% Memory: ✅ 46.888MB (SLO: <49.000MB -4.3%) vs baseline: +4.8% ✅ profilerTime: ✅ 1.916ms (SLO: <2.100ms -8.7%) vs baseline: ~same Memory: ✅ 44.155MB (SLO: <46.500MB -5.0%) vs baseline: +4.7% ✅ tracerTime: ✅ 3.391ms (SLO: <3.650ms -7.1%) vs baseline: ~same Memory: ✅ 51.210MB (SLO: <53.500MB -4.3%) vs baseline: +4.9% 🟡 otelspan - 22/22✅ add-eventTime: ✅ 45.160ms (SLO: <47.150ms -4.2%) vs baseline: ~same Memory: ✅ 44.392MB (SLO: <46.500MB -4.5%) vs baseline: +4.6% ✅ add-metricsTime: ✅ 321.365ms (SLO: <344.800ms -6.8%) vs baseline: +0.5% Memory: ✅ 559.002MB (SLO: <562.000MB 🟡 -0.5%) vs baseline: +4.9% ✅ add-tagsTime: ✅ 293.209ms (SLO: <314.000ms -6.6%) vs baseline: +1.7% Memory: ✅ 559.354MB (SLO: <563.500MB 🟡 -0.7%) vs baseline: +4.7% ✅ get-contextTime: ✅ 88.475ms (SLO: <92.350ms -4.2%) vs baseline: +2.1% Memory: ✅ 39.566MB (SLO: <46.500MB 📉 -14.9%) vs baseline: +5.0% ✅ is-recordingTime: ✅ 42.906ms (SLO: <44.500ms -3.6%) vs baseline: +0.2% Memory: ✅ 43.648MB (SLO: <46.500MB -6.1%) vs baseline: +4.7% ✅ record-exceptionTime: ✅ 61.541ms (SLO: <67.650ms -9.0%) vs baseline: -0.4% Memory: ✅ 39.766MB (SLO: <46.500MB 📉 -14.5%) vs baseline: +5.0% ✅ set-statusTime: ✅ 48.690ms (SLO: <50.400ms -3.4%) vs baseline: ~same Memory: ✅ 43.651MB (SLO: <46.500MB -6.1%) vs baseline: +4.8% ✅ startTime: ✅ 41.899ms (SLO: <43.450ms -3.6%) vs baseline: -0.2% Memory: ✅ 43.639MB (SLO: <46.500MB -6.2%) vs baseline: +4.6% ✅ start-finishTime: ✅ 85.325ms (SLO: <88.000ms -3.0%) vs baseline: +0.1% Memory: ✅ 33.777MB (SLO: <46.500MB 📉 -27.4%) vs baseline: +4.8% ✅ start-finish-telemetryTime: ✅ 87.814ms (SLO: <89.000ms 🟡 -1.3%) vs baseline: +1.4% Memory: ✅ 33.718MB (SLO: <46.500MB 📉 -27.5%) vs baseline: +4.6% ✅ update-nameTime: ✅ 44.179ms (SLO: <45.150ms -2.1%) vs baseline: +0.4% Memory: ✅ 44.099MB (SLO: <46.500MB -5.2%) vs baseline: +4.9%
|
We handle a potential race condition with the import of pkg_resources that can happen when a module watchdog is enabled while the import of said module is in progress. Addresses #14449. - [ ] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [ ] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - 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) (cherry picked from commit c0bcf90)
ea72619 to
a8f0963
Compare
|
This pull request has been automatically closed after a period of inactivity. |
Pull request was closed
Backport c0bcf90 from #14456 to 3.12.
We handle a potential race condition with the import of pkg_resources that can happen when a module watchdog is enabled while the import of said module is in progress.
Addresses #14449.
Checklist
Reviewer Checklist