Skip to content

Commit af5b462

Browse files
lukeina2zlukeina2z
authored
Merge branch 'main' into mcp-prfoo
2 parents 2a4793c + 34db73e commit af5b462

File tree

163 files changed

+3861
-1029
lines changed

Some content is hidden

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

163 files changed

+3861
-1029
lines changed

‎.github/workflows/lint_0.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,25 @@ jobs:
5151
- name: Run tests
5252
run: tox -e lint-instrumentation-openai-v2
5353

54+
lint-instrumentation-openai_agents-v2:
55+
name: instrumentation-openai_agents-v2
56+
runs-on: ubuntu-latest
57+
timeout-minutes: 30
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-openai_agents-v2
72+
5473
lint-instrumentation-vertexai:
5574
name: instrumentation-vertexai
5675
runs-on: ubuntu-latest

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

‎.github/workflows/test_0.yml‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,158 @@ jobs:
260260
- name: Run tests
261261
run: tox -e pypy3-test-instrumentation-openai-v2-latest -- -ra
262262

263+
py310-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
264+
name: instrumentation-openai_agents-v2-oldest 3.10 Ubuntu
265+
runs-on: ubuntu-latest
266+
timeout-minutes: 30
267+
steps:
268+
- name: Checkout repo @ SHA - ${{ github.sha }}
269+
uses: actions/checkout@v4
270+
271+
- name: Set up Python 3.10
272+
uses: actions/setup-python@v5
273+
with:
274+
python-version: "3.10"
275+
276+
- name: Install tox
277+
run: pip install tox-uv
278+
279+
- name: Run tests
280+
run: tox -e py310-test-instrumentation-openai_agents-v2-oldest -- -ra
281+
282+
py310-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
283+
name: instrumentation-openai_agents-v2-latest 3.10 Ubuntu
284+
runs-on: ubuntu-latest
285+
timeout-minutes: 30
286+
steps:
287+
- name: Checkout repo @ SHA - ${{ github.sha }}
288+
uses: actions/checkout@v4
289+
290+
- name: Set up Python 3.10
291+
uses: actions/setup-python@v5
292+
with:
293+
python-version: "3.10"
294+
295+
- name: Install tox
296+
run: pip install tox-uv
297+
298+
- name: Run tests
299+
run: tox -e py310-test-instrumentation-openai_agents-v2-latest -- -ra
300+
301+
py311-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
302+
name: instrumentation-openai_agents-v2-oldest 3.11 Ubuntu
303+
runs-on: ubuntu-latest
304+
timeout-minutes: 30
305+
steps:
306+
- name: Checkout repo @ SHA - ${{ github.sha }}
307+
uses: actions/checkout@v4
308+
309+
- name: Set up Python 3.11
310+
uses: actions/setup-python@v5
311+
with:
312+
python-version: "3.11"
313+
314+
- name: Install tox
315+
run: pip install tox-uv
316+
317+
- name: Run tests
318+
run: tox -e py311-test-instrumentation-openai_agents-v2-oldest -- -ra
319+
320+
py311-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
321+
name: instrumentation-openai_agents-v2-latest 3.11 Ubuntu
322+
runs-on: ubuntu-latest
323+
timeout-minutes: 30
324+
steps:
325+
- name: Checkout repo @ SHA - ${{ github.sha }}
326+
uses: actions/checkout@v4
327+
328+
- name: Set up Python 3.11
329+
uses: actions/setup-python@v5
330+
with:
331+
python-version: "3.11"
332+
333+
- name: Install tox
334+
run: pip install tox-uv
335+
336+
- name: Run tests
337+
run: tox -e py311-test-instrumentation-openai_agents-v2-latest -- -ra
338+
339+
py312-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
340+
name: instrumentation-openai_agents-v2-oldest 3.12 Ubuntu
341+
runs-on: ubuntu-latest
342+
timeout-minutes: 30
343+
steps:
344+
- name: Checkout repo @ SHA - ${{ github.sha }}
345+
uses: actions/checkout@v4
346+
347+
- name: Set up Python 3.12
348+
uses: actions/setup-python@v5
349+
with:
350+
python-version: "3.12"
351+
352+
- name: Install tox
353+
run: pip install tox-uv
354+
355+
- name: Run tests
356+
run: tox -e py312-test-instrumentation-openai_agents-v2-oldest -- -ra
357+
358+
py312-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
359+
name: instrumentation-openai_agents-v2-latest 3.12 Ubuntu
360+
runs-on: ubuntu-latest
361+
timeout-minutes: 30
362+
steps:
363+
- name: Checkout repo @ SHA - ${{ github.sha }}
364+
uses: actions/checkout@v4
365+
366+
- name: Set up Python 3.12
367+
uses: actions/setup-python@v5
368+
with:
369+
python-version: "3.12"
370+
371+
- name: Install tox
372+
run: pip install tox-uv
373+
374+
- name: Run tests
375+
run: tox -e py312-test-instrumentation-openai_agents-v2-latest -- -ra
376+
377+
py313-test-instrumentation-openai_agents-v2-oldest_ubuntu-latest:
378+
name: instrumentation-openai_agents-v2-oldest 3.13 Ubuntu
379+
runs-on: ubuntu-latest
380+
timeout-minutes: 30
381+
steps:
382+
- name: Checkout repo @ SHA - ${{ github.sha }}
383+
uses: actions/checkout@v4
384+
385+
- name: Set up Python 3.13
386+
uses: actions/setup-python@v5
387+
with:
388+
python-version: "3.13"
389+
390+
- name: Install tox
391+
run: pip install tox-uv
392+
393+
- name: Run tests
394+
run: tox -e py313-test-instrumentation-openai_agents-v2-oldest -- -ra
395+
396+
py313-test-instrumentation-openai_agents-v2-latest_ubuntu-latest:
397+
name: instrumentation-openai_agents-v2-latest 3.13 Ubuntu
398+
runs-on: ubuntu-latest
399+
timeout-minutes: 30
400+
steps:
401+
- name: Checkout repo @ SHA - ${{ github.sha }}
402+
uses: actions/checkout@v4
403+
404+
- name: Set up Python 3.13
405+
uses: actions/setup-python@v5
406+
with:
407+
python-version: "3.13"
408+
409+
- name: Install tox
410+
run: pip install tox-uv
411+
412+
- name: Run tests
413+
run: tox -e py313-test-instrumentation-openai_agents-v2-latest -- -ra
414+
263415
py39-test-instrumentation-vertexai-oldest_ubuntu-latest:
264416
name: instrumentation-vertexai-oldest 3.9 Ubuntu
265417
runs-on: ubuntu-latest

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
1212
## Unreleased
1313

