Skip to content

Commit 053128d

Browse files
emdnetoemdneto
committed
fix django
Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>
1 parent c156561 commit 053128d

8 files changed

Lines changed: 180 additions & 133 deletions

File tree

‎.github/workflows/test_0.yml‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3053,6 +3053,25 @@ jobs:
30533053
- name: Run tests
30543054
run: tox -e py310-test-instrumentation-django-1 -- -ra
30553055

3056+
py310-test-instrumentation-django-3_ubuntu-latest:
3057+
name: instrumentation-django-3 3.10 Ubuntu
3058+
runs-on: ubuntu-latest
3059+
timeout-minutes: 30
3060+
steps:
3061+
- name: Checkout repo @ SHA - ${{ github.sha }}
3062+
uses: actions/checkout@v4
3063+
3064+
- name: Set up Python 3.10
3065+
uses: actions/setup-python@v5
3066+
with:
3067+
python-version: "3.10"
3068+
3069+
- name: Install tox
3070+
run: pip install tox-uv
3071+
3072+
- name: Run tests
3073+
run: tox -e py310-test-instrumentation-django-3 -- -ra
3074+
30563075
py311-test-instrumentation-django-1_ubuntu-latest:
30573076
name: instrumentation-django-1 3.11 Ubuntu
30583077
runs-on: ubuntu-latest
@@ -3072,6 +3091,25 @@ jobs:
30723091
- name: Run tests
30733092
run: tox -e py311-test-instrumentation-django-1 -- -ra
30743093

3094+
py311-test-instrumentation-django-3_ubuntu-latest:
3095+
name: instrumentation-django-3 3.11 Ubuntu
3096+
runs-on: ubuntu-latest
3097+
timeout-minutes: 30
3098+
steps:
3099+
- name: Checkout repo @ SHA - ${{ github.sha }}
3100+
uses: actions/checkout@v4
3101+
3102+
- name: Set up Python 3.11
3103+
uses: actions/setup-python@v5
3104+
with:
3105+
python-version: "3.11"
3106+
3107+
- name: Install tox
3108+
run: pip install tox-uv
3109+
3110+
- name: Run tests
3111+
run: tox -e py311-test-instrumentation-django-3 -- -ra
3112+
30753113
py312-test-instrumentation-django-1_ubuntu-latest:
30763114
name: instrumentation-django-1 3.12 Ubuntu
30773115
runs-on: ubuntu-latest
@@ -3091,6 +3129,25 @@ jobs:
30913129
- name: Run tests
30923130
run: tox -e py312-test-instrumentation-django-1 -- -ra
30933131

3132+
py312-test-instrumentation-django-3_ubuntu-latest:
3133+
name: instrumentation-django-3 3.12 Ubuntu
3134+
runs-on: ubuntu-latest
3135+
timeout-minutes: 30
3136+
steps:
3137+
- name: Checkout repo @ SHA - ${{ github.sha }}
3138+
uses: actions/checkout@v4
3139+
3140+
- name: Set up Python 3.12
3141+
uses: actions/setup-python@v5
3142+
with:
3143+
python-version: "3.12"
3144+
3145+
- name: Install tox
3146+
run: pip install tox-uv
3147+
3148+
- name: Run tests
3149+
run: tox -e py312-test-instrumentation-django-3 -- -ra
3150+
30943151
py313-test-instrumentation-django-3_ubuntu-latest:
30953152
name: instrumentation-django-3 3.13 Ubuntu
30963153
runs-on: ubuntu-latest
@@ -4724,60 +4781,3 @@ jobs:
47244781

47254782
- name: Run tests
47264783
run: tox -e py310-test-instrumentation-flask-2 -- -ra
4727-
4728-
py310-test-instrumentation-flask-3_ubuntu-latest:
4729-
name: instrumentation-flask-3 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-flask-3 -- -ra
4746-
4747-
py311-test-instrumentation-flask-0_ubuntu-latest:
4748-
name: instrumentation-flask-0 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-flask-0 -- -ra
4765-
4766-
py311-test-instrumentation-flask-1_ubuntu-latest:
4767-
name: instrumentation-flask-1 3.11 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.11
4775-
uses: actions/setup-python@v5
4776-
with:
4777-
python-version: "3.11"
4778-
4779-
- name: Install tox
4780-
run: pip install tox-uv
4781-
4782-
- name: Run tests
4783-
run: tox -e py311-test-instrumentation-flask-1 -- -ra

‎.github/workflows/test_1.yml‎

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

3333
jobs:
3434

35+
py310-test-instrumentation-flask-3_ubuntu-latest:
36+
name: instrumentation-flask-3 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-flask-3 -- -ra
53+
54+
py311-test-instrumentation-flask-0_ubuntu-latest:
55+
name: instrumentation-flask-0 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-flask-0 -- -ra
72+
73+
py311-test-instrumentation-flask-1_ubuntu-latest:
74+
name: instrumentation-flask-1 3.11 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.11
82+
uses: actions/setup-python@v5
83+
with:
84+
python-version: "3.11"
85+
86+
- name: Install tox
87+
run: pip install tox-uv
88+
89+
- name: Run tests
90+
run: tox -e py311-test-instrumentation-flask-1 -- -ra
91+
3592
py311-test-instrumentation-flask-2_ubuntu-latest:
3693
name: instrumentation-flask-2 3.11 Ubuntu
3794
runs-on: ubuntu-latest
@@ -4724,60 +4781,3 @@ jobs:
47244781

