Skip to content

Commit 25627bb

Browse files
xrmxxrmx
authored
Merge branch 'main' into issue4228
2 parents 2a27d33 + 88e5bfc commit 25627bb

45 files changed

Lines changed: 5292 additions & 10 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,3 +3112,63 @@ jobs:
31123112

31133113
- name: Run tests
31143114
run: tox -e py39-test-processor-baggage -- -ra
3115+
3116+
py39-test-opamp-client-latest:
3117+
name: opamp-client-latest
3118+
runs-on: ubuntu-latest
3119+
timeout-minutes: 30
3120+
steps:
3121+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3122+
uses: actions/checkout@v4
3123+
with:
3124+
repository: open-telemetry/opentelemetry-python-contrib
3125+
ref: ${{ env.CONTRIB_REPO_SHA }}
3126+
3127+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3128+
uses: actions/checkout@v4
3129+
with:
3130+
repository: open-telemetry/opentelemetry-python
3131+
ref: ${{ env.CORE_REPO_SHA }}
3132+
path: opentelemetry-python
3133+
3134+
- name: Set up Python 3.9
3135+
uses: actions/setup-python@v5
3136+
with:
3137+
python-version: "3.9"
3138+
architecture: "x64"
3139+
3140+
- name: Install tox
3141+
run: pip install tox-uv
3142+
3143+
- name: Run tests
3144+
run: tox -e py39-test-opamp-client-latest -- -ra
3145+
3146+
py39-test-opamp-client-lowest:
3147+
name: opamp-client-lowest
3148+
runs-on: ubuntu-latest
3149+
timeout-minutes: 30
3150+
steps:
3151+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3152+
uses: actions/checkout@v4
3153+
with:
3154+
repository: open-telemetry/opentelemetry-python-contrib
3155+
ref: ${{ env.CONTRIB_REPO_SHA }}
3156+
3157+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3158+
uses: actions/checkout@v4
3159+
with:
3160+
repository: open-telemetry/opentelemetry-python
3161+
ref: ${{ env.CORE_REPO_SHA }}
3162+
path: opentelemetry-python
3163+
3164+
- name: Set up Python 3.9
3165+
uses: actions/setup-python@v5
3166+
with:
3167+
python-version: "3.9"
3168+
architecture: "x64"
3169+
3170+
- name: Install tox
3171+
run: pip install tox-uv
3172+
3173+
- name: Run tests
3174+
run: tox -e py39-test-opamp-client-lowest -- -ra

‎.github/workflows/lint_0.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,3 +1361,22 @@ jobs:
13611361

13621362
- name: Run tests
13631363
run: tox -e lint-processor-baggage
1364+
1365+
lint-opamp-client:
1366+
name: opamp-client
1367+
runs-on: ubuntu-latest
1368+
timeout-minutes: 30
1369+
steps:
1370+
- name: Checkout repo @ SHA - ${{ github.sha }}
1371+
uses: actions/checkout@v4
1372+
1373+
- name: Set up Python 3.14
1374+
uses: actions/setup-python@v5
1375+
with:
1376+
python-version: "3.14"
1377+
1378+
- name: Install tox
1379+
run: pip install tox-uv
1380+
1381+
- name: Run tests
1382+
run: tox -e lint-opamp-client

‎.github/workflows/package-prepare-patch-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
package:
66
type: choice
77
options:
8+
- opentelemetry-opamp-client
89
- opentelemetry-propagator-aws-xray
910
- opentelemetry-resource-detector-azure
1011
- opentelemetry-sdk-extension-aws

‎.github/workflows/package-prepare-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
package:
66
type: choice
77
options:
8+
- opentelemetry-opamp-client
89
- opentelemetry-propagator-aws-xray
910
- opentelemetry-resource-detector-azure
1011
- opentelemetry-sdk-extension-aws

‎.github/workflows/package-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
package:
66
type: choice
77
options:
8+
- opentelemetry-opamp-client
89
- opentelemetry-propagator-aws-xray
910
- opentelemetry-resource-detector-azure
1011
- opentelemetry-sdk-extension-aws

‎.github/workflows/test_2.yml‎

Lines changed: 228 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,3 +3641,231 @@ jobs:
36413641

