diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml index 4d26fc0c..1819296a 100644 --- a/.github/workflows/verify_install.yaml +++ b/.github/workflows/verify_install.yaml @@ -84,7 +84,7 @@ jobs: --rm python:3.7-alpine3.12 \ /bin/sh -c "./_helper_run_install_tests.sh" - aarch64_py37_install_amazon2: + aarch64_py38_install_debian10: runs-on: ubuntu-latest steps: - name: Set up QEMU @@ -102,13 +102,13 @@ jobs: -e SW_APM_SERVICE_KEY_AO_PROD=${{ secrets.SW_APM_SERVICE_KEY_AO_PROD }} \ -e SW_APM_SERVICE_KEY_PROD=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \ -e SW_APM_SERVICE_KEY_STAGING=${{ secrets.SW_APM_SERVICE_KEY_STAGING }} \ - -h py3.7-install-amazon2 \ + -h py3.8-debian10 \ -v $(pwd):/home \ -w /home/tests/docker/install \ - --rm amazonlinux:2 \ + --rm python:3.8-buster \ /bin/sh -c "./_helper_run_install_tests.sh" - aarch64_py38_install_debian10: + aarch64_py39_install_ubuntu2004: runs-on: ubuntu-latest steps: - name: Set up QEMU @@ -126,13 +126,13 @@ jobs: -e SW_APM_SERVICE_KEY_AO_PROD=${{ secrets.SW_APM_SERVICE_KEY_AO_PROD }} \ -e SW_APM_SERVICE_KEY_PROD=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \ -e SW_APM_SERVICE_KEY_STAGING=${{ secrets.SW_APM_SERVICE_KEY_STAGING }} \ - -h py3.8-debian10 \ + -h py3.9-ubuntu20.04 \ -v $(pwd):/home \ -w /home/tests/docker/install \ - --rm python:3.8-buster \ + --rm ubuntu:20.04 \ /bin/sh -c "./_helper_run_install_tests.sh" - aarch64_py39_install_ubuntu2004: + aarch64_py39_install_centos8: runs-on: ubuntu-latest steps: - name: Set up QEMU @@ -150,13 +150,13 @@ jobs: -e SW_APM_SERVICE_KEY_AO_PROD=${{ secrets.SW_APM_SERVICE_KEY_AO_PROD }} \ -e SW_APM_SERVICE_KEY_PROD=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \ -e SW_APM_SERVICE_KEY_STAGING=${{ secrets.SW_APM_SERVICE_KEY_STAGING }} \ - -h py3.9-ubuntu20.04 \ + -h py3.9-centos8 \ -v $(pwd):/home \ -w /home/tests/docker/install \ - --rm ubuntu:20.04 \ + --rm centos:8 \ /bin/sh -c "./_helper_run_install_tests.sh" - aarch64_py39_install_centos8: + aarch64_py310_install_amazon2023: runs-on: ubuntu-latest steps: - name: Set up QEMU @@ -174,10 +174,10 @@ jobs: -e SW_APM_SERVICE_KEY_AO_PROD=${{ secrets.SW_APM_SERVICE_KEY_AO_PROD }} \ -e SW_APM_SERVICE_KEY_PROD=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \ -e SW_APM_SERVICE_KEY_STAGING=${{ secrets.SW_APM_SERVICE_KEY_STAGING }} \ - -h py3.9-centos8 \ + -h py3.10-install-amazon2023 \ -v $(pwd):/home \ -w /home/tests/docker/install \ - --rm centos:8 \ + --rm amazonlinux:2023 \ /bin/sh -c "./_helper_run_install_tests.sh" aarch64_py310_install_ubuntu2004: @@ -308,24 +308,6 @@ jobs: env: MODE: ${{ github.event.inputs.install-registry }} - py37_install_amazon2: - runs-on: ubuntu-latest - container: - image: amazonlinux:2 - options: --hostname py3.7-install-amazon2 - steps: - - name: Install latest git and tar - run: | - yum update -y - yum install -y git tar - - uses: actions/checkout@v3 - - 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_alpine312: runs-on: ubuntu-latest container: @@ -562,6 +544,22 @@ jobs: # x86_64 Python 3.10 #-------------------------------------------------------------------- + py310_install_amazon2023: + runs-on: ubuntu-latest + container: + image: amazonlinux:2023 + options: --hostname py3.10-amazon2023 + steps: + - name: Install checkout deps + run: yum update -y && yum install -y tar gzip + - uses: actions/checkout@v3 + - 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_debian10: runs-on: ubuntu-latest container: diff --git a/CHANGELOG.md b/CHANGELOG.md index 23682d0d..3c442b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/solarwindscloud/solarwinds-apm-python/compare/rel-0.10.0...HEAD) +## [Unreleased](https://github.com/solarwindscloud/solarwinds-apm-python/compare/rel-0.11.0...HEAD) + +## [0.11.0.0](https://github.com/solarwindscloud/solarwinds-apm-python/releases/tag/rel-0.11.0) - 2023-05-23 +### Added +- Added trace context to logging ([#146](https://github.com/solarwindscloud/solarwinds-apm-python/pull/146)) + +### Changed +- Adjusted config file logging ([#147](https://github.com/solarwindscloud/solarwinds-apm-python/pull/147)) +- OpenTelemetry API/SDK 1.18.0 ([#150](https://github.com/solarwindscloud/solarwinds-apm-python/pull/150)) +- Added Amazon 2023 install tests; removed Amazon 2018 and Amazon 2 install tests ([#151](https://github.com/solarwindscloud/solarwinds-apm-python/pull/151)) + ## [0.10.0](https://github.com/solarwindscloud/solarwinds-apm-python/releases/tag/rel-0.10.0) - 2023-05-01 ### Added diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 8e044463..ccac3a49 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.10.0" +__version__ = "0.11.0.4" diff --git a/tests/docker/install/_helper_run_install_tests.sh b/tests/docker/install/_helper_run_install_tests.sh index f8f35147..e537917f 100755 --- a/tests/docker/install/_helper_run_install_tests.sh +++ b/tests/docker/install/_helper_run_install_tests.sh @@ -33,6 +33,8 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" # agent deps apk add python3-dev g++ make curl + pip install --upgrade pip >/dev/null + elif grep "CentOS Linux 8" /etc/os-release; then # fix centos8 metadata download failures for repo 'appstream' # https://stackoverflow.com/a/71077606 @@ -51,6 +53,8 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" ln -s "/usr/bin/python$python_version" /usr/local/bin/python command -v pip || ln -s /usr/bin/pip3 /usr/local/bin/pip + + pip install --upgrade pip >/dev/null elif grep Ubuntu /etc/os-release; then ubuntu_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID="//' | sed 's/"//') @@ -90,15 +94,16 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" # https://pip.pypa.io/en/stable/installation/#get-pip-py wget https://bootstrap.pypa.io/get-pip.py python get-pip.py + + pip install --upgrade pip >/dev/null else echo "ERROR: Testing on Ubuntu <18.04 not supported." exit 1 fi - + elif grep "Amazon Linux" /etc/os-release; then yum update -y - if grep "Amazon Linux 2" /etc/os-release; then - # agent and test deps for py3.7 + if grep "Amazon Linux 2023" /etc/os-release; then yum install -y \ python3-devel \ python3-pip \ @@ -110,24 +115,13 @@ echo "Installing test dependencies for Python $python_version on $pretty_name" tar \ gzip update-alternatives --install /usr/bin/python python /usr/bin/python3 1 - update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 + # cannot symlink/update-alternatives nor upgrade pip else - # agent and test deps - yum install -y \ - "python$python_version_no_dot-devel" \ - "python$python_version_no_dot-pip" \ - "python$python_version_no_dot-setuptools" \ - gcc \ - gcc-c++ \ - unzip \ - findutils - alternatives --set python "/usr/bin/python$python_version" + echo "ERROR: Testing on Amazon <2023 not supported." + exit 1 fi fi } >/dev/null -# 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 bash -c "set -o pipefail && ./install_tests.sh 2>&1" \ No newline at end of file diff --git a/tests/docker/install/client.py b/tests/docker/install/client.py index d1e60e58..8e9f29f9 100755 --- a/tests/docker/install/client.py +++ b/tests/docker/install/client.py @@ -41,6 +41,8 @@ def request_server(attempts=10): if __name__ == "__main__": + logger.debug("Waiting a moment for instrumented app to start...") + time.sleep(20) request_server() logger.debug("Waiting a moment in case reporter needs extra time...") time.sleep(10) diff --git a/tests/docker/install/docker-compose.yml b/tests/docker/install/docker-compose.yml index 9f444446..8e739b52 100755 --- a/tests/docker/install/docker-compose.yml +++ b/tests/docker/install/docker-compose.yml @@ -63,15 +63,6 @@ services: environment: << : *envvars-install-test - py3.7-install-amazon2: - hostname: "py3.7-amazon2" - image: "amazonlinux:2" - << : *command-install-test - << : *workdir - << : *volumes-codebase - environment: - << : *envvars-install-test - py3.7-install-alpine3.12: hostname: "py3.7-alpine3.12" image: "python:3.7-alpine3.12" @@ -130,15 +121,6 @@ services: environment: << : *envvars-install-test - py3.8-install-amazon2018.03: - hostname: "py3.8-amazon2018.03" - image: "amazonlinux:2018.03" - << : *command-install-test - << : *workdir - << : *volumes-codebase - environment: - << : *envvars-install-test - py3.8-install-alpine3.12: hostname: "py3.8-alpine3.12" image: "python:3.8-alpine3.12" @@ -237,6 +219,15 @@ services: # Python 3.10 #-------------------------------------------------------------------- + py3.10-install-amazon2023: + hostname: "py3.10-amazon2023" + image: "amazonlinux:2023" + << : *command-install-test + << : *workdir + << : *volumes-codebase + environment: + << : *envvars-install-test + py3.10-install-debian10: hostname: "py3.10-debian10" image: "python:3.10-buster"