Skip to content

Commit 890b0c8

Browse files
authored
Merge branch 'main' into asyncio-snippet
2 parents 9b8197d + ad2fe81 commit 890b0c8

File tree

31 files changed

+1005
-214
lines changed

31 files changed

+1005
-214
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Prepare patch release"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516

.github/workflows/package-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Release"

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
- `opentelemetry-instrumentation-openai-v2` Update doc for OpenAI Instrumentation to support OpenAI Compatible Platforms
1717
([#3279](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3279))
18-
- `opentelemetry-instrumentation-system-metrics` Add `process` metrics and deprecated `process.runtime` prefixed ones
18+
- `opentelemetry-instrumentation-system-metrics` Add `process` metrics and deprecated `process.runtime` prefixed ones
1919
([#3250](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3250))
2020
- `opentelemetry-instrumentation-botocore` Add support for GenAI user events and lazy initialize tracer
2121
([#3258](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3258))
@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525
([#3275](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3275))
2626
- `opentelemetry-instrumentation-botocore` Add support for GenAI tool events
2727
([#3302](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3302))
28+
- `opentelemetry-instrumentation-botocore` Add support for GenAI metrics
29+
([#3326](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3326))
2830
- `opentelemetry-instrumentation` make it simpler to initialize auto-instrumentation programmatically
2931
([#3273](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3273))
3032
- Add `opentelemetry-instrumentation-vertexai>=2.0b0` to `opentelemetry-bootstrap`
@@ -39,6 +41,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3941
([#3247](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3247))
4042
- `opentelemetry-instrumentation-asyncpg` Fix fallback for empty queries.
4143
([#3253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3253))
44+
- `opentelemetry-instrumentation-threading` Fix broken context typehints
45+
([#3322](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3322))
46+
- `opentelemetry-instrumentation-requests` always record span status code in duration metric
47+
([#3323](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3323))
4248

4349
## Version 1.30.0/0.51b0 (2025-02-03)
4450

@@ -98,7 +104,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
98104

99105
### Breaking changes
100106

101-
- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
107+
- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
102108
([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
103109
- `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in
104110
([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112))

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ To release a package as `1.0` stable, the package:
101101

102102
## Semantic Convention status of instrumentations
103103

104-
In our efforts to maintain optimal user experience and prevent breaking changes for transitioning into stable semantic conventions, OpenTelemetry Python is adopting the semantic convention migration plan for several instrumentations. Currently this plan is only being adopted for [HTTP-related instrumentations](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md), but will eventually cover all types. Please refer to the `semconv status` column of the [instrumentation README](instrumentation/README.md) of the current status of instrumentations' semantic conventions. The possible values are `experimental`, `stable` and `migration` referring to [status](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.31.0/specification/document-status.md#lifecycle-status) of that particular semantic convention. `Migration` refers to an instrumentation that currently supports the migration plan.
104+
In our efforts to maintain optimal user experience and prevent breaking changes for transitioning into stable semantic conventions, OpenTelemetry Python is adopting the semantic convention migration plan for several instrumentations. Currently this plan is only being adopted for [HTTP-related instrumentations](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md), but will eventually cover all types. Please refer to the `semconv status` column of the [instrumentation README](instrumentation/README.md) of the current status of instrumentations' semantic conventions. The possible values are `development`, `stable` and `migration` referring to [status](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.31.0/specification/document-status.md#lifecycle-status) of that particular semantic convention. `Migration` refers to an instrumentation that currently supports the migration plan.
105105

106106
## Contributing
107107

@@ -113,7 +113,7 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
113113

114114
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
115115

116-
- [Emídio Neto](https://github.com/emdneto), Zenvia
116+
- [Emídio Neto](https://github.com/emdneto), PicPay
117117
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
118118
- [Owais Lone](https://github.com/owais), Splunk
119119
- [Pablo Collins](https://github.com/pmcollins), Splunk

RELEASING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
> - opentelemetry-sdk-extension-aws
2323
> - opentelemetry-instrumentation-openai-v2
2424
> - opentelemetry-instrumentation-vertexai
25+
> - opentelemetry-instrumentation-google-genai
2526
>
2627
> These libraries are also excluded from the general release.
2728
@@ -79,6 +80,8 @@ The workflow will create a pull request that should be merged in order to procee
7980
> - opentelemetry-resource-detector-azure
8081
> - opentelemetry-sdk-extension-aws
8182
> - opentelemetry-instrumentation-openai-v2
83+
> - opentelemetry-instrumentation-vertexai
84+
> - opentelemetry-instrumentation-google-genai
8285
>
8386
> These libraries are also excluded from the general patch release.
8487

gen-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-c dev-requirements.txt
22
astor==0.8.1
3-
jinja2==3.1.4
3+
jinja2==3.1.6
44
markupsafe==2.0.1
55
ruff==0.6.9
66
requests

instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## Version 0.1b0 (2025-03-05)
11+
1012
- Add support for async and streaming.
1113
([#3298](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3298))
1214

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
# This version should stay below "1.0" until the fundamentals
1818
# in "TODOS.md" have been addressed. Please revisit the TODOs
1919
# listed there before bumping to a stable version.
20-
__version__ = "0.0.2.dev"
20+
__version__ = "0.2b0.dev"

instrumentation-genai/opentelemetry-instrumentation-vertexai/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Implement uninstrument for `opentelemetry-instrumentation-vertexai`
11+
([#3328](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3328))
12+
1013
## Version 2.0b0 (2025-02-24)
1114

1215
- Added Vertex AI spans for request parameters

0 commit comments

Comments
 (0)