36423642
- name: Run tests
36433643
run: tox -e pypy3-test-processor-baggage -- -ra
3644+
3645+
py39-test-opamp-client-latest_ubuntu-latest:
3646+
name: opamp-client-latest 3.9 Ubuntu
3647+
runs-on: ubuntu-latest
3648+
timeout-minutes: 30
3649+
steps:
3650+
- name: Checkout repo @ SHA - ${{ github.sha }}
3651+
uses: actions/checkout@v4
3652+
3653+
- name: Set up Python 3.9
3654+
uses: actions/setup-python@v5
3655+
with:
3656+
python-version: "3.9"
3657+
3658+
- name: Install tox
3659+
run: pip install tox-uv
3660+
3661+
- name: Run tests
3662+
run: tox -e py39-test-opamp-client-latest -- -ra
3663+
3664+
py39-test-opamp-client-lowest_ubuntu-latest:
3665+
name: opamp-client-lowest 3.9 Ubuntu
3666+
runs-on: ubuntu-latest
3667+
timeout-minutes: 30
3668+
steps:
3669+
- name: Checkout repo @ SHA - ${{ github.sha }}
3670+
uses: actions/checkout@v4
3671+
3672+
- name: Set up Python 3.9
3673+
uses: actions/setup-python@v5
3674+
with:
3675+
python-version: "3.9"
3676+
3677+
- name: Install tox
3678+
run: pip install tox-uv
3679+
3680+
- name: Run tests
3681+
run: tox -e py39-test-opamp-client-lowest -- -ra
3682+
3683+
py310-test-opamp-client-latest_ubuntu-latest:
3684+
name: opamp-client-latest 3.10 Ubuntu
3685+
runs-on: ubuntu-latest
3686+
timeout-minutes: 30
3687+
steps:
3688+
- name: Checkout repo @ SHA - ${{ github.sha }}
3689+
uses: actions/checkout@v4
3690+
3691+
- name: Set up Python 3.10
3692+
uses: actions/setup-python@v5
3693+
with:
3694+
python-version: "3.10"
3695+
3696+
- name: Install tox
3697+
run: pip install tox-uv
3698+
3699+
- name: Run tests
3700+
run: tox -e py310-test-opamp-client-latest -- -ra
3701+
3702+
py310-test-opamp-client-lowest_ubuntu-latest:
3703+
name: opamp-client-lowest 3.10 Ubuntu
3704+
runs-on: ubuntu-latest
3705+
timeout-minutes: 30
3706+
steps:
3707+
- name: Checkout repo @ SHA - ${{ github.sha }}
3708+
uses: actions/checkout@v4
3709+
3710+
- name: Set up Python 3.10
3711+
uses: actions/setup-python@v5
3712+
with:
3713+
python-version: "3.10"
3714+
3715+
- name: Install tox
3716+
run: pip install tox-uv
3717+
3718+
- name: Run tests
3719+
run: tox -e py310-test-opamp-client-lowest -- -ra
3720+
3721+
py311-test-opamp-client-latest_ubuntu-latest:
3722+
name: opamp-client-latest 3.11 Ubuntu
3723+
runs-on: ubuntu-latest
3724+
timeout-minutes: 30
3725+
steps:
3726+
- name: Checkout repo @ SHA - ${{ github.sha }}
3727+
uses: actions/checkout@v4
3728+
3729+
- name: Set up Python 3.11
3730+
uses: actions/setup-python@v5
3731+
with:
3732+
python-version: "3.11"
3733+
3734+
- name: Install tox
3735+
run: pip install tox-uv
3736+
3737+
- name: Run tests
3738+
run: tox -e py311-test-opamp-client-latest -- -ra
3739+
3740+
py311-test-opamp-client-lowest_ubuntu-latest:
3741+
name: opamp-client-lowest 3.11 Ubuntu
3742+
runs-on: ubuntu-latest
3743+
timeout-minutes: 30
3744+
steps:
3745+
- name: Checkout repo @ SHA - ${{ github.sha }}
3746+
uses: actions/checkout@v4
3747+
3748+
- name: Set up Python 3.11
3749+
uses: actions/setup-python@v5
3750+
with:
3751+
python-version: "3.11"
3752+
3753+
- name: Install tox
3754+
run: pip install tox-uv
3755+
3756+
- name: Run tests
3757+
run: tox -e py311-test-opamp-client-lowest -- -ra
3758+
3759+
py312-test-opamp-client-latest_ubuntu-latest:
3760+
name: opamp-client-latest 3.12 Ubuntu
3761+
runs-on: ubuntu-latest
3762+
timeout-minutes: 30
3763+
steps:
3764+
- name: Checkout repo @ SHA - ${{ github.sha }}
3765+
uses: actions/checkout@v4
3766+
3767+
- name: Set up Python 3.12
3768+
uses: actions/setup-python@v5
3769+
with:
3770+
python-version: "3.12"
3771+
3772+
- name: Install tox
3773+
run: pip install tox-uv
3774+
3775+
- name: Run tests
3776+
run: tox -e py312-test-opamp-client-latest -- -ra
3777+
3778+
py312-test-opamp-client-lowest_ubuntu-latest:
3779+
name: opamp-client-lowest 3.12 Ubuntu
3780+
runs-on: ubuntu-latest
3781+
timeout-minutes: 30
3782+
steps:
3783+
- name: Checkout repo @ SHA - ${{ github.sha }}
3784+
uses: actions/checkout@v4
3785+
3786+
- name: Set up Python 3.12
3787+
uses: actions/setup-python@v5
3788+
with:
3789+
python-version: "3.12"
3790+
3791+
- name: Install tox
3792+
run: pip install tox-uv
3793+
3794+
- name: Run tests
3795+
run: tox -e py312-test-opamp-client-lowest -- -ra
3796+
3797+
py313-test-opamp-client-latest_ubuntu-latest:
3798+
name: opamp-client-latest 3.13 Ubuntu
3799+
runs-on: ubuntu-latest
3800+
timeout-minutes: 30
3801+
steps:
3802+
- name: Checkout repo @ SHA - ${{ github.sha }}
3803+
uses: actions/checkout@v4
3804+
3805+
- name: Set up Python 3.13
3806+
uses: actions/setup-python@v5
3807+
with:
3808+
python-version: "3.13"
3809+
3810+
- name: Install tox
3811+
run: pip install tox-uv
3812+
3813+
- name: Run tests
3814+
run: tox -e py313-test-opamp-client-latest -- -ra
3815+
3816+
py313-test-opamp-client-lowest_ubuntu-latest:
3817+
name: opamp-client-lowest 3.13 Ubuntu
3818+
runs-on: ubuntu-latest
3819+
timeout-minutes: 30
3820+
steps:
3821+
- name: Checkout repo @ SHA - ${{ github.sha }}
3822+
uses: actions/checkout@v4
3823+
3824+
- name: Set up Python 3.13
3825+
uses: actions/setup-python@v5
3826+
with:
3827+
python-version: "3.13"
3828+
3829+
- name: Install tox
3830+
run: pip install tox-uv
3831+
3832+
- name: Run tests
3833+
run: tox -e py313-test-opamp-client-lowest -- -ra
3834+
3835+
py314-test-opamp-client-latest_ubuntu-latest:
3836+
name: opamp-client-latest 3.14 Ubuntu
3837+
runs-on: ubuntu-latest
3838+
timeout-minutes: 30
3839+
steps:
3840+
- name: Checkout repo @ SHA - ${{ github.sha }}
3841+
uses: actions/checkout@v4
3842+
3843+
- name: Set up Python 3.14
3844+
uses: actions/setup-python@v5
3845+
with:
3846+
python-version: "3.14"
3847+
3848+
- name: Install tox
3849+
run: pip install tox-uv
3850+
3851+
- name: Run tests
3852+
run: tox -e py314-test-opamp-client-latest -- -ra
3853+
3854+
py314-test-opamp-client-lowest_ubuntu-latest:
3855+
name: opamp-client-lowest 3.14 Ubuntu
3856+
runs-on: ubuntu-latest
3857+
timeout-minutes: 30
3858+
steps:
3859+
- name: Checkout repo @ SHA - ${{ github.sha }}
3860+
uses: actions/checkout@v4
3861+
3862+
- name: Set up Python 3.14
3863+
uses: actions/setup-python@v5
3864+
with:
3865+
python-version: "3.14"
3866+
3867+
- name: Install tox
3868+
run: pip install tox-uv
3869+
3870+
- name: Run tests
3871+
run: tox -e py314-test-opamp-client-lowest -- -ra

