Skip to content

Commit 0fa1f9e

Browse files
Cirilla-zmhbendruckerxrmxDylanRussellvasantteja
authored
chore: sync upstream/main into main (#125)
Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com> Signed-off-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> Co-authored-by: Ben Drucker <bvdrucker@gmail.com> Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> Co-authored-by: DylanRussell <DylanRussell@users.noreply.github.com> Co-authored-by: Teja <vasant.teja@gmail.com> Co-authored-by: Liudmila Molkova <neskazu@gmail.com> Co-authored-by: Hector Hernandez <39923391+hectorhdzg@users.noreply.github.com> Co-authored-by: Ezzio Moreira <enzziom@gmail.com> Co-authored-by: otelbot[bot] <197425009+otelbot[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Punit Maheshwari <punitmahes@gmail.com> Co-authored-by: Aaron Abbott <aaronabbott@google.com> Co-authored-by: Tammy Baylis <96076570+tammy-baylis-swi@users.noreply.github.com> Co-authored-by: Sam Mosleh <41725025+sam-mosleh@users.noreply.github.com> Co-authored-by: Andrey Karabanov <78631409+forafox@users.noreply.github.com> Co-authored-by: Lukas Hering <40302054+herin049@users.noreply.github.com> Co-authored-by: DJ Spatoulas <dspatoulas21@gmail.com> Co-authored-by: wangxiaolei <fatelei@gmail.com> Co-authored-by: Mads Bisgaard <126242332+bisgaard-itis@users.noreply.github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: Felix Hildén <felix.hilden@gmail.com> Co-authored-by: Martin Lundholm <bm.lundholm@gmail.com> Co-authored-by: tammy-baylis-swi <tammy.baylis@solarwinds.com> Co-authored-by: Mahad Janjua <134644284+majanjua-amzn@users.noreply.github.com> Co-authored-by: Penmatsa Tanoj Pavan Surya Varma <pavansvarma888@gmail.com> Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> Co-authored-by: Boris Churzin <boris@nilus.com> Co-authored-by: Nagkumar Arkalgud <nagkumar91@users.noreply.github.com> Co-authored-by: Stanislav Zmiev <zmievsa@gmail.com> Co-authored-by: Ritesh Tripathi <ritesh6263tripathi@gmail.com> Co-authored-by: deepakdinesh1123 <52698821+deepakdinesh1123@users.noreply.github.com> Co-authored-by: RKest <68107862+RKest@users.noreply.github.com> Co-authored-by: saurabh-saraswat <85618497+saurabh-saraswat@users.noreply.github.com> Co-authored-by: Anuraag (Rag) Agrawal <anuraaga@gmail.com> Co-authored-by: Manuel Lang <manuellang183@gmail.com> Co-authored-by: Michał Wiatrowski <wiatrowskimich@gmail.com> Co-authored-by: Gershon Papi <papigers93@gmail.com> Co-authored-by: Wiktoria Walczak <98548576+wikaaaaa@users.noreply.github.com> Co-authored-by: Ridhima Satam <ridhimasatam@gmail.com> Co-authored-by: Antoine D <antoine.desbordes@gmail.com> Co-authored-by: Andrea Mattè <andreamatte97@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Dinmukhamed Mailibay <47117969+dinmukhamedm@users.noreply.github.com> Co-authored-by: Rima-ag <55252887+Rima-ag@users.noreply.github.com>
2 parents a26e3b5 + 07401b0 commit 0fa1f9e

346 files changed

Lines changed: 28601 additions & 9066 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: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
components:
22

3+
instrumentation/opentelemetry-instrumentation-aiohttp-client:
4+
- herin049
5+
36
instrumentation/opentelemetry-instrumentation-aiokafka:
47
- dimastbk
58

@@ -22,15 +25,6 @@ components:
2225
instrumentation/opentelemetry-instrumentation-urllib3:
2326
- shalevr
2427

25-
instrumentation-genai/:
26-
- karthikscale3
27-
- lmolkova
28-
- lzchen
29-
- gyliu513
30-
- nirga
31-
- alizenhom
32-
- codefromthecrypt
33-
3428
processor/opentelemetry-processor-baggage:
3529
- codeboten
3630

@@ -42,8 +36,10 @@ components:
4236
- jj22ee
4337

4438
util/opentelemetry-util-genai:
39+
- Cirilla-zmh
4540
- DylanRussell
4641
- keith-decker
42+
- lmolkova
4743

4844
instrumentation-genai/opentelemetry-instrumentation-langchain:
4945
- zhirafovod
@@ -52,8 +48,21 @@ components:
5248
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
5349
- nagkumar91
5450

51+
instrumentation-genai/opentelemetry-instrumentation-openai-v2:
52+
- lmolkova
53+
54+
instrumentation-genai/opentelemetry-instrumentation-anthropic:
55+
- vasantteja
56+
- anirudha
57+
- MikeGoldsmith
58+
59+
instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk:
60+
- vasantteja
61+
- anirudha
62+
- MikeGoldsmith
63+
5564
# LoongSuite Extension
5665
instrumentation-loongsuite:
57-
- cirilla-zmh
66+
- Cirilla-zmh
5867
- ralf0131
59-
- 123liuziming
68+
- 123liuziming

‎.github/scripts/sync-upstream.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ create_pr() {
173173
title="chore: sync ${upstream_desc} into ${BASE_BRANCH}"
174174
local body_file
175175
body_file=$(mktemp)
176-
trap 'rm -f "$body_file"' EXIT
176+
trap 'rm -f "${body_file:-}"' EXIT
177177
cat <<EOF >"$body_file"
178178
## Summary
179179
- Merge upstream \`${upstream_desc}\` into \`${BASE_BRANCH}\`

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 123 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,66 @@ jobs:
203203
- name: Run tests
204204
run: tox -e py39-test-instrumentation-google-genai-latest -- -ra
205205

206+
py39-test-instrumentation-anthropic-oldest:
207+
name: instrumentation-anthropic-oldest
208+
runs-on: ubuntu-latest
209+
timeout-minutes: 30
210+
steps:
211+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
212+
uses: actions/checkout@v4
213+
with:
214+
repository: open-telemetry/opentelemetry-python-contrib
215+
ref: ${{ env.CONTRIB_REPO_SHA }}
216+
217+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
218+
uses: actions/checkout@v4
219+
with:
220+
repository: open-telemetry/opentelemetry-python
221+
ref: ${{ env.CORE_REPO_SHA }}
222+
path: opentelemetry-python
223+
224+
- name: Set up Python 3.9
225+
uses: actions/setup-python@v5
226+
with:
227+
python-version: "3.9"
228+
architecture: "x64"
229+
230+
- name: Install tox
231+
run: pip install tox-uv
232+
233+
- name: Run tests
234+
run: tox -e py39-test-instrumentation-anthropic-oldest -- -ra
235+
236+
py39-test-instrumentation-anthropic-latest:
237+
name: instrumentation-anthropic-latest
238+
runs-on: ubuntu-latest
239+
timeout-minutes: 30
240+
steps:
241+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
242+
uses: actions/checkout@v4
243+
with:
244+
repository: open-telemetry/opentelemetry-python-contrib
245+
ref: ${{ env.CONTRIB_REPO_SHA }}
246+
247+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
248+
uses: actions/checkout@v4
249+
with:
250+
repository: open-telemetry/opentelemetry-python
251+
ref: ${{ env.CORE_REPO_SHA }}
252+
path: opentelemetry-python
253+
254+
- name: Set up Python 3.9
255+
uses: actions/setup-python@v5
256+
with:
257+
python-version: "3.9"
258+
architecture: "x64"
259+
260+
- name: Install tox
261+
run: pip install tox-uv
262+
263+
- name: Run tests
264+
run: tox -e py39-test-instrumentation-anthropic-latest -- -ra
265+
206266
py39-test-resource-detector-containerid:
207267
name: resource-detector-containerid
208268
runs-on: ubuntu-latest
@@ -1163,6 +1223,36 @@ jobs:
11631223
- name: Run tests
11641224
run: tox -e py39-test-instrumentation-flask-2 -- -ra
11651225

1226+
py39-test-instrumentation-flask-3:
1227+
name: instrumentation-flask-3
1228+
runs-on: ubuntu-latest
1229+
timeout-minutes: 30
1230+
steps:
1231+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1232+
uses: actions/checkout@v4
1233+
with:
1234+
repository: open-telemetry/opentelemetry-python-contrib
1235+
ref: ${{ env.CONTRIB_REPO_SHA }}
1236+
1237+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
1238+
uses: actions/checkout@v4
1239+
with:
1240+
repository: open-telemetry/opentelemetry-python
1241+
ref: ${{ env.CORE_REPO_SHA }}
1242+
path: opentelemetry-python
1243+
1244+
- name: Set up Python 3.9
1245+
uses: actions/setup-python@v5
1246+
with:
1247+
python-version: "3.9"
1248+
architecture: "x64"
1249+
1250+
- name: Install tox
1251+
run: pip install tox-uv
1252+
1253+
- name: Run tests
1254+
run: tox -e py39-test-instrumentation-flask-3 -- -ra
1255+
11661256
py39-test-instrumentation-urllib:
11671257
name: instrumentation-urllib
11681258
runs-on: ubuntu-latest
@@ -2933,8 +3023,38 @@ jobs:
29333023
- name: Run tests
29343024
run: tox -e py39-test-instrumentation-asyncio -- -ra
29353025

2936-
py39-test-instrumentation-cassandra:
2937-
name: instrumentation-cassandra
3026+
py39-test-instrumentation-cassandra-driver:
3027+
name: instrumentation-cassandra-driver
3028+
runs-on: ubuntu-latest
3029+
timeout-minutes: 30
3030+
steps:
3031+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3032+
uses: actions/checkout@v4
3033+
with:
3034+
repository: open-telemetry/opentelemetry-python-contrib
3035+
ref: ${{ env.CONTRIB_REPO_SHA }}
3036+
3037+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3038+
uses: actions/checkout@v4
3039+
with:
3040+
repository: open-telemetry/opentelemetry-python
3041+
ref: ${{ env.CORE_REPO_SHA }}
3042+
path: opentelemetry-python
3043+
3044+
- name: Set up Python 3.9
3045+
uses: actions/setup-python@v5
3046+
with:
3047+
python-version: "3.9"
3048+
architecture: "x64"
3049+
3050+
- name: Install tox
3051+
run: pip install tox-uv
3052+
3053+
- name: Run tests
3054+
run: tox -e py39-test-instrumentation-cassandra-driver -- -ra
3055+
3056+
py39-test-instrumentation-cassandra-scylla:
3057+
name: instrumentation-cassandra-scylla
29383058
runs-on: ubuntu-latest
29393059
timeout-minutes: 30
29403060
steps:
@@ -2961,7 +3081,7 @@ jobs:
29613081
run: pip install tox-uv
29623082

29633083
- name: Run tests
2964-
run: tox -e py39-test-instrumentation-cassandra -- -ra
3084+
run: tox -e py39-test-instrumentation-cassandra-scylla -- -ra
29653085

29663086
py39-test-processor-baggage:
29673087
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)