Skip to content

Commit 665d88b

Browse files
tammy-baylis-switammy-baylis-swi
authored
Merge branch 'main' into mysqlconnector-sqlcomment-v5
2 parents f887cd6 + 748c925 commit 665d88b

File tree

63 files changed

+4556
-349
lines changed

Some content is hidden

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

63 files changed

+4556
-349
lines changed

‎.github/component_owners.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ components:
6161
instrumentation/opentelemetry-instrumentation-psycopg:
6262
- federicobond
6363

64+
instrumentation/opentelemetry-instrumentation-pymssql:
65+
- guillaumep
66+
6467
instrumentation/opentelemetry-instrumentation-aiokafka:
6568
- dimastbk
6669

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,28 @@ jobs:
12731273
- name: Run tests
12741274
run: tox -e py38-test-instrumentation-pymysql -- -ra
12751275

1276+
py38-test-instrumentation-pymssql:
1277+
name: instrumentation-pymssql
1278+
runs-on: ubuntu-latest
1279+
steps:
1280+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1281+
uses: actions/checkout@v4
1282+
with:
1283+
repository: open-telemetry/opentelemetry-python-contrib
1284+
ref: ${{ env.CONTRIB_REPO_SHA }}
1285+
1286+
- name: Set up Python 3.8
1287+
uses: actions/setup-python@v5
1288+
with:
1289+
python-version: "3.8"
1290+
architecture: "x64"
1291+
1292+
- name: Install tox
1293+
run: pip install tox-uv
1294+
1295+
- name: Run tests
1296+
run: tox -e py38-test-instrumentation-pymssql -- -ra
1297+
12761298
py38-test-instrumentation-pyramid:
12771299
name: instrumentation-pyramid
12781300
runs-on: ubuntu-latest

‎.github/workflows/lint_0.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,24 @@ jobs:
664664
- name: Run tests
665665
run: tox -e lint-instrumentation-pymysql
666666

667+
lint-instrumentation-pymssql:
668+
name: instrumentation-pymssql
669+
runs-on: ubuntu-latest
670+
steps:
671+
- name: Checkout repo @ SHA - ${{ github.sha }}
672+
uses: actions/checkout@v4
673+
674+
- name: Set up Python 3.13
675+
uses: actions/setup-python@v5
676+
with:
677+
python-version: "3.13"
678+
679+
- name: Install tox
680+
run: pip install tox-uv
681+
682+
- name: Run tests
683+
run: tox -e lint-instrumentation-pymssql
684+
667685
lint-instrumentation-pyramid:
668686
name: instrumentation-pyramid
669687
runs-on: ubuntu-latest

‎.github/workflows/test_1.yml‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,6 +2338,114 @@ jobs:
23382338
- name: Run tests
23392339
run: tox -e pypy3-test-instrumentation-pymysql -- -ra
23402340

2341+
py38-test-instrumentation-pymssql_ubuntu-latest:
2342+
name: instrumentation-pymssql 3.8 Ubuntu
2343+
runs-on: ubuntu-latest
2344+
steps:
2345+
- name: Checkout repo @ SHA - ${{ github.sha }}
2346+
uses: actions/checkout@v4
2347+
2348+
- name: Set up Python 3.8
2349+
uses: actions/setup-python@v5
2350+
with:
2351+
python-version: "3.8"
2352+
2353+
- name: Install tox
2354+
run: pip install tox-uv
2355+
2356+
- name: Run tests
2357+
run: tox -e py38-test-instrumentation-pymssql -- -ra
2358+
2359+
py39-test-instrumentation-pymssql_ubuntu-latest:
2360+
name: instrumentation-pymssql 3.9 Ubuntu
2361+
runs-on: ubuntu-latest
2362+
steps:
2363+
- name: Checkout repo @ SHA - ${{ github.sha }}
2364+
uses: actions/checkout@v4
2365+
2366+
- name: Set up Python 3.9
2367+
uses: actions/setup-python@v5
2368+
with:
2369+
python-version: "3.9"
2370+
2371+
- name: Install tox
2372+
run: pip install tox-uv
2373+
2374+
- name: Run tests
2375+
run: tox -e py39-test-instrumentation-pymssql -- -ra
2376+
2377+
py310-test-instrumentation-pymssql_ubuntu-latest:
2378+
name: instrumentation-pymssql 3.10 Ubuntu
2379+
runs-on: ubuntu-latest
2380+
steps:
2381+
- name: Checkout repo @ SHA - ${{ github.sha }}
2382+
uses: actions/checkout@v4
2383+
2384+
- name: Set up Python 3.10
2385+
uses: actions/setup-python@v5
2386+
with:
2387+
python-version: "3.10"
2388+
2389+
- name: Install tox
2390+
run: pip install tox-uv
2391+
2392+
- name: Run tests
2393+
run: tox -e py310-test-instrumentation-pymssql -- -ra
2394+
2395+
py311-test-instrumentation-pymssql_ubuntu-latest:
2396+
name: instrumentation-pymssql 3.11 Ubuntu
2397+
runs-on: ubuntu-latest
2398+
steps:
2399+
- name: Checkout repo @ SHA - ${{ github.sha }}
2400+
uses: actions/checkout@v4
2401+
2402+
- name: Set up Python 3.11
2403+
uses: actions/setup-python@v5
2404+
with:
2405+
python-version: "3.11"
2406+
2407+
- name: Install tox
2408+
run: pip install tox-uv
2409+
2410+
- name: Run tests
2411+
run: tox -e py311-test-instrumentation-pymssql -- -ra
2412+
2413+
py312-test-instrumentation-pymssql_ubuntu-latest:
2414+
name: instrumentation-pymssql 3.12 Ubuntu
2415+
runs-on: ubuntu-latest
2416+
steps:
2417+
- name: Checkout repo @ SHA - ${{ github.sha }}
2418+
uses: actions/checkout@v4
2419+
2420+
- name: Set up Python 3.12
2421+
uses: actions/setup-python@v5
2422+
with:
2423+
python-version: "3.12"
2424+
2425+
- name: Install tox
2426+
run: pip install tox-uv
2427+
2428+
- name: Run tests
2429+
run: tox -e py312-test-instrumentation-pymssql -- -ra
2430+
2431+
py313-test-instrumentation-pymssql_ubuntu-latest:
2432+
name: instrumentation-pymssql 3.13 Ubuntu
2433+
runs-on: ubuntu-latest
2434+
steps:
2435+
- name: Checkout repo @ SHA - ${{ github.sha }}
2436+
uses: actions/checkout@v4
2437+
2438+
- name: Set up Python 3.13
2439+
uses: actions/setup-python@v5
2440+
with:
2441+
python-version: "3.13"
2442+
2443+
- name: Install tox
2444+
run: pip install tox-uv
2445+
2446+
- name: Run tests
2447+
run: tox -e py313-test-instrumentation-pymssql -- -ra
2448+
23412449
py38-test-instrumentation-pyramid_ubuntu-latest:
23422450
name: instrumentation-pyramid 3.8 Ubuntu
23432451
runs-on: ubuntu-latest
@@ -4407,111 +4515,3 @@ jobs:
44074515

