Skip to content

Commit e4094ab

Browse files
authored
Merge branch 'main' into more_genai_changes
2 parents 83d4ed8 + 734429e commit e4094ab

35 files changed

Lines changed: 60 additions & 51 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3333
([#3898](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3898))
3434
- `opentelemetry-instrumentation`: Add experimental metrics attributes Labeler utility
3535
([#4288](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4288))
36+
- `opentelemetry-instrumentation`: Register `OTEL_SEMCONV_STABILITY_OPT_IN` in `environment_variables.py` so `opentelemetry-instrument` exposes a `--semconv_stability_opt_in` CLI argument
37+
([#4438](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4438))
3638

3739
### Fixed
3840

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ readme-renderer==42.0
1010
bleach==4.1.0 # transient dependency for readme-renderer
1111
markupsafe>=2.0.1
1212
codespell==2.1.0
13-
requests==2.32.3
13+
requests==2.33.1
1414
ruamel.yaml==0.17.21
1515
flaky==3.7.0
1616
pre-commit==3.7.0

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protobuf==6.33.5
1111
py-cpuinfo==9.0.0
1212
pytest==7.4.4
1313
python-snappy==0.7.1
14-
requests==2.32.3
14+
requests==2.33.1
1515
tomli==2.0.1
1616
typing_extensions==4.12.2
1717
urllib3==2.2.2

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.40",
2929
"opentelemetry-instrumentation ~= 0.61b0",
3030
"opentelemetry-semantic-conventions ~= 0.61b0",
31-
"opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
31+
"opentelemetry-util-genai >= 0.4b0, <0.5b0",
3232
]
3333

3434
[project.optional-dependencies]

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
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 # todo: update to 0.4b0 when it's released
1918
anthropic==0.51.0
2019
pytest==7.4.4
2120
pytest-vcr==1.0.2
2221
pytest-asyncio==0.21.0
2322
wrapt==1.16.0
2423
opentelemetry-api==1.40 # when updating, also update in pyproject.toml
2524
opentelemetry-sdk==1.40 # when updating, also update in pyproject.toml
26-
opentelemetry-semantic-conventions==0.61b0 # when updating, also update in pyproject.toml
27-
25+
opentelemetry-semantic-conventions==0.61b0 # when updating, also update in pyproject.toml
26+
opentelemetry-util-genai==0.4b0 # when updating, also update in pyproject.toml
2827
-e instrumentation-genai/opentelemetry-instrumentation-anthropic

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies = [
4242
"opentelemetry-api ~=1.40",
4343
"opentelemetry-instrumentation >=0.61b0, <2",
4444
"opentelemetry-semantic-conventions >=0.61b0, <2",
45-
"opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
45+
"opentelemetry-util-genai >= 0.4b0, <0.5b0",
4646
]
4747

4848
[project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ pytest==7.4.4
4040
pytest-asyncio==0.21.0
4141
pytest-vcr==1.0.2
4242

43-
google-auth==2.47.0
43+
google-auth==2.50.0
4444

4545
google-genai==1.47.0; python_version < "3.10"
46-
google-genai==1.64.0; python_version >= "3.10"
46+
google-genai==1.75.0; python_version >= "3.10"
4747

4848
# Install locally from the folder. This path is relative to the
4949
# root directory, given invocation from "tox" at root level.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ opentelemetry-api==1.40.0
2525
opentelemetry-sdk==1.40.0
2626
opentelemetry-semantic-conventions==0.61b0
2727
opentelemetry-instrumentation==0.61b0
28-
-e util/opentelemetry-util-genai[upload]
28+
opentelemetry-util-genai[upload]==0.4b.0
2929

3030
fsspec==2025.9.0
3131

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/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.40",
2929
"opentelemetry-instrumentation >= 0.61b0",
3030
"opentelemetry-semantic-conventions >= 0.61b0",
31-
"opentelemetry-util-genai >= 0.4b0.dev"
31+
"opentelemetry-util-genai >= 0.4b0"
3232
]
3333

3434
[project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/requirements.oldest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ opentelemetry-exporter-otlp-proto-http~=1.30
2929
opentelemetry-api==1.40 # when updating, also update in pyproject.toml
3030
opentelemetry-sdk==1.40 # when updating, also update in pyproject.toml
3131
opentelemetry-semantic-conventions==0.61b0 # when updating, also update in pyproject.toml
32+
opentelemetry-util-genai==0.4b.0 # when updating, also update in pyproject.toml
3233
grpcio>=1.60.0; implementation_name != "pypy"
3334
grpcio<1.60.0; implementation_name == "pypy"
3435

35-
-e util/opentelemetry-util-genai
3636
-e instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2

0 commit comments

Comments
 (0)