Skip to content

Commit e678135

Browse files
Merge branch 'main' into genaisdk_instrumentation
2 parents 7647992 + 8e3cd65 commit e678135

File tree

10 files changed

+286
-176
lines changed

10 files changed

+286
-176
lines changed

.github/workflows/test_0.yml

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616

1717
jobs:
1818

19-
py38-test-instrumentation-openai-v2-0_ubuntu-latest:
20-
name: instrumentation-openai-v2-0 3.8 Ubuntu
19+
py38-test-instrumentation-openai-v2-oldest_ubuntu-latest:
20+
name: instrumentation-openai-v2-oldest 3.8 Ubuntu
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -32,10 +32,10 @@ jobs:
3232
run: pip install tox-uv
3333

3434
- name: Run tests
35-
run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra
35+
run: tox -e py38-test-instrumentation-openai-v2-oldest -- -ra
3636

37-
py38-test-instrumentation-openai-v2-1_ubuntu-latest:
38-
name: instrumentation-openai-v2-1 3.8 Ubuntu
37+
py38-test-instrumentation-openai-v2-latest_ubuntu-latest:
38+
name: instrumentation-openai-v2-latest 3.8 Ubuntu
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -50,10 +50,10 @@ jobs:
5050
run: pip install tox-uv
5151

5252
- name: Run tests
53-
run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
53+
run: tox -e py38-test-instrumentation-openai-v2-latest -- -ra
5454

55-
py39-test-instrumentation-openai-v2-0_ubuntu-latest:
56-
name: instrumentation-openai-v2-0 3.9 Ubuntu
55+
py39-test-instrumentation-openai-v2-oldest_ubuntu-latest:
56+
name: instrumentation-openai-v2-oldest 3.9 Ubuntu
5757
runs-on: ubuntu-latest
5858
steps:
5959
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -68,10 +68,10 @@ jobs:
6868
run: pip install tox-uv
6969

7070
- name: Run tests
71-
run: tox -e py39-test-instrumentation-openai-v2-0 -- -ra
71+
run: tox -e py39-test-instrumentation-openai-v2-oldest -- -ra
7272

73-
py39-test-instrumentation-openai-v2-1_ubuntu-latest:
74-
name: instrumentation-openai-v2-1 3.9 Ubuntu
73+
py39-test-instrumentation-openai-v2-latest_ubuntu-latest:
74+
name: instrumentation-openai-v2-latest 3.9 Ubuntu
7575
runs-on: ubuntu-latest
7676
steps:
7777
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -86,10 +86,10 @@ jobs:
8686
run: pip install tox-uv
8787

8888
- name: Run tests
89-
run: tox -e py39-test-instrumentation-openai-v2-1 -- -ra
89+
run: tox -e py39-test-instrumentation-openai-v2-latest -- -ra
9090

91-
py310-test-instrumentation-openai-v2-0_ubuntu-latest:
92-
name: instrumentation-openai-v2-0 3.10 Ubuntu
91+
py310-test-instrumentation-openai-v2-oldest_ubuntu-latest:
92+
name: instrumentation-openai-v2-oldest 3.10 Ubuntu
9393
runs-on: ubuntu-latest
9494
steps:
9595
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -104,10 +104,10 @@ jobs:
104104
run: pip install tox-uv
105105

106106
- name: Run tests
107-
run: tox -e py310-test-instrumentation-openai-v2-0 -- -ra
107+
run: tox -e py310-test-instrumentation-openai-v2-oldest -- -ra
108108

109-
py310-test-instrumentation-openai-v2-1_ubuntu-latest:
110-
name: instrumentation-openai-v2-1 3.10 Ubuntu
109+
py310-test-instrumentation-openai-v2-latest_ubuntu-latest:
110+
name: instrumentation-openai-v2-latest 3.10 Ubuntu
111111
runs-on: ubuntu-latest
112112
steps:
113113
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -122,10 +122,10 @@ jobs:
122122
run: pip install tox-uv
123123

124124
- name: Run tests
125-
run: tox -e py310-test-instrumentation-openai-v2-1 -- -ra
125+
run: tox -e py310-test-instrumentation-openai-v2-latest -- -ra
126126

127-
py311-test-instrumentation-openai-v2-0_ubuntu-latest:
128-
name: instrumentation-openai-v2-0 3.11 Ubuntu
127+
py311-test-instrumentation-openai-v2-oldest_ubuntu-latest:
128+
name: instrumentation-openai-v2-oldest 3.11 Ubuntu
129129
runs-on: ubuntu-latest
130130
steps:
131131
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -140,10 +140,10 @@ jobs:
140140
run: pip install tox-uv
141141