‎.pylintrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extension-pkg-whitelist=cassandra
77

88
# Add list of files or directories to be excluded. They should be base names, not
99
# paths.
10-
ignore=CVS,gen,Dockerfile,docker-compose.yml,README.md,requirements.txt,docs,.venv,site-packages,.tox
10+
ignore=CVS,gen,Dockerfile,docker-compose.yml,README.md,requirements.txt,docs,.venv,site-packages,.tox,proto
1111

1212
# Add files or directories matching the regex patterns to be excluded. The
1313
# regex matches against base names, not paths.
@@ -179,7 +179,7 @@ contextmanager-decorators=contextlib.contextmanager
179179
# List of members which are set dynamically and missed by pylint inference
180180
# system, and so shouldn't trigger E1101 when accessed. Python regular
181181
# expressions are accepted.
182-
generated-members=types_pb2.*
182+
generated-members=types_pb2.*,anyvalue_pb2.*,opamp_pb2.*
183183

184184
# Tells whether missing members accessed in mixin class should be ignored. A
185185
# mixin class is detected if its name ends with "mixin" (case insensitive).

‎RELEASING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
> [!NOTE]
2020
> Per-package release is supported for the following packages only:
21+
> - opentelemetry-opamp-client
2122
> - opentelemetry-propagator-aws-xray
2223
> - opentelemetry-resource-detector-azure
2324
> - opentelemetry-sdk-extension-aws
@@ -87,6 +88,7 @@ The workflow will create a pull request that should be merged in order to procee
8788

8889
> [!NOTE]
8990
> Per-package patch release is supported for the following packages only:
91+
> - opentelemetry-opamp-client
9092
> - opentelemetry-propagator-aws-xray
9193
> - opentelemetry-resource-detector-azure
9294
> - opentelemetry-sdk-extension-aws

‎docs-requirements.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ starlette~=0.50
5151
tornado>=5.1.1
5252
tortoise-orm>=0.17.0
5353

54+
# required by opamp
55+
uuid_utils
56+
protobuf>=5.0,< 7.0
57+
5458
# indirect dependency pins
5559
markupsafe==2.0.1
5660
itsdangerous==2.0.1
61+

0 commit comments

Comments
 (0)
⚡