Skip to content

Commit 44da24c

Browse files
authored
Merge branch 'main' into mike/ci-check-links-diff-only
2 parents 3cc969c + d9d586c commit 44da24c

11 files changed

Lines changed: 27 additions & 7 deletions

File tree

RELEASING.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@ To keep the process lightweight, it's OK to approve the PRs you generate and mer
4444

4545
## Preparing a new patch release
4646

47-
* Backport pull request(s) to the release branch.
47+
### Backporting
48+
49+
Creating manual backports of pull request(s) requires the `backport` label to be added in order to have a green CI. Even if there where
50+
no changes on a repo the patch release preparation workflow requires an empty `## Unreleased` header in `CHANGELOG.md`.
51+
52+
Backport of pull request(s) can be automated by a workflow only if there where no changes that will create conflicts in the release
53+
branch, unfortunately every `CHANGELOG.md` change will create one.
54+
55+
To use the workflow to backport pull request(s) to the release branch:
4856
* Run the [Backport workflow](https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/backport.yml).
4957
* Press the "Run workflow" button, then select the release branch from the dropdown list,
5058
e.g. `release/v1.9.x`, then enter the pull request number that you want to backport,
@@ -54,6 +62,9 @@ To keep the process lightweight, it's OK to approve the PRs you generate and mer
5462
* Review and merge the backport pull request that it generates.
5563
* Merge a pull request to the release branch updating the `CHANGELOG.md`.
5664
* The heading for the unreleased entries should be `## Unreleased`.
65+
66+
### Preparing a patch release
67+
5768
* Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/prepare-patch-release.yml).
5869
* Press the "Run workflow" button, then select the release branch from the dropdown list,
5970
e.g. `release/v1.9.x`, and click the "Run workflow" button below that.

instrumentation-genai/opentelemetry-instrumentation-anthropic/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+
- Update `opentelemetry-util-genai` dependency range to `>= 0.4b0.dev, <0.5b0`
11+
([#4520](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4520))
1012
- Fix compatibility with wrapt 2.x by using positional arguments in `wrap_function_wrapper()` calls
1113
([#4445](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4445))
1214

instrumentation-genai/opentelemetry-instrumentation-anthropic/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies = [
2828
"opentelemetry-api ~= 1.39",
2929
"opentelemetry-instrumentation ~= 0.60b0",
3030
"opentelemetry-semantic-conventions ~= 0.60b0",
31-
"opentelemetry-util-genai >= 0.2b0, <0.4b0",
31+
"opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
3232
]
3333

3434
[project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-anthropic/tests/requirements.oldest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This variant of the requirements aims to test the system using
1616
# the oldest supported version of external dependencies.
1717

18-
-e util/opentelemetry-util-genai
18+
-e util/opentelemetry-util-genai # todo: update to 0.4b0 when it's released
1919
anthropic==0.51.0
2020
pytest==7.4.4
2121
pytest-vcr==1.0.2

instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk/CHANGELOG.md

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

88
## Unreleased
99

10+
- Update `opentelemetry-util-genai` dependency range to `>= 0.4b0.dev, <0.5b0`
11+
([#4520](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4520))
12+
1013
### Added
1114

instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies = [
2727
"opentelemetry-api ~= 1.39",
2828
"opentelemetry-instrumentation ~= 0.60b0",
2929
"opentelemetry-semantic-conventions ~= 0.60b0",
30-
"opentelemetry-util-genai >= 0.2b0, <0.4b0",
30+
"opentelemetry-util-genai >= 0.2b0, <0.5b0",
3131
]
3232

3333
[project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk/tests/requirements.oldest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# This variant of the requirements aims to test the system using
1616
# the oldest supported version of external dependencies.
1717

18-
-e util/opentelemetry-util-genai
1918
claude-agent-sdk==0.1.14
2019
pytest==7.4.4
2120
pytest-vcr==1.0.2
@@ -24,5 +23,6 @@ wrapt==1.16.0
2423
opentelemetry-api==1.39 # when updating, also update in pyproject.toml
2524
opentelemetry-sdk==1.39 # when updating, also update in pyproject.toml
2625
opentelemetry-semantic-conventions==0.60b0 # when updating, also update in pyproject.toml
26+
opentelemetry-util-genai==0.2b0 # when updating, also update in pyproject.toml
2727

2828
-e instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk

instrumentation-genai/opentelemetry-instrumentation-openai-v2/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 2.4b0 (2026-05-01)
11+
1012

1113
- Migrate experimental path from deprecated `LLMInvocation` to `InferenceInvocation`,
1214
using `handler.start_inference()` and `invocation.stop()`/`invocation.fail()` directly

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/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__ = "2.4b0.dev"
15+
__version__ = "2.5b0.dev"

util/opentelemetry-util-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.4b0 (2026-05-01)
11+
1012
- Add `AgentInvocation` type with `invoke_agent` span lifecycle
1113
([#4274](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4274))
1214
- Add metrics support for EmbeddingInvocation

0 commit comments

Comments
 (0)