From 720f47da580cdb1c5d09218a66e09e4a9e9e985b Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 7 Dec 2022 15:42:24 -0800 Subject: [PATCH 01/34] Change to manylinux2; drop centos7 support/testing --- .github/actions/package_solarwinds_apm/action.yaml | 2 +- .github/workflows/build_publish_packagecloud.yaml | 2 +- .github/workflows/verify_install.yaml | 14 -------------- CONTRIBUTING.md | 2 +- Dockerfile | 2 +- Makefile | 2 +- tests/docker/install/_helper_check_wheel.sh | 2 +- tests/docker/install/docker-compose.yml | 10 ---------- 8 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.github/actions/package_solarwinds_apm/action.yaml b/.github/actions/package_solarwinds_apm/action.yaml index e26f781f..6d673231 100644 --- a/.github/actions/package_solarwinds_apm/action.yaml +++ b/.github/actions/package_solarwinds_apm/action.yaml @@ -10,7 +10,7 @@ description: Package solarwinds_apm runs: using: 'docker' - image: quay.io/pypa/manylinux2014_x86_64:latest + image: quay.io/pypa/manylinux_2_28_x86_64:latest entrypoint: 'make' args: - 'package' \ No newline at end of file diff --git a/.github/workflows/build_publish_packagecloud.yaml b/.github/workflows/build_publish_packagecloud.yaml index 28f32f8f..b3639ed0 100644 --- a/.github/workflows/build_publish_packagecloud.yaml +++ b/.github/workflows/build_publish_packagecloud.yaml @@ -13,7 +13,7 @@ jobs: build_publish: runs-on: ubuntu-latest container: - image: quay.io/pypa/manylinux2014_x86_64:latest + image: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - uses: actions/checkout@v2 - name: Install Ruby diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index 27bd36cb..e9d5ed7d 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -156,20 +156,6 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} - py38_install_centos7: - runs-on: ubuntu-latest - container: - image: centos/python-38-centos7 - options: --hostname py3.8-centos7 - steps: - - uses: actions/checkout@v2 - - name: Setup and run install test - working-directory: ./tests/docker/install - run: ./_helper_run_install_tests.sh - shell: sh - env: - MODE: ${{ github.event.inputs.install-registry }} - py38_install_amazon201803: runs-on: ubuntu-latest container: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13ddb89d..9b919d60 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ docker build -t dev-container . ./run_docker_dev.sh ``` -The build container is based on the [PyPA image](https://github.com/pypa/manylinux) `manylinux2014_x86_64`. It uses [SWIG](https://www.swig.org/Doc1.3/Python.html) to compile required C/C++ libraries into a C-extension dependency. +The build container is based on the [PyPA image](https://github.com/pypa/manylinux) `manylinux_2_28_x86_64`. It uses [SWIG](https://www.swig.org/Doc1.3/Python.html) to compile required C/C++ libraries into a C-extension dependency. ### Regression Tests diff --git a/Dockerfile b/Dockerfile index 237697f4..d9b5d1ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build development environment to locally build solarwinds_apm Python agent and publish RC versions -FROM quay.io/pypa/manylinux2014_x86_64 +FROM quay.io/pypa/manylinux_2_28_x86_64 # install: # boto3 for interaction with AWS diff --git a/Makefile b/Makefile index 223dbbd5..32400f81 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ check-swig: # recipes for building the package distribution #----------------------------------------------------------------------------------------------------------------------# -wheel_tag := 'manylinux2014_x86_64' +wheel_tag := 'manylinux_2_28_x86_64' # Build the Python wrapper from liboboe headers inside build container wrapper: check-swig download-all diff --git a/tests/docker/install/_helper_check_wheel.sh b/tests/docker/install/_helper_check_wheel.sh index 25d2d01b..4ed70db5 100755 --- a/tests/docker/install/_helper_check_wheel.sh +++ b/tests/docker/install/_helper_check_wheel.sh @@ -53,7 +53,7 @@ function get_wheel(){ if [ -z "$PIP_INSTALL" ]; then echo -e "PIP_INSTALL not specified." echo -e "Only testing the cp38 x86_64 wheel under ${APM_ROOT}" - tested_wheel=$(find "$APM_ROOT"/dist/* -name "solarwinds_apm-$SOLARWINDS_APM_VERSION-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl") + tested_wheel=$(find "$APM_ROOT"/dist/* -name "solarwinds_apm-$SOLARWINDS_APM_VERSION-cp38-cp38-manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl") else # we need to select the right wheel (there might be multiple wheel versions in the dist directory) pip download \ diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index f5beabd1..13ed55c9 100644 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -133,16 +133,6 @@ services: environment: << : *envvars-install-test - py3.8-install-centos7: - hostname: "py3.8-centos7" - image: "centos/python-38-centos7" - user: root - << : *command-install-test - << : *workdir - << : *volumes-codebase - environment: - << : *envvars-install-test - py3.8-install-amazon2018.03: hostname: "py3.8-amazon2018.03" image: "amazonlinux:2018.03" From 8497709c2ccc0cf7749174b5a37983c5f5fc9c02 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 15:48:02 -0800 Subject: [PATCH 02/34] Re-add Alpine 3.12 install tests --- .github/workflows/verify_install.yaml | 56 +++++++++++++++++++++++++ tests/docker/install/docker-compose.yml | 36 ++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index e9d5ed7d..dadf16bf 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -96,6 +96,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py37_install_alpine312: + runs-on: ubuntu-latest + container: + image: python:3.7-alpine3.12 + options: --hostname py3.7-alpine3.12 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + py37_install_alpine313: runs-on: ubuntu-latest container: @@ -170,6 +184,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py38_install_alpine312: + runs-on: ubuntu-latest + container: + image: python:3.8-alpine3.12 + options: --hostname py3.8-alpine3.12 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + py38_install_alpine313: runs-on: ubuntu-latest container: @@ -230,6 +258,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py39_install_alpine312: + runs-on: ubuntu-latest + container: + image: python:3.9-alpine3.12 + options: --hostname py3.9-alpine3.12 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + py39_install_alpine313: runs-on: ubuntu-latest container: @@ -290,6 +332,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py310_install_alpine312: + runs-on: ubuntu-latest + container: + image: python:3.10-alpine3.12 + options: --hostname py3.10-alpine3.12 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + py310_install_alpine313: runs-on: ubuntu-latest container: diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index 13ed55c9..b62ea1ac 100644 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -93,6 +93,15 @@ services: environment: << : *envvars-install-test + py3.7-install-alpine3.12: + hostname: "py3.7-alpine3.12" + image: "python:3.7-alpine3.12" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + py3.7-install-alpine3.13: hostname: "py3.7-alpine3.13" image: "python:3.7-alpine3.13" @@ -142,6 +151,15 @@ services: environment: << : *envvars-install-test + py3.8-install-alpine3.12: + hostname: "py3.8-alpine3.12" + image: "python:3.8-alpine3.12" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + py3.8-install-alpine3.13: hostname: "py3.8-alpine3.13" image: "python:3.8-alpine3.13" @@ -182,6 +200,15 @@ services: environment: << : *envvars-install-test + py3.9-install-alpine3.12: + hostname: "py3.9-alpine3.12" + image: "python:3.9-alpine3.12" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + py3.9-install-alpine3.13: hostname: "py3.9-alpine3.13" image: "python:3.9-alpine3.13" @@ -222,6 +249,15 @@ services: environment: << : *envvars-install-test + py3.10-install-alpine3.12: + hostname: "py3.10-alpine3.12" + image: "python:3.10-alpine3.12" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + py3.10-install-alpine3.13: hostname: "py3.10-alpine3.13" image: "python:3.10-alpine3.13" From 35f5704381f3b0c0be255b3a98140ec32de0e722 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 16:22:56 -0800 Subject: [PATCH 03/34] liboboe 12.0.0 --- Makefile | 12 ++++++------ setup.cfg | 2 +- setup.py | 10 +++++----- solarwinds_apm/extension/VERSION | 2 +- tests/docker/install/_helper_check_sdist.sh | 6 +++--- tests/docker/install/_helper_check_wheel.sh | 2 +- tests/docker/install/install_tests.sh | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 32400f81..ccbcb4a2 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,9 @@ nothing: #----------------------------------------------------------------------------------------------------------------------# # LIBOBOE is the name of the liboboe shared library -LIBOBOEALPINE := "liboboe-1.0-alpine-x86_64.so.0.0.0" -LIBOBOEORG := "liboboe-1.0-x86_64.so.0.0.0" -LIBOBOESERVERLESS := "liboboe-1.0-lambda-x86_64.so.0.0.0" +LIBOBOEALPINE := "liboboe-1.0-alpine-x86_64.so" +LIBOBOEORG := "liboboe-1.0-x86_64.so" +LIBOBOESERVERLESS := "liboboe-1.0-lambda-x86_64.so" # Version of the C-library extension is stored under /solarwinds_apm/extension/VERSION (Otel export compatible as of 10.3.4) OBOEVERSION := $(shell cat ./solarwinds_apm/extension/VERSION) @@ -178,8 +178,8 @@ aws-lambda: wrapper @rm ${target_dir}/solarwinds_apm/extension/*.so* @echo -e "Building AWS Lambda version of C-extensions for all supported Python versions in target directory." @set -e; for PYBIN in cp37-cp37m cp38-cp38; do /opt/python/$${PYBIN}/bin/python setup.py build_ext_lambda -b ${target_dir}; done - @echo -e "Copying AWS Lambda specific Oboe library liboboe-1.0-lambda-x86_64.so.0.0.0 into target directory." - @cp solarwinds_apm/extension/liboboe-1.0-lambda-x86_64.so.0.0.0 ${target_dir}/solarwinds_apm/extension/liboboe-1.0.so.0 + @echo -e "Copying AWS Lambda specific Oboe library liboboe-1.0-lambda-x86_64.so into target directory." + @cp solarwinds_apm/extension/liboboe-1.0-lambda-x86_64.so ${target_dir}/solarwinds_apm/extension/liboboe.so @rm -rf ${target_dir}/*-info @find ${target_dir} -type d -name '__pycache__' | xargs rm -rf @if [[ ! -d dist ]]; then mkdir dist; fi @@ -207,7 +207,7 @@ OTELOBOEREPO := /code/solarwinds-apm-liboboe/liboboe copy-liboboe: @echo -e "Copying shared library.\n" @cd solarwinds_apm/extension; \ - cp "${OTELOBOEREPO}/liboboe-1.0-x86_64.so.0.0.0" .; \ + cp "${OTELOBOEREPO}/liboboe-1.0-x86_64.so" .; \ if [ $$? -ne 0 ]; then echo " **** failed to copy shared library ****" ; exit 1; fi; # Copy liboboe header files (Python wrapper for Oboe c-lib) from source specified in OTELOBOEREPO diff --git a/setup.cfg b/setup.cfg index c6bc6cf4..533edcb2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ install_requires = packages = solarwinds_apm, solarwinds_apm.certs, solarwinds_apm.extension [options.package_data] -solarwinds_apm = extension/liboboe-1.0.so.0, extension/VERSION, extension/bson/bson.h, extension/bson/platform_hacks.h +solarwinds_apm = extension/liboboe.so, extension/VERSION, extension/bson/bson.h, extension/bson/platform_hacks.h [options.entry_points] opentelemetry_distro = diff --git a/setup.py b/setup.py index 17da8760..5682e89b 100644 --- a/setup.py +++ b/setup.py @@ -48,14 +48,14 @@ def os_supported(): def link_oboe_lib(src_lib): """Set up the C-extension libraries. - Create two .so library symlinks, namely 'liboboe-1.0.so' and 'liboboe-1.0.so.0 which are needed when the + Create two .so library symlinks, namely 'liboboe.so' and 'liboboe.so.0 which are needed when the solarwinds_apm package is built from source. This step is needed since Oboe library is platform specific. The src_lib parameter is the name of the library file under solarwinds_apm/extension the above mentioned symlinks will point to. If a file with the provided name does not exist, no symlinks will be created.""" logger.info("Create links to platform specific liboboe library file") - link_dst = ('liboboe-1.0.so', 'liboboe-1.0.so.0') + link_dst = ('liboboe.so', 'liboboe.so.0') cwd = os.getcwd() try: os.chdir('./solarwinds_apm/extension/') @@ -83,13 +83,13 @@ def run(self): if sys.platform == 'darwin': return - oboe_lib = "liboboe-1.0-alpine-x86_64.so.0.0.0" if is_alpine_distro() else "liboboe-1.0-x86_64.so.0.0.0" + oboe_lib = "liboboe-1.0-alpine-x86_64.so" if is_alpine_distro() else "liboboe-1.0-x86_64.so" link_oboe_lib(oboe_lib) build_ext.run(self) class CustomBuildExtLambda(build_ext): def run(self): - link_oboe_lib("liboboe-1.0-lambda-x86_64.so.0.0.0") + link_oboe_lib("liboboe-1.0-lambda-x86_64.so") build_ext.run(self) @@ -112,7 +112,7 @@ def run(self): 'solarwinds_apm/extension', 'solarwinds_apm' ], - libraries=['oboe-1.0', 'rt'], + libraries=['oboe', 'rt'], library_dirs=['solarwinds_apm/extension'], extra_compile_args=["-std=c++11"], runtime_library_dirs=['$ORIGIN']), diff --git a/solarwinds_apm/extension/VERSION b/solarwinds_apm/extension/VERSION index 68d8f15e..b0d36450 100644 --- a/solarwinds_apm/extension/VERSION +++ b/solarwinds_apm/extension/VERSION @@ -1 +1 @@ -11.1.0 +12.0.0 \ No newline at end of file diff --git a/tests/docker/install/_helper_check_sdist.sh b/tests/docker/install/_helper_check_sdist.sh index 03ca00e0..ca58b2b1 100755 --- a/tests/docker/install/_helper_check_sdist.sh +++ b/tests/docker/install/_helper_check_sdist.sh @@ -90,9 +90,9 @@ function check_sdist(){ ./bson ./bson/bson.h ./bson/platform_hacks.h -./liboboe-1.0-alpine-x86_64.so.0.0.0 -./liboboe-1.0-lambda-x86_64.so.0.0.0 -./liboboe-1.0-x86_64.so.0.0.0 +./liboboe-1.0-alpine-x86_64.so +./liboboe-1.0-lambda-x86_64.so +./liboboe-1.0-x86_64.so ./oboe.h ./oboe.py ./oboe_api.cpp diff --git a/tests/docker/install/_helper_check_wheel.sh b/tests/docker/install/_helper_check_wheel.sh index 4ed70db5..15b34559 100755 --- a/tests/docker/install/_helper_check_wheel.sh +++ b/tests/docker/install/_helper_check_wheel.sh @@ -105,7 +105,7 @@ function check_wheel(){ ./bson ./bson/bson.h ./bson/platform_hacks.h -./liboboe-1.0.so.0 +./liboboe.so ./oboe.py" unzip "$tested_wheel" -d "$unpack_directory" # shellcheck disable=SC1091 diff --git a/tests/docker/install/install_tests.sh b/tests/docker/install/install_tests.sh index fb51ee31..d2d8d4a3 100755 --- a/tests/docker/install/install_tests.sh +++ b/tests/docker/install/install_tests.sh @@ -44,7 +44,7 @@ function check_installation(){ ./bson ./bson/bson.h ./bson/platform_hacks.h -./liboboe-1.0.so.0 +./liboboe.so ./oboe.py" # agent has been installed already, we only need to find the installed location From be96d21c592b020ddb43df095efb8554aad1632e Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 16:24:11 -0800 Subject: [PATCH 04/34] Testrelease 0.6.0.4 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 1c2af78f..ea0e45b2 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.5.0" +__version__ = "0.6.0.4" From cb81abf4f12b36e101c331e418ebedf928c8e070 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 16:35:19 -0800 Subject: [PATCH 05/34] Update make clean --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccbcb4a2..085ed73a 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,7 @@ lint: # clean up extension and intermediate build/dist files. clean: @echo -e "Cleaning up extension and intermediate build/dist files." - @cd solarwinds_apm/extension; rm -f oboe* liboboe-1.0*so* liboboe.so; rm -rf bson + @cd solarwinds_apm/extension; rm -f _oboe* oboe* liboboe*so*; rm -rf bson @cd .. @find . -type f -name '*.pyc' -delete @find . -type d -name '__pycache__' | xargs rm -rf From 9df58c7ddb954dd2f63ccdcbbd75d487e897dde7 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 16:49:18 -0800 Subject: [PATCH 06/34] Fix install test --- tests/docker/install/_helper_check_wheel.sh | 2 +- tests/docker/install/_helper_run_install_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/install/_helper_check_wheel.sh b/tests/docker/install/_helper_check_wheel.sh index 15b34559..99350bcd 100755 --- a/tests/docker/install/_helper_check_wheel.sh +++ b/tests/docker/install/_helper_check_wheel.sh @@ -53,7 +53,7 @@ function get_wheel(){ if [ -z "$PIP_INSTALL" ]; then echo -e "PIP_INSTALL not specified." echo -e "Only testing the cp38 x86_64 wheel under ${APM_ROOT}" - tested_wheel=$(find "$APM_ROOT"/dist/* -name "solarwinds_apm-$SOLARWINDS_APM_VERSION-cp38-cp38-manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl") + tested_wheel=$(find "$APM_ROOT"/dist/* -name "solarwinds_apm-$SOLARWINDS_APM_VERSION-cp38-cp38-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl") else # we need to select the right wheel (there might be multiple wheel versions in the dist directory) pip download \ diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index c78392c8..caf5e6d8 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -114,7 +114,7 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" fi } >/dev/null -# need at least pip 19.3 to find manylinux2014 wheels +# need at least pip 19.3 to find manylinux wheels pip install --upgrade pip >/dev/null # run tests using bash so we can use pipefail From 71a9434f9300ecb16eccc46caac9804fa85a3ee6 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 17:01:58 -0800 Subject: [PATCH 07/34] Fix Alpine 3.12 py10 image --- .github/workflows/verify_install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index dadf16bf..84474237 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -335,7 +335,7 @@ jobs: py310_install_alpine312: runs-on: ubuntu-latest container: - image: python:3.10-alpine3.12 + image: python:3.10-rc-alpine3.12 options: --hostname py3.10-alpine3.12 steps: - uses: actions/checkout@v2 From 805f381d3a239d6dddada50f6d0df4a653310175 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 17:02:16 -0800 Subject: [PATCH 08/34] Testrelease 0.6.0.5 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index ea0e45b2..ee9e0b1e 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.4" +__version__ = "0.6.0.5" From 8890cdfef7e777f7a6d5297fdeee4054bd965816 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 17:17:59 -0800 Subject: [PATCH 09/34] Rm debian9, amzn2018.03 install tests --- .github/workflows/verify_install.yaml | 28 --------------------------- 1 file changed, 28 deletions(-) diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index 84474237..59378f84 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -36,20 +36,6 @@ jobs: # Python 3.7 #-------------------------------------------------------------------- - py37_install_debian9: - runs-on: ubuntu-latest - container: - image: python:3.7-stretch - options: --hostname py3.7-debian9 - steps: - - uses: actions/checkout@v2 - - name: Setup and run install test - working-directory: ./tests/docker/install - run: ./_helper_run_install_tests.sh - shell: sh - env: - MODE: ${{ github.event.inputs.install-registry }} - py37_install_debian10: runs-on: ubuntu-latest container: @@ -170,20 +156,6 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} - py38_install_amazon201803: - runs-on: ubuntu-latest - container: - image: amazonlinux:2018.03 - options: --hostname py3.8-amazon2018.03 - steps: - - uses: actions/checkout@v2 - - name: Setup and run install test - working-directory: ./tests/docker/install - run: ./_helper_run_install_tests.sh - shell: sh - env: - MODE: ${{ github.event.inputs.install-registry }} - py38_install_alpine312: runs-on: ubuntu-latest container: From 5a93ebde78d12787e33963b6a8e80d0db5c9fe99 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 31 Jan 2023 17:42:40 -0800 Subject: [PATCH 10/34] Fix other alpine3.12 py310 image --- tests/docker/install/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index b62ea1ac..7dba0d5d 100644 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -251,7 +251,7 @@ services: py3.10-install-alpine3.12: hostname: "py3.10-alpine3.12" - image: "python:3.10-alpine3.12" + image: "python:3.10-rc-alpine3.12" << : *command-install-test << : *workdir << : *volumes-codebase From 1be881f792ea9bf9f7eb40a51ecad4a09b890039 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 10:00:34 -0800 Subject: [PATCH 11/34] Rm alpine3.12 rc py310 tests (unstable) --- .github/workflows/verify_install.yaml | 14 -------------- tests/docker/install/docker-compose.yml | 9 --------- 2 files changed, 23 deletions(-) diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index 59378f84..67807b9a 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -304,20 +304,6 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} - py310_install_alpine312: - runs-on: ubuntu-latest - container: - image: python:3.10-rc-alpine3.12 - options: --hostname py3.10-alpine3.12 - steps: - - uses: actions/checkout@v2 - - name: Setup and run install test - working-directory: ./tests/docker/install - run: ./_helper_run_install_tests.sh - shell: sh - env: - MODE: ${{ github.event.inputs.install-registry }} - py310_install_alpine313: runs-on: ubuntu-latest container: diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index 7dba0d5d..3aa320f5 100644 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -249,15 +249,6 @@ services: environment: << : *envvars-install-test - py3.10-install-alpine3.12: - hostname: "py3.10-alpine3.12" - image: "python:3.10-rc-alpine3.12" - << : *command-install-test - << : *workdir - << : *volumes-codebase - environment: - << : *envvars-install-test - py3.10-install-alpine3.13: hostname: "py3.10-alpine3.13" image: "python:3.10-alpine3.13" From c858eddad10fa4d22f9638a2afe2dc13f7bf6427 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 15:07:34 -0800 Subject: [PATCH 12/34] Add wheel install exception for amznlinux2 --- tests/docker/install/_helper_check_wheel.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/docker/install/_helper_check_wheel.sh b/tests/docker/install/_helper_check_wheel.sh index 99350bcd..07df97de 100755 --- a/tests/docker/install/_helper_check_wheel.sh +++ b/tests/docker/install/_helper_check_wheel.sh @@ -127,6 +127,9 @@ function get_and_check_wheel(){ # Python wheels are not available under Alpine Linux if [[ -f /etc/os-release && "$(cat /etc/os-release)" =~ "Alpine" ]]; then echo "Wheels are not available on Alpine Linux, skip wheel tests." + # Amazon Linux 2's glibc version is too old to use wheels built by manylinux_2_28 + elif [[ -f /etc/os-release && "$(cat /etc/os-release)" =~ "Amazon" ]]; then + echo "Wheels are not available on Amazon Linux, skip wheel tests." else get_wheel check_wheel "$tested_wheel" From 03bc0760a2370c96870d5da61d551f73ddfd0ee9 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 16:29:39 -0800 Subject: [PATCH 13/34] WIP test install test changes --- pyproject.toml | 2 +- tests/docker/install/_helper_check_sdist.sh | 1 + tests/docker/install/_helper_run_install_tests.sh | 13 +++++++++++++ tests/docker/install/install_tests.sh | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a5ed2cf7..3ab16987 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools"] +requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" [tool.black] diff --git a/tests/docker/install/_helper_check_sdist.sh b/tests/docker/install/_helper_check_sdist.sh index ca58b2b1..b53bdc69 100755 --- a/tests/docker/install/_helper_check_sdist.sh +++ b/tests/docker/install/_helper_check_sdist.sh @@ -74,6 +74,7 @@ function get_sdist(){ pip_options+=(solarwinds-apm=="$SOLARWINDS_APM_VERSION") fi + echo "pip download ${pip_options[*]}" # shellcheck disable=SC2048 # shellcheck disable=SC2086 pip download ${pip_options[*]} diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index caf5e6d8..def57f1f 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -56,6 +56,8 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" ubuntu_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID="//' | sed 's/"//') if [ "$ubuntu_version" = "18.04" ] || [ "$ubuntu_version" = "20.04" ]; then apt-get update -y + apt-get install -y python3-setuptools + apt-get install -y python-setuptools TZ=America ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone if [ "$python_version" = "3.10" ] || [ "$python_version" = "3.11" ]; then @@ -67,6 +69,7 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" "python$python_version" \ "python$python_version-distutils" \ "python$python_version-dev" \ + python3-setuptools \ build-essential \ unzip \ wget \ @@ -117,5 +120,15 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" # need at least pip 19.3 to find manylinux wheels pip install --upgrade pip >/dev/null +# WIP test +if grep Ubuntu /etc/os-release; then + ubuntu_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID="//' | sed 's/"//') + if [ "$ubuntu_version" = "18.04" ] || [ "$ubuntu_version" = "20.04" ]; then + pip install --upgrade setuptools + apt-get remove python3-setuptools + pip install --ignore-installed setuptools==65.7.0 + fi +fi + # run tests using bash so we can use pipefail bash -c "set -o pipefail && ./install_tests.sh 2>&1" \ No newline at end of file diff --git a/tests/docker/install/install_tests.sh b/tests/docker/install/install_tests.sh index d2d8d4a3..28846e94 100755 --- a/tests/docker/install/install_tests.sh +++ b/tests/docker/install/install_tests.sh @@ -156,7 +156,7 @@ function install_test_app_dependencies(){ python_version=$(grep -Eo 'py3.[0-9]+[0-9]*' /etc/hostname | grep -Eo '3.[0-9]+[0-9]*') if [ "$python_version" = "3.10" ] || [ "$python_version" = "3.11" ]; then echo "Re-installing setuptools for Python $python_version" - apt-get remove python-setuptools + apt-get remove -y python3-setuptools pip install --ignore-installed setuptools==65.7.0 fi fi From 12bfafdad3ba223773eed902a6ff3dede0abb5f3 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 16:29:52 -0800 Subject: [PATCH 14/34] testrelease 0.6.0.6 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index ee9e0b1e..4b9548ae 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.5" +__version__ = "0.6.0.6" From 64f79a273da4da00b9c6f7234e6098823b12ca93 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 17:04:09 -0800 Subject: [PATCH 15/34] Fix ubuntu python3 deps --- .../install/_helper_run_install_tests.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index def57f1f..ab58dafd 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -66,15 +66,15 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" add-apt-repository ppa:deadsnakes/ppa -y fi apt-get install -y \ - "python$python_version" \ - "python$python_version-distutils" \ - "python$python_version-dev" \ + "python3" \ + "python3-distutils" \ + "python3-dev" \ python3-setuptools \ build-essential \ unzip \ wget \ curl - update-alternatives --install /usr/bin/python python "/usr/bin/python$python_version" 1 + update-alternatives --install /usr/bin/python python "/usr/bin/python3" 1 # Make sure we don't install py3.6's pip # Official get-pip documentation: @@ -120,15 +120,5 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" # need at least pip 19.3 to find manylinux wheels pip install --upgrade pip >/dev/null -# WIP test -if grep Ubuntu /etc/os-release; then - ubuntu_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID="//' | sed 's/"//') - if [ "$ubuntu_version" = "18.04" ] || [ "$ubuntu_version" = "20.04" ]; then - pip install --upgrade setuptools - apt-get remove python3-setuptools - pip install --ignore-installed setuptools==65.7.0 - fi -fi - # run tests using bash so we can use pipefail bash -c "set -o pipefail && ./install_tests.sh 2>&1" \ No newline at end of file From d679f65ecc0f29f21d9a9248eaae48fce3db616d Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 17:04:21 -0800 Subject: [PATCH 16/34] Testrelease 0.6.0.7 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 4b9548ae..08b12e63 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.6" +__version__ = "0.6.0.7" From 669165892c6c4adad3432cf7fae29e1bfa3d6f5d Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 1 Feb 2023 17:15:49 -0800 Subject: [PATCH 17/34] Ubuntu py37/8/9 vs py310/311 --- .../install/_helper_run_install_tests.sh | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index ab58dafd..949b3a9b 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -64,16 +64,27 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" # py3.10,3.11 not currently on main apt repo so use deadsnakes apt-get install -y software-properties-common add-apt-repository ppa:deadsnakes/ppa -y + apt-get install -y \ + python3 \ + python3-distutils \ + python3-dev \ + python3-setuptools \ + build-essential \ + unzip \ + wget \ + curl + else + apt-get install -y \ + "python$python_version" \ + "python$python_version-distutils" \ + "python$python_version-dev" \ + python3-setuptools \ + build-essential \ + unzip \ + wget \ + curl fi - apt-get install -y \ - "python3" \ - "python3-distutils" \ - "python3-dev" \ - python3-setuptools \ - build-essential \ - unzip \ - wget \ - curl + update-alternatives --install /usr/bin/python python "/usr/bin/python3" 1 # Make sure we don't install py3.6's pip From 901b49f63e86896874dbcad3e7b712fdba9ca34b Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 10:40:10 -0800 Subject: [PATCH 18/34] Testrelease 0.6.0.8 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 08b12e63..89346bf1 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.7" +__version__ = "0.6.0.8" From e96c5c5eccda3dae77995de0dd723344bc0b2d6b Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 11:06:01 -0800 Subject: [PATCH 19/34] Fix update-alternatives --- tests/docker/install/_helper_run_install_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index 949b3a9b..3032103b 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -73,6 +73,7 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" unzip \ wget \ curl + update-alternatives --install /usr/bin/python python "/usr/bin/python3" 1 else apt-get install -y \ "python$python_version" \ @@ -83,9 +84,8 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" unzip \ wget \ curl + update-alternatives --install /usr/bin/python python "/usr/bin/python$python_version" 1 fi - - update-alternatives --install /usr/bin/python python "/usr/bin/python3" 1 # Make sure we don't install py3.6's pip # Official get-pip documentation: From ea76d870f51d914639014be25897f9b81633f9b7 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 11:06:19 -0800 Subject: [PATCH 20/34] Testrelease 0.6.0.9 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 89346bf1..a0dbfb16 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.8" +__version__ = "0.6.0.9" From c6adc70810792502e3e354bbad297336cab86c18 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 12:05:15 -0800 Subject: [PATCH 21/34] Tidy up --- tests/docker/install/_helper_check_sdist.sh | 1 - tests/docker/install/_helper_run_install_tests.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/tests/docker/install/_helper_check_sdist.sh b/tests/docker/install/_helper_check_sdist.sh index b53bdc69..ca58b2b1 100755 --- a/tests/docker/install/_helper_check_sdist.sh +++ b/tests/docker/install/_helper_check_sdist.sh @@ -74,7 +74,6 @@ function get_sdist(){ pip_options+=(solarwinds-apm=="$SOLARWINDS_APM_VERSION") fi - echo "pip download ${pip_options[*]}" # shellcheck disable=SC2048 # shellcheck disable=SC2086 pip download ${pip_options[*]} diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index 3032103b..f8f35147 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -56,8 +56,6 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" ubuntu_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID="//' | sed 's/"//') if [ "$ubuntu_version" = "18.04" ] || [ "$ubuntu_version" = "20.04" ]; then apt-get update -y - apt-get install -y python3-setuptools - apt-get install -y python-setuptools TZ=America ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone if [ "$python_version" = "3.10" ] || [ "$python_version" = "3.11" ]; then From d7745c31bac394995519476e493f56a2712fb208 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 12:05:34 -0800 Subject: [PATCH 22/34] Testrelease 0.6.0.10 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index a0dbfb16..683e2fc4 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.9" +__version__ = "0.6.0.10" From 897345cee402fb700e5abe6559ca61737e5a109a Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 13:53:06 -0800 Subject: [PATCH 23/34] Test: liboboe 12.0.99 staging --- Makefile | 2 +- solarwinds_apm/extension/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 085ed73a..07cd6581 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ OBOEVERSION := $(shell cat ./solarwinds_apm/extension/VERSION) ifdef STAGING_OBOE OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" else - OBOEREPO := "https://agent-binaries.cloud.solarwinds.com/apm/c-lib/${OBOEVERSION}" + OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" endif verify-oboe-version: diff --git a/solarwinds_apm/extension/VERSION b/solarwinds_apm/extension/VERSION index b0d36450..f4136acf 100644 --- a/solarwinds_apm/extension/VERSION +++ b/solarwinds_apm/extension/VERSION @@ -1 +1 @@ -12.0.0 \ No newline at end of file +12.0.99 From 4ae8f7ba5f6f3609a707ffe9c2bf50322ff812f6 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 13:53:30 -0800 Subject: [PATCH 24/34] Testrelease 0.6.0.11 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 683e2fc4..0a4ee4cf 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.10" +__version__ = "0.6.0.11" From 5fd3a4be43c07e91b2cf30ba509cfb86ef723ea7 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 14:15:23 -0800 Subject: [PATCH 25/34] Revert "Test: liboboe 12.0.99 staging" This reverts commit 897345cee402fb700e5abe6559ca61737e5a109a. --- Makefile | 2 +- solarwinds_apm/extension/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 07cd6581..085ed73a 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ OBOEVERSION := $(shell cat ./solarwinds_apm/extension/VERSION) ifdef STAGING_OBOE OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" else - OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" + OBOEREPO := "https://agent-binaries.cloud.solarwinds.com/apm/c-lib/${OBOEVERSION}" endif verify-oboe-version: diff --git a/solarwinds_apm/extension/VERSION b/solarwinds_apm/extension/VERSION index f4136acf..b0d36450 100644 --- a/solarwinds_apm/extension/VERSION +++ b/solarwinds_apm/extension/VERSION @@ -1 +1 @@ -12.0.99 +12.0.0 \ No newline at end of file From 16caad3e063577b5adc4a127ed308fba9f44c8fb Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 14:27:12 -0800 Subject: [PATCH 26/34] Add Alpine 3.17 install tests --- .github/workflows/verify_install.yaml | 58 ++++++++++++++++++++++++- tests/docker/install/docker-compose.yml | 38 +++++++++++++++- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index 67807b9a..de94209a 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -110,6 +110,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py37_install_alpine317: + runs-on: ubuntu-latest + container: + image: python:3.7-alpine3.17 + options: --hostname py3.7-alpine3.17 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + #-------------------------------------------------------------------- # Python 3.8 #-------------------------------------------------------------------- @@ -272,6 +286,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py39_install_alpine317: + runs-on: ubuntu-latest + container: + image: python:3.9-alpine3.17 + options: --hostname py3.9-alpine3.17 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + #-------------------------------------------------------------------- # Python 3.10 #-------------------------------------------------------------------- @@ -332,6 +360,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py310_install_alpine317: + runs-on: ubuntu-latest + container: + image: python:3.10-alpine3.17 + options: --hostname py3.10-alpine3.17 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + #-------------------------------------------------------------------- # Python 3.11 #-------------------------------------------------------------------- @@ -367,7 +409,7 @@ jobs: py311_install_alpine316: runs-on: ubuntu-latest container: - image: python:3.11-rc-alpine3.16 + image: python:3.11-alpine3.16 options: --hostname py3.11-alpine3.16 steps: - uses: actions/checkout@v2 @@ -377,3 +419,17 @@ jobs: shell: sh env: MODE: ${{ github.event.inputs.install-registry }} + + py311_install_alpine317: + runs-on: ubuntu-latest + container: + image: python:3.11-alpine3.17 + options: --hostname py3.11-alpine3.17 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} \ No newline at end of file diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index 3aa320f5..5faf7692 100644 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -111,6 +111,15 @@ services: environment: << : *envvars-install-test + py3.7-install-alpine3.17: + hostname: "py3.7-alpine3.17" + image: "python:3.7-alpine3.17" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + #-------------------------------------------------------------------- # Python 3.8 #-------------------------------------------------------------------- @@ -227,6 +236,15 @@ services: environment: << : *envvars-install-test + py3.9-install-alpine3.17: + hostname: "py3.9-alpine3.17" + image: "python:3.9-alpine3.17" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + #-------------------------------------------------------------------- # Python 3.10 #-------------------------------------------------------------------- @@ -267,6 +285,15 @@ services: environment: << : *envvars-install-test + py3.10-install-alpine3.17: + hostname: "py3.10-alpine3.17" + image: "python:3.10-alpine3.17" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + #-------------------------------------------------------------------- # Python 3.11 #-------------------------------------------------------------------- @@ -291,9 +318,18 @@ services: py3.11-install-alpine3.16: hostname: "py3.11-alpine3.16" - image: "python:3.11-rc-alpine3.16" + image: "python:3.11-alpine3.16" << : *command-install-test << : *workdir << : *volumes-codebase environment: << : *envvars-install-test + + py3.11-install-alpine3.17: + hostname: "py3.11-alpine3.17" + image: "python:3.11-alpine3.17" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test \ No newline at end of file From fdc9fc3348579727475f57d974ac15e6656deb4f Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 15:29:03 -0800 Subject: [PATCH 27/34] Revert "Revert "Test: liboboe 12.0.99 staging"" This reverts commit 5fd3a4be43c07e91b2cf30ba509cfb86ef723ea7. --- Makefile | 2 +- solarwinds_apm/extension/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 085ed73a..07cd6581 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ OBOEVERSION := $(shell cat ./solarwinds_apm/extension/VERSION) ifdef STAGING_OBOE OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" else - OBOEREPO := "https://agent-binaries.cloud.solarwinds.com/apm/c-lib/${OBOEVERSION}" + OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" endif verify-oboe-version: diff --git a/solarwinds_apm/extension/VERSION b/solarwinds_apm/extension/VERSION index b0d36450..f4136acf 100644 --- a/solarwinds_apm/extension/VERSION +++ b/solarwinds_apm/extension/VERSION @@ -1 +1 @@ -12.0.0 \ No newline at end of file +12.0.99 From 7746b275a17e9d417741ae8852f824f920514bdf Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 15:29:28 -0800 Subject: [PATCH 28/34] Testrelease 0.6.0.12 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 0a4ee4cf..8766d6e1 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.11" +__version__ = "0.6.0.12" From 1793c8616a4d88bd1838b75d4075ed3a74a4ee17 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 15:47:02 -0800 Subject: [PATCH 29/34] Revert "Revert "Revert "Test: liboboe 12.0.99 staging""" This reverts commit fdc9fc3348579727475f57d974ac15e6656deb4f. --- Makefile | 2 +- solarwinds_apm/extension/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 07cd6581..085ed73a 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ OBOEVERSION := $(shell cat ./solarwinds_apm/extension/VERSION) ifdef STAGING_OBOE OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" else - OBOEREPO := "https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/${OBOEVERSION}" + OBOEREPO := "https://agent-binaries.cloud.solarwinds.com/apm/c-lib/${OBOEVERSION}" endif verify-oboe-version: diff --git a/solarwinds_apm/extension/VERSION b/solarwinds_apm/extension/VERSION index f4136acf..b0d36450 100644 --- a/solarwinds_apm/extension/VERSION +++ b/solarwinds_apm/extension/VERSION @@ -1 +1 @@ -12.0.99 +12.0.0 \ No newline at end of file From 8073c5bee16bf414b0780636188dc1225d783fcb Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 16:16:22 -0800 Subject: [PATCH 30/34] Add RHEL8/UBI8 install tests --- .github/workflows/verify_install.yaml | 14 ++++++++++++++ .gitignore | 2 ++ tests/docker/install/_helper_check_sdist.sh | 2 +- tests/docker/install/ao_issuer_ca_public_cert.crt | 0 tests/docker/install/app.py | 0 tests/docker/install/client.py | 0 tests/docker/install/docker-compose.yml | 12 +++++++++++- 7 files changed, 28 insertions(+), 2 deletions(-) mode change 100644 => 100755 tests/docker/install/ao_issuer_ca_public_cert.crt mode change 100644 => 100755 tests/docker/install/app.py mode change 100644 => 100755 tests/docker/install/client.py mode change 100644 => 100755 tests/docker/install/docker-compose.yml diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index de94209a..ea30b148 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -300,6 +300,20 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} + py39_install_rhel8: + runs-on: ubuntu-latest + container: + image: registry.fedoraproject.org/f33/python3 + options: --hostname py3.9-rhel8 + steps: + - uses: actions/checkout@v2 + - name: Setup and run install test + working-directory: ./tests/docker/install + run: ./_helper_run_install_tests.sh + shell: sh + env: + MODE: ${{ github.event.inputs.install-registry }} + #-------------------------------------------------------------------- # Python 3.10 #-------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 2dbe033b..6861a28b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ lib64/ parts/ sdist/ var/ +wheel/ wheels/ pip-wheel-metadata/ share/python-wheels/ @@ -26,6 +27,7 @@ share/python-wheels/ .installed.cfg *.egg MANIFEST +log.txt # PyInstaller # Usually these files are written by a python script from a template diff --git a/tests/docker/install/_helper_check_sdist.sh b/tests/docker/install/_helper_check_sdist.sh index ca58b2b1..3257f670 100755 --- a/tests/docker/install/_helper_check_sdist.sh +++ b/tests/docker/install/_helper_check_sdist.sh @@ -39,7 +39,7 @@ fi function get_sdist(){ sdist_dir="$PWD/tmp/sdist" - rm -rf sdist_dir + rm -rf "$sdist_dir" if [ "$MODE" == "local" ] then diff --git a/tests/docker/install/ao_issuer_ca_public_cert.crt b/tests/docker/install/ao_issuer_ca_public_cert.crt old mode 100644 new mode 100755 diff --git a/tests/docker/install/app.py b/tests/docker/install/app.py old mode 100644 new mode 100755 diff --git a/tests/docker/install/client.py b/tests/docker/install/client.py old mode 100644 new mode 100755 diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml old mode 100644 new mode 100755 index 5faf7692..e2878a41 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -11,7 +11,7 @@ # under the project dist/ directory # # use the `run` command to get an interactive container for debugging: -# (debian|centos|amazon) $ docker-compose run --rm /bin/bash +# (debian|centos|amazon|fedora) $ docker-compose run --rm /bin/bash # (alpine) $ docker-compose run --rm /bin/sh # # See Confluence for more info: @@ -35,6 +35,7 @@ x-envvars-install-test: &envvars-install-test x-volumes-codebase: &volumes-codebase volumes: - ../../../:/code/python-solarwinds + - ./:/workspace:rw - ./_helper_run_install_tests.sh:/workspace/_helper_run_install_tests.sh - ./_helper_check_extension_files.sh:/workspace/_helper_check_extension_files.sh - ./_helper_check_sdist.sh:/workspace/_helper_check_sdist.sh @@ -245,6 +246,15 @@ services: environment: << : *envvars-install-test + py3.9-install-rhel8: + hostname: "py3.9-rhel8" + image: "registry.fedoraproject.org/f33/python3" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + #-------------------------------------------------------------------- # Python 3.10 #-------------------------------------------------------------------- From a5b55caf6a179b5041733492f255196b08e4697c Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 16:24:03 -0800 Subject: [PATCH 31/34] Testrelease 0.6.0.13 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 8766d6e1..19de5692 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -5,4 +5,4 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """Version of SolarWinds Custom-Distro for OpenTelemetry agents""" -__version__ = "0.6.0.12" +__version__ = "0.6.0.13" From 23512a32d9e110450cc546078c24aee9fbfa1da3 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 17:06:06 -0800 Subject: [PATCH 32/34] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b04ef15..41d62ab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/solarwindscloud/solarwinds-apm-python/compare/rel-0.5.0...HEAD) +### Changed +- SolarWinds c-lib 12.0.0, for gRPC upgrade ([#107](https://github.com/solarwindscloud/solarwinds-apm-python/pull/107)) + +### Removed +- Drop centos7 support ([#107](https://github.com/solarwindscloud/solarwinds-apm-python/pull/107)) +- Drop Debian 9 support ([#107](https://github.com/solarwindscloud/solarwinds-apm-python/pull/107)) +- Drop Amazon Linux 2018.03 support ([#107](https://github.com/solarwindscloud/solarwinds-apm-python/pull/107)) + ## [0.5.0](https://github.com/solarwindscloud/solarwinds-apm-python/releases/tag/rel-0.5.0) - 2023-01-18 ### Added - Add support for OTEL_SERVICE_NAME, OTEL_RESOURCE_ATTRIBUTES environment variables ([#90](https://github.com/solarwindscloud/solarwinds-apm-python/pull/90)) From 4ecbdd403b6939b9a221a4671135959eeeb53d0e Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 2 Feb 2023 17:22:12 -0800 Subject: [PATCH 33/34] Lint --- solarwinds_apm/apm_config.py | 6 ++++-- solarwinds_apm/apm_logging.py | 3 ++- solarwinds_apm/inbound_metrics_processor.py | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/solarwinds_apm/apm_config.py b/solarwinds_apm/apm_config.py index ccbc659b..a38379a4 100644 --- a/solarwinds_apm/apm_config.py +++ b/solarwinds_apm/apm_config.py @@ -332,7 +332,8 @@ def _calculate_service_name( See also OTel SDK Resource.create and env vars: * https://github.com/open-telemetry/opentelemetry-python/blob/f5fb6b1353929cf8039b1d38f97450866357d901/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py#L156-L184 - * https://github.com/open-telemetry/opentelemetry-python/blob/8a0ce154ae27a699598cbf3ccc6396eb012902d6/opentelemetry-sdk/src/opentelemetry/sdk/environment_variables.py#L15-L39""" + * https://github.com/open-telemetry/opentelemetry-python/blob/8a0ce154ae27a699598cbf3ccc6396eb012902d6/opentelemetry-sdk/src/opentelemetry/sdk/environment_variables.py#L15-L39 + """ service_name = "" if agent_enabled: # OTel SDK default service.name is "unknown_service" in-code: @@ -509,7 +510,8 @@ def update_with_kwargs(self, kwargs): # pylint: disable=too-many-branches,too-many-statements def _set_config_value(self, keys: str, val: Any) -> Any: """Sets the value of the config option indexed by 'keys' to 'val', where 'keys' is a nested key (separated by - self.delimiter, i.e., the position of the element to be changed in the nested dictionary)""" + self.delimiter, i.e., the position of the element to be changed in the nested dictionary) + """ def _convert_to_bool(val): """Converts given value to boolean value""" diff --git a/solarwinds_apm/apm_logging.py b/solarwinds_apm/apm_logging.py index dccecdf2..a30f2d1c 100644 --- a/solarwinds_apm/apm_logging.py +++ b/solarwinds_apm/apm_logging.py @@ -41,7 +41,8 @@ class ApmLoggingLevel: """Abstract mapping class providing a conversion between solarwinds_apm agent logging level and Python logging module logging levels. - The solarwinds_apm package has seven different log levels, which are defined in the debug_levels dictionary.""" + The solarwinds_apm package has seven different log levels, which are defined in the debug_levels dictionary. + """ # maps string representation of solarwinds_apm.sw_logging levels to their integer counterpart debug_levels = { diff --git a/solarwinds_apm/inbound_metrics_processor.py b/solarwinds_apm/inbound_metrics_processor.py index d3a3d102..7660dbb9 100644 --- a/solarwinds_apm/inbound_metrics_processor.py +++ b/solarwinds_apm/inbound_metrics_processor.py @@ -24,7 +24,6 @@ class SolarWindsInboundMetricsSpanProcessor(SpanProcessor): - _HTTP_METHOD = SpanAttributes.HTTP_METHOD # "http.method" _HTTP_ROUTE = SpanAttributes.HTTP_ROUTE # "http.route" _HTTP_STATUS_CODE = SpanAttributes.HTTP_STATUS_CODE # "http.status_code" From edbea14eb091fc31160b4dcb374b858ec26aeffb Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Fri, 3 Feb 2023 10:25:40 -0800 Subject: [PATCH 34/34] Update checkout v3 --- .../workflows/build_publish_packagecloud.yaml | 2 +- .../build_publish_pypi_and_draft_release.yaml | 6 +- .github/workflows/build_publish_testpypi.yaml | 2 +- .github/workflows/codeql_analysis.yml | 2 +- .github/workflows/create_release_pr.yaml | 2 +- .github/workflows/verify_install.yaml | 56 +++++++++---------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build_publish_packagecloud.yaml b/.github/workflows/build_publish_packagecloud.yaml index b3639ed0..d1a3ef9f 100644 --- a/.github/workflows/build_publish_packagecloud.yaml +++ b/.github/workflows/build_publish_packagecloud.yaml @@ -15,7 +15,7 @@ jobs: container: image: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Ruby run: | gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \ diff --git a/.github/workflows/build_publish_pypi_and_draft_release.yaml b/.github/workflows/build_publish_pypi_and_draft_release.yaml index 336d1417..7be608f7 100644 --- a/.github/workflows/build_publish_pypi_and_draft_release.yaml +++ b/.github/workflows/build_publish_pypi_and_draft_release.yaml @@ -21,7 +21,7 @@ jobs: name: Check if version valid runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Check version run: cd .github/scripts && ./is_publishable.sh ${{ github.event.inputs.version }} @@ -30,7 +30,7 @@ jobs: needs: is_publishable runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/actions/package_solarwinds_apm - name: Install Twine run: pip install --upgrade --no-cache-dir --prefer-binary twine @@ -48,7 +48,7 @@ jobs: needs: build_publish_and_release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Initialize git run: | git config user.name "GitHub Actions" diff --git a/.github/workflows/build_publish_testpypi.yaml b/.github/workflows/build_publish_testpypi.yaml index a7bd5373..011d8def 100644 --- a/.github/workflows/build_publish_testpypi.yaml +++ b/.github/workflows/build_publish_testpypi.yaml @@ -13,7 +13,7 @@ jobs: build_publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/actions/package_solarwinds_apm - name: Install Twine run: pip install --upgrade --no-cache-dir --prefer-binary twine diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index fcfa9cf8..18822018 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/create_release_pr.yaml b/.github/workflows/create_release_pr.yaml index f17574c2..51dd29a4 100644 --- a/.github/workflows/create_release_pr.yaml +++ b/.github/workflows/create_release_pr.yaml @@ -21,7 +21,7 @@ jobs: create_release_pr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Initialize git run: | git config user.name "GitHub Actions" diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index ea30b148..bbaadb89 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -42,7 +42,7 @@ jobs: image: python:3.7-buster options: --hostname py3.7-debian10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -56,7 +56,7 @@ jobs: image: ubuntu:18.04 options: --hostname py3.7-ubuntu18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -74,7 +74,7 @@ jobs: run: | yum update -y yum install -y git tar - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -88,7 +88,7 @@ jobs: image: python:3.7-alpine3.12 options: --hostname py3.7-alpine3.12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -102,7 +102,7 @@ jobs: image: python:3.7-alpine3.13 options: --hostname py3.7-alpine3.13 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -116,7 +116,7 @@ jobs: image: python:3.7-alpine3.17 options: --hostname py3.7-alpine3.17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -134,7 +134,7 @@ jobs: image: python:3.8-buster options: --hostname py3.8-debian10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -148,7 +148,7 @@ jobs: image: ubuntu:18.04 options: --hostname py3.8-ubuntu18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -162,7 +162,7 @@ jobs: image: ubuntu:20.04 options: --hostname py3.8-ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -176,7 +176,7 @@ jobs: image: python:3.8-alpine3.12 options: --hostname py3.8-alpine3.12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -190,7 +190,7 @@ jobs: image: python:3.8-alpine3.13 options: --hostname py3.8-alpine3.13 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -208,7 +208,7 @@ jobs: image: python:3.9-buster options: --hostname py3.9-debian10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -222,7 +222,7 @@ jobs: image: ubuntu:20.04 options: --hostname py3.9-ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -236,7 +236,7 @@ jobs: image: centos:8 options: --hostname py3.9-centos8 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -250,7 +250,7 @@ jobs: image: python:3.9-alpine3.12 options: --hostname py3.9-alpine3.12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -264,7 +264,7 @@ jobs: image: python:3.9-alpine3.13 options: --hostname py3.9-alpine3.13 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -278,7 +278,7 @@ jobs: image: python:3.9-alpine3.16 options: --hostname py3.9-alpine3.16 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -292,7 +292,7 @@ jobs: image: python:3.9-alpine3.17 options: --hostname py3.9-alpine3.17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -306,7 +306,7 @@ jobs: image: registry.fedoraproject.org/f33/python3 options: --hostname py3.9-rhel8 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -324,7 +324,7 @@ jobs: image: python:3.10-buster options: --hostname py3.10-debian10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -338,7 +338,7 @@ jobs: image: ubuntu:20.04 options: --hostname py3.10-ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -352,7 +352,7 @@ jobs: image: python:3.10-alpine3.13 options: --hostname py3.10-alpine3.13 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -366,7 +366,7 @@ jobs: image: python:3.10-alpine3.16 options: --hostname py3.10-alpine3.16 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -380,7 +380,7 @@ jobs: image: python:3.10-alpine3.17 options: --hostname py3.10-alpine3.17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -398,7 +398,7 @@ jobs: image: python:3.11-rc-buster options: --hostname py3.11-debian10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -412,7 +412,7 @@ jobs: image: ubuntu:20.04 options: --hostname py3.11-ubuntu20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -426,7 +426,7 @@ jobs: image: python:3.11-alpine3.16 options: --hostname py3.11-alpine3.16 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh @@ -440,7 +440,7 @@ jobs: image: python:3.11-alpine3.17 options: --hostname py3.11-alpine3.17 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup and run install test working-directory: ./tests/docker/install run: ./_helper_run_install_tests.sh