-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge main into develop-logging-attributes (#1034)
* Remove RPM config workflow. (#1007) * Nonced CSP Support (#998) * Add nonce to CSP in browser agent * Adjust nonce position * Add testing for browser timing nonces * Drop py27 from memcache testing. (#1018) * Temporarily pin hypercorn version in tests (#1021) * Temporarily pin hypercorn to <0.16 * Temporarily pin hypercorn to <0.16 * Add comment to tox.ini --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Remove case sensitive check in ASGIBrowserMiddleware check. (#1017) * Remove case sensitive check in should_insert_html. * [Mega-Linter] Apply linters fixes * Remove header decoding. --------- Co-authored-by: umaannamalai <[email protected]> * Parallel Wheel Builds (#1024) * Fix import issue in tests * Parallelize wheel building and add muslinux support --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Deprecate get_browser_timing_footer API (#999) * Add nonce to CSP in browser agent * Adjust nonce position * Add testing for browser timing nonces * Deprecated browser timing footer APIs. * Full rip out of browser timing footer * Remove cross agent tests for RUM footer (per repo) * Update cat_map tests * Adjust browser header generation timing accuracy * Fix browser tests * Linting * Apply suggestions from code review --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Deprecate ObjectWrapper API (#996) * Update wrapt to 1.16.0 * Import duplicate functions directly from wrapt * Update object wrappers for wrapt 1.16.0 * Add warning to wrapt duplicate code * Linting * Use super rather than hard coded Object proxy * Formatting * Add test file for wrapper attributes * Unify ObjectWrapper with FunctionWrapper * Remove ObjectWrapper from httplib * Remove ObjectWrapper from tastypie * Replace ObjectWrapper use in console * Remove ObjectWrapper from celery * Remove extra import * Update agent APIs * Deprecate ObjectWrapper * Fix object wrapper imports * More import issues * Fix taskwrapper in celery * Pin last supported flask restx version for 3.7 * Undo tox changes * Change all api.object_wrapper references to use new locations * Fixup: callable_name import * Fixup: callable_name import --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Hannah Stepanek <[email protected]> * Add checkout actions to deploy workflow (#1027) * Remove Slack section in CONTRIBUTING.rst. (#1029) * Remove duplicated function * Pin starlette before 0.35.1 * Change starlette pin --------- Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: Lalleh Rafeei <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: umaannamalai <[email protected]> Co-authored-by: Hannah Stepanek <[email protected]>
- Loading branch information
6 people
authored
Jan 11, 2024
1 parent
92cca1e
commit d9c6462
Showing
45 changed files
with
1,495 additions
and
1,848 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,17 +20,125 @@ on: | |
| - published | ||
|
|
||
| jobs: | ||
| deploy-linux: | ||
| build-linux-py3: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: true | ||
| matrix: | ||
| wheel: | ||
| - cp37-manylinux | ||
| - cp37-musllinux | ||
| - cp38-manylinux | ||
| - cp38-musllinux | ||
| - cp39-manylinux | ||
| - cp39-musllinux | ||
| - cp310-manylinux | ||
| - cp310-musllinux | ||
| - cp311-manylinux | ||
| - cp311-musllinux | ||
| - cp312-manylinux | ||
| - cp312-musllinux | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup QEMU | ||
| uses: docker/setup-qemu-action@v1 | ||
| uses: docker/setup-qemu-action@v3 | ||
|
|
||
| - name: Build Wheels | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CIBW_PLATFORM: linux | ||
| CIBW_BUILD: "${{ matrix.wheel }}*" | ||
| CIBW_ARCHS_LINUX: x86_64 aarch64 | ||
| CIBW_ENVIRONMENT: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib" | ||
| CIBW_TEST_REQUIRES: pytest | ||
| CIBW_TEST_COMMAND: "PYTHONPATH={project}/tests pytest {project}/tests/agent_unittests -vx" | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: ${{ github.job }}-${{ matrix.wheel }} | ||
| path: ./wheelhouse/*.whl | ||
| retention-days: 1 | ||
|
|
||
| build-linux-py2: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup QEMU | ||
| uses: docker/setup-qemu-action@v3 | ||
|
|
||
| - name: Build Wheels | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CIBW_PLATFORM: linux | ||
| CIBW_BUILD: cp27-manylinux_x86_64 | ||
| CIBW_ARCHS_LINUX: x86_64 | ||
| CIBW_ENVIRONMENT: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib" | ||
| CIBW_TEST_REQUIRES: pytest==4.6.11 | ||
| CIBW_TEST_COMMAND: "PYTHONPATH={project}/tests pytest {project}/tests/agent_unittests -vx" | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: ${{ github.job }} | ||
| path: ./wheelhouse/*.whl | ||
| retention-days: 1 | ||
|
|
||
| build-sdist: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| pip install -U pip | ||
| pip install -U setuptools | ||
| - name: Build Source Package | ||
| run: | | ||
| python setup.py sdist | ||
| - name: Prepare MD5 Hash File | ||
| run: | | ||
| tarball="$(python setup.py --fullname).tar.gz" | ||
| md5_file=${tarball}.md5 | ||
| openssl md5 -binary dist/${tarball} | xxd -p | tr -d '\n' > dist/${md5_file} | ||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: ${{ github.job }}-sdist | ||
| path: | | ||
| ./dist/*.tar.gz | ||
| ./dist/*.tar.gz.md5 | ||
| retention-days: 1 | ||
|
|
||
| deploy: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| needs: | ||
| - build-linux-py3 | ||
| - build-linux-py2 | ||
| - build-sdist | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: actions/setup-python@v2 | ||
| with: | ||
|
|
@@ -42,32 +150,22 @@ jobs: | |
| pip install -U pip | ||
| pip install -U wheel setuptools twine | ||
| - name: Build Source Package | ||
| run: python setup.py sdist | ||
|
|
||
| - name: Build Manylinux Wheels (Python 2) | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CIBW_PLATFORM: linux | ||
| CIBW_BUILD: cp27-manylinux_x86_64 | ||
| CIBW_ARCHS: x86_64 | ||
| CIBW_ENVIRONMENT: "LD_LIBRARY_PATH=/opt/rh/=vtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib" | ||
| - name: Download Artifacts | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: ./artifacts/ | ||
|
|
||
| - name: Build Manylinux Wheels (Python 3) | ||
| uses: pypa/[email protected] | ||
| env: | ||
| CIBW_PLATFORM: linux | ||
| CIBW_BUILD: cp37-manylinux* cp38-manylinux* cp39-manylinux* cp310-manylinux* cp311-manylinux* | ||
| CIBW_ARCHS: x86_64 aarch64 | ||
| CIBW_ENVIRONMENT: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib" | ||
| - name: Unpack Artifacts | ||
| run: | | ||
| mkdir -p dist/ | ||
| mv artifacts/**/*{.whl,.tar.gz,.tar.gz.md5} dist/ | ||
| - name: Upload Package to S3 | ||
| run: | | ||
| tarball="$(python setup.py --fullname).tar.gz" | ||
| md5_file=$(mktemp) | ||
| openssl md5 -binary dist/$tarball | xxd -p | tr -d '\n' > $md5_file | ||
| aws s3 cp $md5_file $S3_DST/${tarball}.md5 | ||
| aws s3 cp dist/$tarball $S3_DST/$tarball | ||
| md5_file=${tarball}.md5 | ||
| aws s3 cp dist/${md5_file} $S3_DST/${md5_file} | ||
| aws s3 cp dist/${tarball} $S3_DST/${tarball} | ||
| env: | ||
| S3_DST: s3://nr-downloads-main/python_agent/release | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
|
|
@@ -76,7 +174,7 @@ jobs: | |
|
|
||
| - name: Upload Package to PyPI | ||
| run: | | ||
| twine upload --non-interactive dist/*.tar.gz wheelhouse/*-manylinux*.whl | ||
| twine upload --non-interactive dist/*.tar.gz dist/*.whl | ||
| env: | ||
| TWINE_USERNAME: __token__ | ||
| TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.