47254782
- name: Run tests
47264783
run: tox -e py312-test-instrumentation-remoulade -- -ra
4727-
4728-
py313-test-instrumentation-remoulade_ubuntu-latest:
4729-
name: instrumentation-remoulade 3.13 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.13
4737-
uses: actions/setup-python@v5
4738-
with:
4739-
python-version: "3.13"
4740-
4741-
- name: Install tox
4742-
run: pip install tox-uv
4743-
4744-
- name: Run tests
4745-
run: tox -e py313-test-instrumentation-remoulade -- -ra
4746-
4747-
py314-test-instrumentation-remoulade_ubuntu-latest:
4748-
name: instrumentation-remoulade 3.14 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.14
4756-
uses: actions/setup-python@v5
4757-
with:
4758-
python-version: "3.14"
4759-
4760-
- name: Install tox
4761-
run: pip install tox-uv
4762-
4763-
- name: Run tests
4764-
run: tox -e py314-test-instrumentation-remoulade -- -ra
4765-
4766-
py39-test-instrumentation-celery_ubuntu-latest:
4767-
name: instrumentation-celery 3.9 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.9
4775-
uses: actions/setup-python@v5
4776-
with:
4777-
python-version: "3.9"
4778-
4779-
- name: Install tox
4780-
run: pip install tox-uv
4781-
4782-
- name: Run tests
4783-
run: tox -e py39-test-instrumentation-celery -- -ra

‎.github/workflows/test_2.yml‎

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

3333
jobs:
3434

35+
py313-test-instrumentation-remoulade_ubuntu-latest:
36+
name: instrumentation-remoulade 3.13 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.13
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: "3.13"
47+
48+
- name: Install tox
49+
run: pip install tox-uv
50+
51+
- name: Run tests
52+
run: tox -e py313-test-instrumentation-remoulade -- -ra
53+
54+
py314-test-instrumentation-remoulade_ubuntu-latest:
55+
name: instrumentation-remoulade 3.14 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.14
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.14"
66+
67+
- name: Install tox
68+
run: pip install tox-uv
69+
70+
- name: Run tests
71+
run: tox -e py314-test-instrumentation-remoulade -- -ra
72+
73+
py39-test-instrumentation-celery_ubuntu-latest:
74+
name: instrumentation-celery 3.9 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.9
82+
uses: actions/setup-python@v5
83+
with:
84+
python-version: "3.9"
85+
86+
- name: Install tox
87+
run: pip install tox-uv
88+
89+
- name: Run tests
90+
run: tox -e py39-test-instrumentation-celery -- -ra
91+
3592
py310-test-instrumentation-celery_ubuntu-latest:
3693
name: instrumentation-celery 3.10 Ubuntu
3794
runs-on: ubuntu-latest

‎instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Deprecated==1.2.15
4545
docstring_parser==0.16
4646
exceptiongroup==1.2.2
4747
google-api-core[grpc, async_rest]==2.23.0
48-
google-auth[aiohttp]==2.36.0
49-
google-cloud-aiplatform==1.79.0
48+
google-auth[aiohttp]==2.45.0
49+
google-cloud-aiplatform==1.132.0
5050
google-cloud-bigquery==3.27.0
5151
google-cloud-core==2.4.1
5252
google-cloud-resource-manager==1.13.1
@@ -68,7 +68,7 @@ proto-plus==1.25.0
6868
protobuf==5.29.1
6969
pyasn1==0.6.1
7070
pyasn1_modules==0.4.1
71-
pydantic==2.10.3
71+
pydantic==2.12.15
7272
pydantic_core==2.27.1
7373
pytest==7.4.4
7474
pytest-asyncio==0.21.0
@@ -77,7 +77,7 @@ python-dateutil==2.9.0.post0
7777
PyYAML==6.0.2
7878
requests==2.32.3
7979
rsa==4.9
80-
shapely==2.0.6
80+
shapely==2.1.2
8181
fsspec==2025.9.0
8282
six==1.17.0
8383
tomli==2.2.1

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,7 @@ async def do_request():
8787
await runnable(server)
8888
return netloc
8989

90-
loop = asyncio.new_event_loop()
91-
asyncio.set_event_loop(loop)
92-
try:
93-
return loop.run_until_complete(do_request())
94-
finally:
95-
loop.close()
90+
return asyncio.run(do_request())
9691

9792

9893
SCOPE = "opentelemetry.instrumentation.aiohttp_client"

‎instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@
4242

4343

4444
def async_call(coro):
45-
loop = asyncio.new_event_loop()
46-
asyncio.set_event_loop(loop)
47-
try:
48-
return loop.run_until_complete(coro)
49-
finally:
50-
loop.close()
45+
asyncio.run(coro)
5146

5247

5348
class TestAiopgInstrumentor(TestBase):

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
asgiref==3.9.1
22
Deprecated==1.2.14
3-
Django==6.0.2
3+
Django==5.2.11
44
iniconfig==2.0.0
55
packaging==24.0
66
pluggy==1.5.0

0 commit comments

Comments
 (0)