44084516
- name: Run tests
44094517
run: tox -e py311-test-instrumentation-httpx-1 -- -ra
4410-
4411-
py312-test-instrumentation-httpx-0_ubuntu-latest:
4412-
name: instrumentation-httpx-0 3.12 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.12
4419-
uses: actions/setup-python@v5
4420-
with:
4421-
python-version: "3.12"
4422-
4423-
- name: Install tox
4424-
run: pip install tox-uv
4425-
4426-
- name: Run tests
4427-
run: tox -e py312-test-instrumentation-httpx-0 -- -ra
4428-
4429-
py312-test-instrumentation-httpx-1_ubuntu-latest:
4430-
name: instrumentation-httpx-1 3.12 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.12
4437-
uses: actions/setup-python@v5
4438-
with:
4439-
python-version: "3.12"
4440-
4441-
- name: Install tox
4442-
run: pip install tox-uv
4443-
4444-
- name: Run tests
4445-
run: tox -e py312-test-instrumentation-httpx-1 -- -ra
4446-
4447-
py313-test-instrumentation-httpx-1_ubuntu-latest:
4448-
name: instrumentation-httpx-1 3.13 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.13
4455-
uses: actions/setup-python@v5
4456-
with:
4457-
python-version: "3.13"
4458-
4459-
- name: Install tox
4460-
run: pip install tox-uv
4461-
4462-
- name: Run tests
4463-
run: tox -e py313-test-instrumentation-httpx-1 -- -ra
4464-
4465-
pypy3-test-instrumentation-httpx-0_ubuntu-latest:
4466-
name: instrumentation-httpx-0 pypy-3.8 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 pypy-3.8
4473-
uses: actions/setup-python@v5
4474-
with:
4475-
python-version: "pypy-3.8"
4476-
4477-
- name: Install tox
4478-
run: pip install tox-uv
4479-
4480-
- name: Run tests
4481-
run: tox -e pypy3-test-instrumentation-httpx-0 -- -ra
4482-
4483-
pypy3-test-instrumentation-httpx-1_ubuntu-latest:
4484-
name: instrumentation-httpx-1 pypy-3.8 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 pypy-3.8
4491-
uses: actions/setup-python@v5
4492-
with:
4493-
python-version: "pypy-3.8"
4494-
4495-
- name: Install tox
4496-
run: pip install tox-uv
4497-
4498-
- name: Run tests
4499-
run: tox -e pypy3-test-instrumentation-httpx-1 -- -ra
4500-
4501-
py38-test-util-http_ubuntu-latest:
4502-
name: util-http 3.8 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.8
4509-
uses: actions/setup-python@v5
4510-
with:
4511-
python-version: "3.8"
4512-
4513-
- name: Install tox
4514-
run: pip install tox-uv
4515-
4516-
- name: Run tests
4517-
run: tox -e py38-test-util-http -- -ra

0 commit comments

Comments
 (0)