14+
## Version 1.38.0/0.59b0 (2025-10-16)
15+
1416
### Fixed
1517

18+
- `opentelemetry-instrumentation-flask`: Do not record `http.server.duration` metrics for excluded URLs.
19+
([#3794](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3794))
1620
- `opentelemetry-instrumentation-botocore`: migrate off the deprecated events API to use the logs API
1721
([#3624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3624))
1822
- `opentelemetry-instrumentation-dbapi`: fix crash retrieving libpq version when enabling commenter with psycopg

‎RELEASING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
> - opentelemetry-resource-detector-azure
2323
> - opentelemetry-sdk-extension-aws
2424
> - opentelemetry-instrumentation-openai-v2
25+
> - opentelemetry-instrumentation-openai-agents-v2
2526
> - opentelemetry-instrumentation-vertexai
2627
> - opentelemetry-instrumentation-google-genai
2728
> - opentelemetry-instrumentation-langchain
@@ -37,6 +38,7 @@ to pick a specific package to release. It follows the same versioning strategy a
3738
Long-term package release branch follows `package-release/{package-name}/v{major}.{minor}.x` (or `package-release/{package-name}/v{major}.{minor}bx`) naming pattern.
3839

3940
The workflow will create two pull requests, one against the `main` and one against the `package-release/` branch; both should be merged in order to proceed with the release.
41+
To keep the process lightweight, it's OK to approve the PRs you generate and merge without additional reviews.
4042

4143
## Preparing a new patch release
4244

@@ -88,6 +90,7 @@ The workflow will create a pull request that should be merged in order to procee
8890
> - opentelemetry-resource-detector-azure
8991
> - opentelemetry-sdk-extension-aws
9092
> - opentelemetry-instrumentation-openai-v2
93+
> - opentelemetry-instrumentation-openai-agents-v2
9194
> - opentelemetry-instrumentation-vertexai
9295
> - opentelemetry-instrumentation-google-genai
9396
> - opentelemetry-instrumentation-langchain

‎_template/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.59b0.dev"
15+
__version__ = "0.60b0.dev"

‎eachdist.ini‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.38.0.dev
19+
version=1.39.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -35,7 +35,7 @@ packages=
3535
opentelemetry-exporter-credential-provider-gcp
3636

3737
[prerelease]
38-
version=0.59b0.dev
38+
version=0.60b0.dev
3939

4040
packages=
4141
all
@@ -54,6 +54,7 @@ packages=
5454
opentelemetry-instrumentation-google-genai
5555
opentelemetry-instrumentation-vertexai
5656
opentelemetry-instrumentation-openai-v2
57+
opentelemetry-instrumentation-openai-agents-v2
5758
opentelemetry-instrumentation-test
5859
opentelemetry-instrumentation-langchain
5960
opentelemetry-instrumentation-mcp

‎exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.59b0.dev"
15+
__version__ = "0.60b0.dev"

0 commit comments

Comments
 (0)