Skip to content

Commit 3bdfd8f

Browse files
alizenhomalizenhom
committed
run tox -e generate & tox -e generate-workflows 
1 parent a457df2 commit 3bdfd8f

File tree

6 files changed

+237
-111
lines changed

6 files changed

+237
-111
lines changed

‎.github/workflows/lint_0.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@ env:
1616

1717
jobs:
1818

19+
lint-instrumentation-openai:
20+
name: instrumentation-openai
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout repo @ SHA - ${{ github.sha }}
24+
uses: actions/checkout@v4
25+
26+
- name: Set up Python 3.12
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: "3.12"
30+
31+
- name: Install tox
32+
run: pip install tox
33+
34+
- name: Run tests
35+
run: tox -e lint-instrumentation-openai
36+
1937
lint-resource-detector-container:
2038
name: resource-detector-container
2139
runs-on: ubuntu-latest

‎.github/workflows/test_0.yml‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,114 @@ env:
1616

1717
jobs:
1818

19+
py38-test-instrumentation-openai_ubuntu-latest:
20+
name: instrumentation-openai 3.8 Ubuntu
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout repo @ SHA - ${{ github.sha }}
24+
uses: actions/checkout@v4
25+
26+
- name: Set up Python 3.8
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: "3.8"
30+
31+
- name: Install tox
32+
run: pip install tox
33+
34+
- name: Run tests
35+
run: tox -e py38-test-instrumentation-openai -- -ra
36+
37+
py39-test-instrumentation-openai_ubuntu-latest:
38+
name: instrumentation-openai 3.9 Ubuntu
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Checkout repo @ SHA - ${{ github.sha }}
42+
uses: actions/checkout@v4
43+
44+
- name: Set up Python 3.9
45+
uses: actions/setup-python@v5
46+
with:
47+
python-version: "3.9"
48+
49+
- name: Install tox
50+
run: pip install tox
51+
52+
- name: Run tests
53+
run: tox -e py39-test-instrumentation-openai -- -ra
54+
55+
py310-test-instrumentation-openai_ubuntu-latest:
56+
name: instrumentation-openai 3.10 Ubuntu
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.10
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.10"
66+
67+
- name: Install tox
68+
run: pip install tox
69+
70+
- name: Run tests
71+
run: tox -e py310-test-instrumentation-openai -- -ra
72+
73+
py311-test-instrumentation-openai_ubuntu-latest:
74+
name: instrumentation-openai 3.11 Ubuntu
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Checkout repo @ SHA - ${{ github.sha }}
78+
uses: actions/checkout@v4
79+
80+
- name: Set up Python 3.11
81+
uses: actions/setup-python@v5
82+
with:
83+
python-version: "3.11"
84+
85+
- name: Install tox
86+
run: pip install tox
87+
88+
- name: Run tests
89+
run: tox -e py311-test-instrumentation-openai -- -ra
90+
91+
py312-test-instrumentation-openai_ubuntu-latest:
92+
name: instrumentation-openai 3.12 Ubuntu
93+
runs-on: ubuntu-latest
94+
steps:
95+
- name: Checkout repo @ SHA - ${{ github.sha }}
96+
uses: actions/checkout@v4
97+
98+
- name: Set up Python 3.12
99+
uses: actions/setup-python@v5
100+
with:
101+
python-version: "3.12"
102+
103+
- name: Install tox
104+
run: pip install tox
105+
106+
- name: Run tests
107+
run: tox -e py312-test-instrumentation-openai -- -ra
108+
109+
pypy3-test-instrumentation-openai_ubuntu-latest:
110+
name: instrumentation-openai pypy-3.8 Ubuntu
111+
runs-on: ubuntu-latest
112+
steps:
113+
- name: Checkout repo @ SHA - ${{ github.sha }}
114+
uses: actions/checkout@v4
115+
116+
- name: Set up Python pypy-3.8
117+
uses: actions/setup-python@v5
118+
with:
119+
python-version: "pypy-3.8"
120+
121+
- name: Install tox
122+
run: pip install tox
123+
124+
- name: Run tests
125+
run: tox -e pypy3-test-instrumentation-openai -- -ra
126+
19127
py38-test-resource-detector-container_ubuntu-latest:
20128
name: resource-detector-container 3.8 Ubuntu
21129
runs-on: ubuntu-latest
@@ -4407,111 +4515,3 @@ jobs:
44074515

