From 4e00557af9142aebeae06573a30b92adadd91ae9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 01:28:50 +0000 Subject: [PATCH 1/6] Update agent test version to 5.2.0.0 --- 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 0d72820f3..e2974ab92 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -1 +1 @@ -__version__ = "5.1.0" +__version__ = "5.2.0.0" From 10cb840332e13f4bb1b28971d5f40a434b45a4e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 01:28:51 +0000 Subject: [PATCH 2/6] Update beta image's agent version to 5.2.0.0 --- image/requirements-nodeps-beta.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/requirements-nodeps-beta.txt b/image/requirements-nodeps-beta.txt index 0115098da..899a75ca7 100644 --- a/image/requirements-nodeps-beta.txt +++ b/image/requirements-nodeps-beta.txt @@ -1 +1 @@ -solarwinds_apm==5.1.0.0 +solarwinds_apm==5.2.0.0 From ff7e73a030c23c44a5bd90beab861d8693e2c26c Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 9 Dec 2025 10:58:43 -0800 Subject: [PATCH 3/6] Changelog --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4b6be6ab..0d1df51d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,15 @@ 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/solarwinds/apm-python/compare/rel-5.1.0...HEAD) +## [Unreleased](https://github.com/solarwinds/apm-python/compare/rel-5.2.0...HEAD) + +## [5.2.0.0](https://github.com/solarwinds/apm-python/releases/tag/rel-5.2.0) - 2025-12-09 + +### Changed +- Fixed thread safety of token bucket ([#712](https://github.com/solarwinds/apm-python/pull/712)) +- Updated distro to always opt into `database` new semconv if supported by instrumentation ([#713](https://github.com/solarwinds/apm-python/pull/713)) +- Updated workflows for PyPI trusted publishing ([#719](https://github.com/solarwinds/apm-python/pull/719)) +- Upgraded to OTel Python 1.39.0/0.60b ([#720](https://github.com/solarwinds/apm-python/pull/720)) ## [5.1.0](https://github.com/solarwinds/apm-python/releases/tag/rel-5.1.0) - 2025-10-21 From 2437c9d08bdacb9852c06a9ef804e462666a950f Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 9 Dec 2025 11:23:57 -0800 Subject: [PATCH 4/6] Rm reusable workflow from build_publish_testpypi --- .github/workflows/build_publish_testpypi.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_publish_testpypi.yaml b/.github/workflows/build_publish_testpypi.yaml index e648d2eb8..9480da0e5 100644 --- a/.github/workflows/build_publish_testpypi.yaml +++ b/.github/workflows/build_publish_testpypi.yaml @@ -45,8 +45,15 @@ jobs: needs: - build_sdist_and_wheel - scan_sdist_and_wheel - uses: ./.github/workflows/publish_sdist_and_wheel.yaml - with: - artifact-name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} - repository-name: testpypi - secrets: inherit + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v6 + with: + name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} + - name: Unzip artifact with dist + run: unzip ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} + - name: Publish sdist and wheel to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ From 71a2287cafe62a097a4eafcc9c9b96811b0531eb Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 9 Dec 2025 11:30:18 -0800 Subject: [PATCH 5/6] Rm reusable workflow from build_publish_pypi --- .../build_publish_pypi_and_draft_release.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_publish_pypi_and_draft_release.yaml b/.github/workflows/build_publish_pypi_and_draft_release.yaml index 850c1910d..c86315c23 100644 --- a/.github/workflows/build_publish_pypi_and_draft_release.yaml +++ b/.github/workflows/build_publish_pypi_and_draft_release.yaml @@ -61,11 +61,16 @@ jobs: needs: - build_sdist_and_wheel - scan_sdist_and_wheel - uses: ./.github/workflows/publish_sdist_and_wheel.yaml - with: - artifact-name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} - repository-name: pypi - secrets: inherit + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v6 + with: + name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} + - name: Unzip artifact with dist + run: unzip ${{ needs.build_sdist_and_wheel.outputs.artifact-name }} + - name: Publish sdist and wheel to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 create_release: name: Create draft release From 731475ae40c4480057906769fcf248757d26bd31 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Tue, 9 Dec 2025 11:30:41 -0800 Subject: [PATCH 6/6] Rm no-longer-used workflow --- .../workflows/publish_sdist_and_wheel.yaml | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/publish_sdist_and_wheel.yaml diff --git a/.github/workflows/publish_sdist_and_wheel.yaml b/.github/workflows/publish_sdist_and_wheel.yaml deleted file mode 100644 index 777d9a421..000000000 --- a/.github/workflows/publish_sdist_and_wheel.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# © 2024 SolarWinds Worldwide, LLC. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0 -# -# 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. - -name: Publish sdist and wheel - -on: - workflow_call: - inputs: - artifact-name: - type: string - required: true - description: 'Name of zip archive of sdist and wheels' - repository-name: - type: string - required: false - description: "testpypi or pypi" - -jobs: - publish_sdist_and_wheel: - name: Publish sdist and wheel - runs-on: ubuntu-latest - steps: - - name: Download artifact - uses: actions/download-artifact@v6 - with: - name: ${{ inputs.artifact-name }} - - name: Unzip artifact with dist - run: unzip ${{ inputs.artifact-name }} - - if: ${{ inputs.repository-name == 'testpypi' }} - name: Publish sdist and wheel to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ - - if: ${{ inputs.repository-name == 'pypi' }} - name: Publish sdist and wheel to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file