Skip to content

Commit e081502

Browse files
tammy-baylis-switammy-baylis-swi
authored
Merge branch 'main' into enable-commenter-instrument-connection
2 parents 1526aaa + c09a299 commit e081502

File tree

303 files changed

+21516
-1852
lines changed

Some content is hidden

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

303 files changed

+21516
-1852
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: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ env:
1919

2020
jobs:
2121

22-
py38-test-instrumentation-openai-v2-0:
23-
name: instrumentation-openai-v2-0
22+
py38-test-instrumentation-openai-v2-oldest:
23+
name: instrumentation-openai-v2-oldest
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -39,10 +39,10 @@ jobs:
3939
run: pip install tox-uv
4040

4141
- name: Run tests
42-
run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra
42+
run: tox -e py38-test-instrumentation-openai-v2-oldest -- -ra
4343

44-
py38-test-instrumentation-openai-v2-1:
45-
name: instrumentation-openai-v2-1
44+
py38-test-instrumentation-openai-v2-latest:
45+
name: instrumentation-openai-v2-latest
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -61,10 +61,10 @@ jobs:
6161
run: pip install tox-uv
6262

6363
- name: Run tests
64-
run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
64+
run: tox -e py38-test-instrumentation-openai-v2-latest -- -ra
6565

66-
py38-test-instrumentation-vertexai-0:
67-
name: instrumentation-vertexai-0
66+
py38-test-instrumentation-vertexai-oldest:
67+
name: instrumentation-vertexai-oldest
6868
runs-on: ubuntu-latest
6969
steps:
7070
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -83,10 +83,10 @@ jobs:
8383
run: pip install tox-uv
8484

8585
- name: Run tests
86-
run: tox -e py38-test-instrumentation-vertexai-0 -- -ra
86+
run: tox -e py38-test-instrumentation-vertexai-oldest -- -ra
8787

88-
py38-test-instrumentation-vertexai-1:
89-
name: instrumentation-vertexai-1
88+
py38-test-instrumentation-vertexai-latest:
89+
name: instrumentation-vertexai-latest
9090
runs-on: ubuntu-latest
9191
steps:
9292
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -105,7 +105,7 @@ jobs:
105105
run: pip install tox-uv
106106

107107
- name: Run tests
108-
run: tox -e py38-test-instrumentation-vertexai-1 -- -ra
108+
run: tox -e py38-test-instrumentation-vertexai-latest -- -ra
109109

110110
py38-test-resource-detector-container:
111111
name: resource-detector-container
@@ -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/fossa.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: FOSSA scanning
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
fossa:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
17+
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
with:
19+
api-key: ${{secrets.FOSSA_API_KEY}}
20+
team: OpenTelemetry

‎.github/workflows/lint_0.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ jobs:
5252
- name: Run tests
5353
run: tox -e lint-instrumentation-vertexai
5454

55+
lint-instrumentation-google-genai:
56+
name: instrumentation-google-genai
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.13
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.13"
66+
67+
- name: Install tox
68+
run: pip install tox-uv
69+
70+
- name: Run tests
71+
run: tox -e lint-instrumentation-google-genai
72+
5573
lint-resource-detector-container:
5674
name: resource-detector-container
5775
runs-on: ubuntu-latest
@@ -664,6 +682,24 @@ jobs:
664682
- name: Run tests
665683
run: tox -e lint-instrumentation-pymysql
666684

685+
lint-instrumentation-pymssql:
686+
name: instrumentation-pymssql
687+
runs-on: ubuntu-latest
688+
steps:
689+
- name: Checkout repo @ SHA - ${{ github.sha }}
690+
uses: actions/checkout@v4
691+
692+
- name: Set up Python 3.13
693+
uses: actions/setup-python@v5
694+
with:
695+
python-version: "3.13"
696+
697+
- name: Install tox
698+
run: pip install tox-uv
699+
700+
- name: Run tests
701+
run: tox -e lint-instrumentation-pymssql
702+
667703
lint-instrumentation-pyramid:
668704
name: instrumentation-pyramid
669705
runs-on: ubuntu-latest

‎.github/workflows/package-prepare-patch-release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-vertexai
1213
description: 'Package to be released'
1314
required: true
15+
run-name: "[Package][${{ inputs.package }}] Prepare patch release"
16+
1417
jobs:
1518
prepare-patch-release:
1619
runs-on: ubuntu-latest

‎.github/workflows/package-prepare-release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-vertexai
1213
description: 'Package to be released'
1314
required: true
1415

16+
run-name: "[Package][${{ inputs.package }}] Prepare release"
1517
jobs:
1618
prereqs:
1719
runs-on: ubuntu-latest

‎.github/workflows/package-release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-vertexai
1213
description: 'Package to be released'
1314
required: true
15+
run-name: "[Package][${{ inputs.package }}] Release"
1416
jobs:
1517
release:
1618
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)