Skip to content

Commit a0525b2

Browse files
authored
Merge branch 'main' into improve-click-environment-sniffing
2 parents 59fca1f + dc178de commit a0525b2

File tree

131 files changed

+423
-340
lines changed

Some content is hidden

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

131 files changed

+423
-340
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ 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

1618
- `opentelemetry-instrumentation-asyncclick`: fix issue where servers using asyncclick would not get a separate span per-request
1719
- `opentelemetry-instrumentation-click`: fix issue where starting uvicorn via `python -m` would cause the click instrumentation to give all requests the same trace id
20+
- `opentelemetry-instrumentation-flask`: Do not record `http.server.duration` metrics for excluded URLs.
21+
([#3794](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3794))
1822
- `opentelemetry-instrumentation-botocore`: migrate off the deprecated events API to use the logs API
1923
([#3624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3624))
2024
- `opentelemetry-instrumentation-dbapi`: fix crash retrieving libpq version when enabling commenter with psycopg

_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: 2 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

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"

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/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"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.59b0.dev",
30+
"opentelemetry-semantic-conventions == 0.60b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/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"

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.4b0 (2025-10-16)
11+
1012
- Implement the new semantic convention changes made in https://github.com/open-telemetry/semantic-conventions/pull/2179.
1113
A single event (`gen_ai.client.inference.operation.details`) is used to capture Chat History. This is opt-in,
1214
an environment variable OTEL_SEMCONV_STABILITY_OPT_IN needs to be set to `gen_ai_latest_experimental` to see them ([#3386](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3386))

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

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,17 @@ classifiers = [
3434
"Programming Language :: Python :: 3",
3535
"Programming Language :: Python :: 3.10",
3636
"Programming Language :: Python :: 3.11",
37-
"Programming Language :: Python :: 3.12"
37+
"Programming Language :: Python :: 3.12",
3838
]
3939
dependencies = [
4040
"opentelemetry-api ~=1.37",
4141
"opentelemetry-instrumentation >=0.58b0, <2",
4242
"opentelemetry-semantic-conventions >=0.58b0, <2",
43-
# TODO https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3786: restrict
44-
# version after the first release
45-
"opentelemetry-util-genai",]
43+
"opentelemetry-util-genai >= 0.2b0, <0.3b0",
44+
]
4645

4746
[project.optional-dependencies]
48-
instruments = [
49-
"google-genai >= 1.32.0"
50-
]
47+
instruments = ["google-genai >= 1.32.0"]
5148

5249
[project.entry-points.opentelemetry_instrumentor]
5350
google-genai = "opentelemetry.instrumentation.google_genai:GoogleGenAiSdkInstrumentor"
@@ -60,21 +57,14 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
6057
path = "src/opentelemetry/instrumentation/google_genai/version.py"
6158

6259
[tool.hatch.build.targets.sdist]
63-
include = [
64-
"/src",
65-
"/tests",
66-
]
60+
include = ["/src", "/tests"]
6761

6862
[tool.hatch.build.targets.wheel]
6963
packages = ["src/opentelemetry"]
7064

7165
[tool.pyright]
72-
include = [
73-
"src",
74-
]
75-
exclude = [
76-
"**/__pycache__",
77-
]
66+
include = ["src"]
67+
exclude = ["**/__pycache__"]
7868
stubPath = "types"
7969
reportMissingImports = "error"
8070
reportMissingTypeStubs = false

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.4b0.dev"
20+
__version__ = "0.5b0.dev"

0 commit comments

Comments
 (0)