44084516
- name: Run tests
44094517
run: tox -e py311-test-instrumentation-pymemcache-2 -- -ra
4410-
4411-
py311-test-instrumentation-pymemcache-3_ubuntu-latest:
4412-
name: instrumentation-pymemcache-3 3.11 Ubuntu
4413-
runs-on: ubuntu-latest
4414-
steps:
4415-
- name: Checkout repo @ SHA - ${{ github.sha }}
4416-
uses: actions/checkout@v4
4417-
4418-
- name: Set up Python 3.11
4419-
uses: actions/setup-python@v5
4420-
with:
4421-
python-version: "3.11"
4422-
4423-
- name: Install tox
4424-
run: pip install tox
4425-
4426-
- name: Run tests
4427-
run: tox -e py311-test-instrumentation-pymemcache-3 -- -ra
4428-
4429-
py311-test-instrumentation-pymemcache-4_ubuntu-latest:
4430-
name: instrumentation-pymemcache-4 3.11 Ubuntu
4431-
runs-on: ubuntu-latest
4432-
steps:
4433-
- name: Checkout repo @ SHA - ${{ github.sha }}
4434-
uses: actions/checkout@v4
4435-
4436-
- name: Set up Python 3.11
4437-
uses: actions/setup-python@v5
4438-
with:
4439-
python-version: "3.11"
4440-
4441-
- name: Install tox
4442-
run: pip install tox
4443-
4444-
- name: Run tests
4445-
run: tox -e py311-test-instrumentation-pymemcache-4 -- -ra
4446-
4447-
py312-test-instrumentation-pymemcache-0_ubuntu-latest:
4448-
name: instrumentation-pymemcache-0 3.12 Ubuntu
4449-
runs-on: ubuntu-latest
4450-
steps:
4451-
- name: Checkout repo @ SHA - ${{ github.sha }}
4452-
uses: actions/checkout@v4
4453-
4454-
- name: Set up Python 3.12
4455-
uses: actions/setup-python@v5
4456-
with:
4457-
python-version: "3.12"
4458-
4459-
- name: Install tox
4460-
run: pip install tox
4461-
4462-
- name: Run tests
4463-
run: tox -e py312-test-instrumentation-pymemcache-0 -- -ra
4464-
4465-
py312-test-instrumentation-pymemcache-1_ubuntu-latest:
4466-
name: instrumentation-pymemcache-1 3.12 Ubuntu
4467-
runs-on: ubuntu-latest
4468-
steps:
4469-
- name: Checkout repo @ SHA - ${{ github.sha }}
4470-
uses: actions/checkout@v4
4471-
4472-
- name: Set up Python 3.12
4473-
uses: actions/setup-python@v5
4474-
with:
4475-
python-version: "3.12"
4476-
4477-
- name: Install tox
4478-
run: pip install tox
4479-
4480-
- name: Run tests
4481-
run: tox -e py312-test-instrumentation-pymemcache-1 -- -ra
4482-
4483-
py312-test-instrumentation-pymemcache-2_ubuntu-latest:
4484-
name: instrumentation-pymemcache-2 3.12 Ubuntu
4485-
runs-on: ubuntu-latest
4486-
steps:
4487-
- name: Checkout repo @ SHA - ${{ github.sha }}
4488-
uses: actions/checkout@v4
4489-
4490-
- name: Set up Python 3.12
4491-
uses: actions/setup-python@v5
4492-
with:
4493-
python-version: "3.12"
4494-
4495-
- name: Install tox
4496-
run: pip install tox
4497-
4498-
- name: Run tests
4499-
run: tox -e py312-test-instrumentation-pymemcache-2 -- -ra
4500-
4501-
py312-test-instrumentation-pymemcache-3_ubuntu-latest:
4502-
name: instrumentation-pymemcache-3 3.12 Ubuntu
4503-
runs-on: ubuntu-latest
4504-
steps:
4505-
- name: Checkout repo @ SHA - ${{ github.sha }}
4506-
uses: actions/checkout@v4
4507-
4508-
- name: Set up Python 3.12
4509-
uses: actions/setup-python@v5
4510-
with:
4511-
python-version: "3.12"
4512-
4513-
- name: Install tox
4514-
run: pip install tox
4515-
4516-
- name: Run tests
4517-
run: tox -e py312-test-instrumentation-pymemcache-3 -- -ra

‎.github/workflows/test_1.yml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,114 @@ env:
1616

1717
jobs:
1818