142142
- name: Run tests
143-
run: tox -e py311-test-instrumentation-openai-v2-0 -- -ra
143+
run: tox -e py311-test-instrumentation-openai-v2-oldest -- -ra
144144

145-
py311-test-instrumentation-openai-v2-1_ubuntu-latest:
146-
name: instrumentation-openai-v2-1 3.11 Ubuntu
145+
py311-test-instrumentation-openai-v2-latest_ubuntu-latest:
146+
name: instrumentation-openai-v2-latest 3.11 Ubuntu
147147
runs-on: ubuntu-latest
148148
steps:
149149
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -158,10 +158,10 @@ jobs:
158158
run: pip install tox-uv
159159

160160
- name: Run tests
161-
run: tox -e py311-test-instrumentation-openai-v2-1 -- -ra
161+
run: tox -e py311-test-instrumentation-openai-v2-latest -- -ra
162162

163-
py312-test-instrumentation-openai-v2-0_ubuntu-latest:
164-
name: instrumentation-openai-v2-0 3.12 Ubuntu
163+
py312-test-instrumentation-openai-v2-oldest_ubuntu-latest:
164+
name: instrumentation-openai-v2-oldest 3.12 Ubuntu
165165
runs-on: ubuntu-latest
166166
steps:
167167
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -176,10 +176,10 @@ jobs:
176176
run: pip install tox-uv
177177

178178
- name: Run tests
179-
run: tox -e py312-test-instrumentation-openai-v2-0 -- -ra
179+
run: tox -e py312-test-instrumentation-openai-v2-oldest -- -ra
180180

181-
py312-test-instrumentation-openai-v2-1_ubuntu-latest:
182-
name: instrumentation-openai-v2-1 3.12 Ubuntu
181+
py312-test-instrumentation-openai-v2-latest_ubuntu-latest:
182+
name: instrumentation-openai-v2-latest 3.12 Ubuntu
183183
runs-on: ubuntu-latest
184184
steps:
185185
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -194,10 +194,10 @@ jobs:
194194
run: pip install tox-uv
195195

196196
- name: Run tests
197-
run: tox -e py312-test-instrumentation-openai-v2-1 -- -ra
197+
run: tox -e py312-test-instrumentation-openai-v2-latest -- -ra
198198

199-
py313-test-instrumentation-openai-v2-0_ubuntu-latest:
200-
name: instrumentation-openai-v2-0 3.13 Ubuntu
199+
py313-test-instrumentation-openai-v2-oldest_ubuntu-latest:
200+
name: instrumentation-openai-v2-oldest 3.13 Ubuntu
201201
runs-on: ubuntu-latest
202202
steps:
203203
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -212,10 +212,10 @@ jobs:
212212
run: pip install tox-uv
213213

214214
- name: Run tests
215-
run: tox -e py313-test-instrumentation-openai-v2-0 -- -ra
215+
run: tox -e py313-test-instrumentation-openai-v2-oldest -- -ra
216216

217-
py313-test-instrumentation-openai-v2-1_ubuntu-latest:
218-
name: instrumentation-openai-v2-1 3.13 Ubuntu
217+
py313-test-instrumentation-openai-v2-latest_ubuntu-latest:
218+
name: instrumentation-openai-v2-latest 3.13 Ubuntu
219219
runs-on: ubuntu-latest
220220
steps:
221221
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -230,10 +230,10 @@ jobs:
230230
run: pip install tox-uv
231231

232232
- name: Run tests
233-
run: tox -e py313-test-instrumentation-openai-v2-1 -- -ra
233+
run: tox -e py313-test-instrumentation-openai-v2-latest -- -ra
234234

235-
pypy3-test-instrumentation-openai-v2-0_ubuntu-latest:
236-
name: instrumentation-openai-v2-0 pypy-3.8 Ubuntu
235+
pypy3-test-instrumentation-openai-v2-oldest_ubuntu-latest:
236+
name: instrumentation-openai-v2-oldest pypy-3.8 Ubuntu
237237
runs-on: ubuntu-latest
238238
steps:
239239
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -248,10 +248,10 @@ jobs:
248248
run: pip install tox-uv
249249

250250
- name: Run tests
251-
run: tox -e pypy3-test-instrumentation-openai-v2-0 -- -ra
251+
run: tox -e pypy3-test-instrumentation-openai-v2-oldest -- -ra
252252

