Skip to content

Commit 74b6a45

Browse files
committed
fix exporter-prometheus-write tests
Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>
1 parent 71c335f commit 74b6a45

4 files changed

Lines changed: 60 additions & 117 deletions

File tree

.github/workflows/test_1.yml

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -716,44 +716,6 @@ jobs:
716716
- name: Run tests
717717
run: tox -e py313-test-instrumentation-urllib3-1 -- -ra
718718

719-
py314-test-instrumentation-urllib3-0_ubuntu-latest:
720-
name: instrumentation-urllib3-0 3.14 Ubuntu
721-
runs-on: ubuntu-latest
722-
timeout-minutes: 30
723-
steps:
724-
- name: Checkout repo @ SHA - ${{ github.sha }}
725-
uses: actions/checkout@v4
726-
727-
- name: Set up Python 3.14
728-
uses: actions/setup-python@v5
729-
with:
730-
python-version: "3.14"
731-
732-
- name: Install tox
733-
run: pip install tox-uv
734-
735-
- name: Run tests
736-
run: tox -e py314-test-instrumentation-urllib3-0 -- -ra
737-
738-
py314-test-instrumentation-urllib3-1_ubuntu-latest:
739-
name: instrumentation-urllib3-1 3.14 Ubuntu
740-
runs-on: ubuntu-latest
741-
timeout-minutes: 30
742-
steps:
743-
- name: Checkout repo @ SHA - ${{ github.sha }}
744-
uses: actions/checkout@v4
745-
746-
- name: Set up Python 3.14
747-
uses: actions/setup-python@v5
748-
with:
749-
python-version: "3.14"
750-
751-
- name: Install tox
752-
run: pip install tox-uv
753-
754-
- name: Run tests
755-
run: tox -e py314-test-instrumentation-urllib3-1 -- -ra
756-
757719
pypy3-test-instrumentation-urllib3-0_ubuntu-latest:
758720
name: instrumentation-urllib3-0 pypy-3.9 Ubuntu
759721
runs-on: ubuntu-latest
@@ -4535,25 +4497,6 @@ jobs:
45354497
- name: Run tests
45364498
run: tox -e py313-test-instrumentation-sqlalchemy-2 -- -ra
45374499

4538-
py314-test-instrumentation-sqlalchemy-1_ubuntu-latest:
4539-
name: instrumentation-sqlalchemy-1 3.14 Ubuntu
4540-
runs-on: ubuntu-latest
4541-
timeout-minutes: 30
4542-
steps:
4543-
- name: Checkout repo @ SHA - ${{ github.sha }}
4544-
uses: actions/checkout@v4
4545-
4546-
- name: Set up Python 3.14
4547-
uses: actions/setup-python@v5
4548-
with:
4549-
python-version: "3.14"
4550-
4551-
- name: Install tox
4552-
run: pip install tox-uv
4553-
4554-
- name: Run tests
4555-
run: tox -e py314-test-instrumentation-sqlalchemy-1 -- -ra
4556-
45574500
py314-test-instrumentation-sqlalchemy-2_ubuntu-latest:
45584501
name: instrumentation-sqlalchemy-2 3.14 Ubuntu
45594502
runs-on: ubuntu-latest
@@ -4781,3 +4724,60 @@ jobs:
47814724