19+
py311-test-instrumentation-pymemcache-3_ubuntu-latest:
20+
name: instrumentation-pymemcache-3 3.11 Ubuntu
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout repo @ SHA - ${{ github.sha }}
24+
uses: actions/checkout@v4
25+
26+
- name: Set up Python 3.11
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: "3.11"
30+
31+
- name: Install tox
32+
run: pip install tox
33+
34+
- name: Run tests
35+
run: tox -e py311-test-instrumentation-pymemcache-3 -- -ra
36+
37+
py311-test-instrumentation-pymemcache-4_ubuntu-latest:
38+
name: instrumentation-pymemcache-4 3.11 Ubuntu
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Checkout repo @ SHA - ${{ github.sha }}
42+
uses: actions/checkout@v4
43+
44+
- name: Set up Python 3.11
45+
uses: actions/setup-python@v5
46+
with:
47+
python-version: "3.11"
48+
49+
- name: Install tox
50+
run: pip install tox
51+
52+
- name: Run tests
53+
run: tox -e py311-test-instrumentation-pymemcache-4 -- -ra
54+
55+
py312-test-instrumentation-pymemcache-0_ubuntu-latest:
56+
name: instrumentation-pymemcache-0 3.12 Ubuntu
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.12
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.12"
66+
67+
- name: Install tox
68+
run: pip install tox
69+
70+
- name: Run tests
71+
run: tox -e py312-test-instrumentation-pymemcache-0 -- -ra
72+
73+
py312-test-instrumentation-pymemcache-1_ubuntu-latest:
74+
name: instrumentation-pymemcache-1 3.12 Ubuntu
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Checkout repo @ SHA - ${{ github.sha }}
78+
uses: actions/checkout@v4
79+
80+
- name: Set up Python 3.12
81+
uses: actions/setup-python@v5
82+
with:
83+
python-version: "3.12"
84+
85+
- name: Install tox
86+
run: pip install tox
87+
88+
- name: Run tests
89+
run: tox -e py312-test-instrumentation-pymemcache-1 -- -ra
90+
91+
py312-test-instrumentation-pymemcache-2_ubuntu-latest:
92+
name: instrumentation-pymemcache-2 3.12 Ubuntu
93+
runs-on: ubuntu-latest
94+
steps:
95+
- name: Checkout repo @ SHA - ${{ github.sha }}
96+
uses: actions/checkout@v4
97+
98+
- name: Set up Python 3.12
99+
uses: actions/setup-python@v5
100+
with:
101+
python-version: "3.12"
102+
103+
- name: Install tox
104+
run: pip install tox
105+
106+
- name: Run tests
107+
run: tox -e py312-test-instrumentation-pymemcache-2 -- -ra
108+
109+
py312-test-instrumentation-pymemcache-3_ubuntu-latest:
110+
name: instrumentation-pymemcache-3 3.12 Ubuntu
111+
runs-on: ubuntu-latest
112+
steps:
113+
- name: Checkout repo @ SHA - ${{ github.sha }}
114+
uses: actions/checkout@v4
115+
116+
- name: Set up Python 3.12
117+
uses: actions/setup-python@v5
118+
with:
119+
python-version: "3.12"
120+
121+
- name: Install tox
122+
run: pip install tox
123+
124+
- name: Run tests
125+
run: tox -e py312-test-instrumentation-pymemcache-3 -- -ra
126+
19127
py312-test-instrumentation-pymemcache-4_ubuntu-latest:
20128
name: instrumentation-pymemcache-4 3.12 Ubuntu
21129
runs-on: ubuntu-latest

‎instrumentation/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
| [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging | No | experimental
3030
| [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python >= 8.0, < 10.0 | No | experimental
3131
| [opentelemetry-instrumentation-mysqlclient](./opentelemetry-instrumentation-mysqlclient) | mysqlclient < 3 | No | experimental
32-
| [opentelemetry-instrumentation-openai](./opentelemetry-instrumentation-openai-v2) | openai >= 0.27.0 | No | experimental
32+
| [opentelemetry-instrumentation-openai](./opentelemetry-instrumentation-openai) | openai >= 0.27.0 | No | experimental
3333
| [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | No | experimental
3434
| [opentelemetry-instrumentation-psycopg](./opentelemetry-instrumentation-psycopg) | psycopg >= 3.1.0 | No | experimental
3535
| [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | No | experimental

‎opentelemetry-contrib-instrumentations/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies = [
5757
"opentelemetry-instrumentation-logging==0.49b0.dev",
5858
"opentelemetry-instrumentation-mysql==0.49b0.dev",
5959
"opentelemetry-instrumentation-mysqlclient==0.49b0.dev",
60-
"opentelemetry-instrumentation-openai==0.49b0.dev",
60+
"opentelemetry-instrumentation-openai==2.0.0.dev",
6161
"opentelemetry-instrumentation-pika==0.49b0.dev",
6262
"opentelemetry-instrumentation-psycopg==0.49b0.dev",
6363
"opentelemetry-instrumentation-psycopg2==0.49b0.dev",

‎opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
},
123123
{
124124
"library": "openai >= 0.27.0",
125-
"instrumentation": "opentelemetry-instrumentation-openai-v2==0.49b0.dev",
125+
"instrumentation": "opentelemetry-instrumentation-openai-v2==2.0.0.dev",
126126
},
127127
{
128128
"library": "pika >= 0.12.0",

0 commit comments

Comments
 (0)