253-
pypy3-test-instrumentation-openai-v2-1_ubuntu-latest:
254-
name: instrumentation-openai-v2-1 pypy-3.8 Ubuntu
253+
pypy3-test-instrumentation-openai-v2-latest_ubuntu-latest:
254+
name: instrumentation-openai-v2-latest pypy-3.8 Ubuntu
255255
runs-on: ubuntu-latest
256256
steps:
257257
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -266,10 +266,10 @@ jobs:
266266
run: pip install tox-uv
267267

268268
- name: Run tests
269-
run: tox -e pypy3-test-instrumentation-openai-v2-1 -- -ra
269+
run: tox -e pypy3-test-instrumentation-openai-v2-latest -- -ra
270270

271-
py38-test-instrumentation-vertexai-0_ubuntu-latest:
272-
name: instrumentation-vertexai-0 3.8 Ubuntu
271+
py38-test-instrumentation-vertexai-oldest_ubuntu-latest:
272+
name: instrumentation-vertexai-oldest 3.8 Ubuntu
273273
runs-on: ubuntu-latest
274274
steps:
275275
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -284,10 +284,10 @@ jobs:
284284
run: pip install tox-uv
285285

286286
- name: Run tests
287-
run: tox -e py38-test-instrumentation-vertexai-0 -- -ra
287+
run: tox -e py38-test-instrumentation-vertexai-oldest -- -ra
288288

289-
py38-test-instrumentation-vertexai-1_ubuntu-latest:
290-
name: instrumentation-vertexai-1 3.8 Ubuntu
289+
py38-test-instrumentation-vertexai-latest_ubuntu-latest:
290+
name: instrumentation-vertexai-latest 3.8 Ubuntu
291291
runs-on: ubuntu-latest
292292
steps:
293293
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -302,10 +302,10 @@ jobs:
302302
run: pip install tox-uv
303303

304304
- name: Run tests
305-
run: tox -e py38-test-instrumentation-vertexai-1 -- -ra
305+
run: tox -e py38-test-instrumentation-vertexai-latest -- -ra
306306

307-
py39-test-instrumentation-vertexai-0_ubuntu-latest:
308-
name: instrumentation-vertexai-0 3.9 Ubuntu
307+
py39-test-instrumentation-vertexai-oldest_ubuntu-latest:
308+
name: instrumentation-vertexai-oldest 3.9 Ubuntu
309309
runs-on: ubuntu-latest
310310
steps:
311311
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -320,10 +320,10 @@ jobs:
320320
run: pip install tox-uv
321321

322322
- name: Run tests
323-
run: tox -e py39-test-instrumentation-vertexai-0 -- -ra
323+
run: tox -e py39-test-instrumentation-vertexai-oldest -- -ra
324324

325-
py39-test-instrumentation-vertexai-1_ubuntu-latest:
326-
name: instrumentation-vertexai-1 3.9 Ubuntu
325+
py39-test-instrumentation-vertexai-latest_ubuntu-latest:
326+
name: instrumentation-vertexai-latest 3.9 Ubuntu
327327
runs-on: ubuntu-latest
328328
steps:
329329
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -338,10 +338,10 @@ jobs:
338338
run: pip install tox-uv
339339

340340
- name: Run tests
341-
run: tox -e py39-test-instrumentation-vertexai-1 -- -ra
341+
run: tox -e py39-test-instrumentation-vertexai-latest -- -ra
342342

343-
py310-test-instrumentation-vertexai-0_ubuntu-latest:
344-
name: instrumentation-vertexai-0 3.10 Ubuntu
343+
py310-test-instrumentation-vertexai-oldest_ubuntu-latest:
344+
name: instrumentation-vertexai-oldest 3.10 Ubuntu
345345
runs-on: ubuntu-latest
346346
steps:
347347
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -356,10 +356,10 @@ jobs:
356356
run: pip install tox-uv
357357

358358
- name: Run tests
359-
run: tox -e py310-test-instrumentation-vertexai-0 -- -ra
359+
run: tox -e py310-test-instrumentation-vertexai-oldest -- -ra
360360

361-
py310-test-instrumentation-vertexai-1_ubuntu-latest:
362-
name: instrumentation-vertexai-1 3.10 Ubuntu
361+
py310-test-instrumentation-vertexai-latest_ubuntu-latest:
362+
name: instrumentation-vertexai-latest 3.10 Ubuntu
363363
runs-on: ubuntu-latest
364364
steps:
365365
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -374,10 +374,10 @@ jobs:
374374
run: pip install tox-uv
375375