47824725
- name: Run tests
47834726
run: tox -e py39-test-instrumentation-remoulade -- -ra
4727+
4728+
py310-test-instrumentation-remoulade_ubuntu-latest:
4729+
name: instrumentation-remoulade 3.10 Ubuntu
4730+
runs-on: ubuntu-latest
4731+
timeout-minutes: 30
4732+
steps:
4733+
- name: Checkout repo @ SHA - ${{ github.sha }}
4734+
uses: actions/checkout@v4
4735+
4736+
- name: Set up Python 3.10
4737+
uses: actions/setup-python@v5
4738+
with:
4739+
python-version: "3.10"
4740+
4741+
- name: Install tox
4742+
run: pip install tox-uv
4743+
4744+
- name: Run tests
4745+
run: tox -e py310-test-instrumentation-remoulade -- -ra
4746+
4747+
py311-test-instrumentation-remoulade_ubuntu-latest:
4748+
name: instrumentation-remoulade 3.11 Ubuntu
4749+
runs-on: ubuntu-latest
4750+
timeout-minutes: 30
4751+
steps:
4752+
- name: Checkout repo @ SHA - ${{ github.sha }}
4753+
uses: actions/checkout@v4
4754+
4755+
- name: Set up Python 3.11
4756+
uses: actions/setup-python@v5
4757+
with:
4758+
python-version: "3.11"
4759+
4760+
- name: Install tox
4761+
run: pip install tox-uv
4762+
4763+
- name: Run tests
4764+
run: tox -e py311-test-instrumentation-remoulade -- -ra
4765+
4766+
py312-test-instrumentation-remoulade_ubuntu-latest:
4767+
name: instrumentation-remoulade 3.12 Ubuntu
4768+
runs-on: ubuntu-latest
4769+
timeout-minutes: 30
4770+
steps:
4771+
- name: Checkout repo @ SHA - ${{ github.sha }}
4772+
uses: actions/checkout@v4
4773+
4774+
- name: Set up Python 3.12
4775+
uses: actions/setup-python@v5
4776+
with:
4777+
python-version: "3.12"
4778+
4779+
- name: Install tox
4780+
run: pip install tox-uv
4781+
4782+
- name: Run tests
4783+
run: tox -e py312-test-instrumentation-remoulade -- -ra

.github/workflows/test_2.yml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -32,63 +32,6 @@ env:
3232

3333
jobs:
3434

35-
py310-test-instrumentation-remoulade_ubuntu-latest:
36-
name: instrumentation-remoulade 3.10 Ubuntu
37-
runs-on: ubuntu-latest
38-
timeout-minutes: 30
39-
steps:
40-
- name: Checkout repo @ SHA - ${{ github.sha }}
41-
uses: actions/checkout@v4
42-
43-
- name: Set up Python 3.10
44-
uses: actions/setup-python@v5
45-
with:
46-
python-version: "3.10"
47-
48-
- name: Install tox
49-
run: pip install tox-uv
50-
51-
- name: Run tests
52-
run: tox -e py310-test-instrumentation-remoulade -- -ra
53-
54-
py311-test-instrumentation-remoulade_ubuntu-latest:
55-
name: instrumentation-remoulade 3.11 Ubuntu
56-
runs-on: ubuntu-latest
57-
timeout-minutes: 30
58-
steps:
59-
- name: Checkout repo @ SHA - ${{ github.sha }}
60-
uses: actions/checkout@v4
61-
62-
- name: Set up Python 3.11
63-
uses: actions/setup-python@v5
64-
with:
65-
python-version: "3.11"
66-
67-
- name: Install tox
68-
run: pip install tox-uv
69-
70-
- name: Run tests
71-
run: tox -e py311-test-instrumentation-remoulade -- -ra
72-
73-
py312-test-instrumentation-remoulade_ubuntu-latest:
74-
name: instrumentation-remoulade 3.12 Ubuntu
75-
runs-on: ubuntu-latest
76-
timeout-minutes: 30
77-
steps:
78-
- name: Checkout repo @ SHA - ${{ github.sha }}
79-
uses: actions/checkout@v4
80-
81-
- name: Set up Python 3.12
82-
uses: actions/setup-python@v5
83-
with:
84-
python-version: "3.12"
85-
86-
- name: Install tox
87-
run: pip install tox-uv
88-
89-
- name: Run tests
90-
run: tox -e py312-test-instrumentation-remoulade -- -ra
91-
9235
py313-test-instrumentation-remoulade_ubuntu-latest:
9336
name: instrumentation-remoulade 3.13 Ubuntu
9437
runs-on: ubuntu-latest

exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
"Programming Language :: Python :: 3.13",
2727
]
2828
dependencies = [
29-
"protobuf ~= 5.26",
29+
"protobuf >=5.26, <7.0",
3030
"requests ~= 2.28",
3131
"opentelemetry-api ~= 1.12",
3232
"opentelemetry-sdk ~= 1.12",

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
4-
cramjam==2.8.4
4+
cramjam==2.11.0
55
Deprecated==1.2.14
66
idna==3.7
77
iniconfig==2.0.0
88
packaging==24.0
99
pluggy==1.5.0
10-
protobuf==5.26
10+
protobuf==6.33.5
1111
py-cpuinfo==9.0.0
1212
pytest==7.4.4
1313
python-snappy==0.7.1

0 commit comments

Comments
 (0)