Skip to content

Commit 8e23a2c

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

341 files changed

Lines changed: 34774 additions & 2885 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.

‎.github/component_owners.yml‎

Lines changed: 6 additions & 0 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

@@ -51,3 +54,6 @@ components:
5154

5255
instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
5356
- nagkumar91
57+
58+
instrumentation-genai/opentelemetry-instrumentation-anthropic:
59+
- vasantteja

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 90 additions & 0 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def get_contrib_job_datas(tox_envs: list) -> list:
143143

144144
contrib_job_datas.append(
145145
{
146-
"ui_name": (f"{groups['name']}" f"{contrib_requirements}"),
146+
"ui_name": (f"{groups['name']}{contrib_requirements}"),
147147
"tox_env": tox_env,
148148
}
149149
)

‎.github/workflows/lint_0.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,25 @@ jobs:
108108
- name: Run tests
109109
run: tox -e lint-instrumentation-google-genai
110110

111+
lint-instrumentation-anthropic:
112+
name: instrumentation-anthropic
113+
runs-on: ubuntu-latest
114+
timeout-minutes: 30
115+
steps:
116+
- name: Checkout repo @ SHA - ${{ github.sha }}
117+
uses: actions/checkout@v4
118+
119+
- name: Set up Python 3.13
120+
uses: actions/setup-python@v5
121+
with:
122+
python-version: "3.13"
123+
124+
- name: Install tox
125+
run: pip install tox-uv
126+
127+
- name: Run tests
128+
run: tox -e lint-instrumentation-anthropic
129+
111130
lint-resource-detector-containerid:
112131
name: resource-detector-containerid
113132
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)
⚡