Skip to content

Commit da21d03

Browse files
authored
Merge branch 'main' into aidan/allow-the-user-to-cancel-stream-v2
2 parents 8e23a2c + be0c03e commit da21d03

266 files changed

Lines changed: 22987 additions & 8572 deletions

File tree

Some content is hidden

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

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[codespell]
22
# skipping auto generated folders
3-
skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv
3+
skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv,*/cassettes
44
ignore-words-list = ot

.github/component_owners.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ components:
2525
instrumentation/opentelemetry-instrumentation-urllib3:
2626
- shalevr
2727

28-
instrumentation-genai/:
29-
- karthikscale3
30-
- lmolkova
31-
- lzchen
32-
- gyliu513
33-
- nirga
34-
- alizenhom
35-
- codefromthecrypt
36-
3728
processor/opentelemetry-processor-baggage:
3829
- codeboten
3930

@@ -45,8 +36,10 @@ components:
4536
- jj22ee
4637

4738
util/opentelemetry-util-genai:
39+
- Cirilla-zmh
4840
- DylanRussell
4941
- keith-decker
42+
- lmolkova
5043

5144
instrumentation-genai/opentelemetry-instrumentation-langchain:
5245
- zhirafovod
@@ -55,5 +48,15 @@ components:
5548
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
5649
- nagkumar91
5750

51+
instrumentation-genai/opentelemetry-instrumentation-openai-v2:
52+
- lmolkova
53+
5854
instrumentation-genai/opentelemetry-instrumentation-anthropic:
5955
- vasantteja
56+
- anirudha
57+
- MikeGoldsmith
58+
59+
instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk:
60+
- vasantteja
61+
- anirudha
62+
- MikeGoldsmith

.github/workflows/core_contrib_test_0.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,8 +3023,8 @@ jobs:
30233023
- name: Run tests
30243024
run: tox -e py39-test-instrumentation-asyncio -- -ra
30253025

3026-
py39-test-instrumentation-cassandra:
3027-
name: instrumentation-cassandra
3026+
py39-test-instrumentation-cassandra-driver:
3027+
name: instrumentation-cassandra-driver
30283028
runs-on: ubuntu-latest
30293029
timeout-minutes: 30
30303030
steps:
@@ -3051,7 +3051,37 @@ jobs:
30513051
run: pip install tox-uv
30523052

30533053
- name: Run tests
3054-
run: tox -e py39-test-instrumentation-cassandra -- -ra
3054+
run: tox -e py39-test-instrumentation-cassandra-driver -- -ra
3055+
3056+
py39-test-instrumentation-cassandra-scylla:
3057+
name: instrumentation-cassandra-scylla
3058+
runs-on: ubuntu-latest
3059+
timeout-minutes: 30
3060+
steps:
3061+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3062+
uses: actions/checkout@v4
3063+
with:
3064+
repository: open-telemetry/opentelemetry-python-contrib
3065+
ref: ${{ env.CONTRIB_REPO_SHA }}
3066+
3067+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3068+
uses: actions/checkout@v4
3069+
with:
3070+
repository: open-telemetry/opentelemetry-python
3071+
ref: ${{ env.CORE_REPO_SHA }}
3072+
path: opentelemetry-python
3073+
3074+
- name: Set up Python 3.9
3075+
uses: actions/setup-python@v5
3076+
with:
3077+
python-version: "3.9"
3078+
architecture: "x64"
3079+
3080+
- name: Install tox
3081+
run: pip install tox-uv
3082+
3083+
- name: Run tests
3084+
run: tox -e py39-test-instrumentation-cassandra-scylla -- -ra
30553085

30563086
py39-test-processor-baggage:
30573087
name: processor-baggage

.github/workflows/generate_workflows_lib/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers = [
2222
"Programming Language :: Python :: 3.11",
2323
"Programming Language :: Python :: 3.12",
2424
"Programming Language :: Python :: 3.13",
25+
"Programming Language :: Python :: 3.14",
2526
"Typing :: Typed",
2627
]
2728
dependencies = ["Jinja2", "tox"]

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
5454
"py311": "3.11",
5555
"py312": "3.12",
5656
"py313": "3.13",
57+
"py314": "3.14",
5758
}
5859

5960
test_job_datas = []

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
4242
uses: actions/checkout@v4
4343

44-
- name: Set up Python 3.13
44+
- name: Set up Python 3.14
4545
uses: actions/setup-python@v5
4646
with:
47-
python-version: "3.13"
47+
python-version: "3.14"
4848

4949
- name: Install tox
5050
run: pip install tox-uv

0 commit comments

Comments
 (0)