376376
- name: Run tests
377-
run: tox -e py310-test-instrumentation-vertexai-1 -- -ra
377+
run: tox -e py310-test-instrumentation-vertexai-latest -- -ra
378378

379-
py311-test-instrumentation-vertexai-0_ubuntu-latest:
380-
name: instrumentation-vertexai-0 3.11 Ubuntu
379+
py311-test-instrumentation-vertexai-oldest_ubuntu-latest:
380+
name: instrumentation-vertexai-oldest 3.11 Ubuntu
381381
runs-on: ubuntu-latest
382382
steps:
383383
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -392,10 +392,10 @@ jobs:
392392
run: pip install tox-uv
393393

394394
- name: Run tests
395-
run: tox -e py311-test-instrumentation-vertexai-0 -- -ra
395+
run: tox -e py311-test-instrumentation-vertexai-oldest -- -ra
396396

397-
py311-test-instrumentation-vertexai-1_ubuntu-latest:
398-
name: instrumentation-vertexai-1 3.11 Ubuntu
397+
py311-test-instrumentation-vertexai-latest_ubuntu-latest:
398+
name: instrumentation-vertexai-latest 3.11 Ubuntu
399399
runs-on: ubuntu-latest
400400
steps:
401401
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -410,10 +410,10 @@ jobs:
410410
run: pip install tox-uv
411411

412412
- name: Run tests
413-
run: tox -e py311-test-instrumentation-vertexai-1 -- -ra
413+
run: tox -e py311-test-instrumentation-vertexai-latest -- -ra
414414

415-
py312-test-instrumentation-vertexai-0_ubuntu-latest:
416-
name: instrumentation-vertexai-0 3.12 Ubuntu
415+
py312-test-instrumentation-vertexai-oldest_ubuntu-latest:
416+
name: instrumentation-vertexai-oldest 3.12 Ubuntu
417417
runs-on: ubuntu-latest
418418
steps:
419419
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -428,10 +428,10 @@ jobs:
428428
run: pip install tox-uv
429429

430430
- name: Run tests
431-
run: tox -e py312-test-instrumentation-vertexai-0 -- -ra
431+
run: tox -e py312-test-instrumentation-vertexai-oldest -- -ra
432432

433-
py312-test-instrumentation-vertexai-1_ubuntu-latest:
434-
name: instrumentation-vertexai-1 3.12 Ubuntu
433+
py312-test-instrumentation-vertexai-latest_ubuntu-latest:
434+
name: instrumentation-vertexai-latest 3.12 Ubuntu
435435
runs-on: ubuntu-latest
436436
steps:
437437
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -446,10 +446,10 @@ jobs:
446446
run: pip install tox-uv
447447

448448
- name: Run tests
449-
run: tox -e py312-test-instrumentation-vertexai-1 -- -ra
449+
run: tox -e py312-test-instrumentation-vertexai-latest -- -ra
450450

451-
py313-test-instrumentation-vertexai-0_ubuntu-latest:
452-
name: instrumentation-vertexai-0 3.13 Ubuntu
451+
py313-test-instrumentation-vertexai-oldest_ubuntu-latest:
452+
name: instrumentation-vertexai-oldest 3.13 Ubuntu
453453
runs-on: ubuntu-latest
454454
steps:
455455
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -464,10 +464,10 @@ jobs:
464464
run: pip install tox-uv
465465

466466
- name: Run tests
467-
run: tox -e py313-test-instrumentation-vertexai-0 -- -ra
467+
run: tox -e py313-test-instrumentation-vertexai-oldest -- -ra
468468

469-
py313-test-instrumentation-vertexai-1_ubuntu-latest:
470-
name: instrumentation-vertexai-1 3.13 Ubuntu
469+
py313-test-instrumentation-vertexai-latest_ubuntu-latest:
470+
name: instrumentation-vertexai-latest 3.13 Ubuntu
471471
runs-on: ubuntu-latest
472472
steps:
473473
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -482,7 +482,7 @@ jobs:
482482
run: pip install tox-uv
483483

484484
- name: Run tests
485-
run: tox -e py313-test-instrumentation-vertexai-1 -- -ra
485+
run: tox -e py313-test-instrumentation-vertexai-latest -- -ra
486486

487487
py39-test-instrumentation-google-genai-oldest_ubuntu-latest:
488488
name: instrumentation-google-genai-oldest 3.9 Ubuntu

instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)