Skip to content

Commit 6e85caf

Browse files
Merge branch 'main' into otlp-http-metrics-export-max-batch
2 parents 4b4efc9 + 20dedf5 commit 6e85caf

File tree

121 files changed

+4213
-637
lines changed

Some content is hidden

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

121 files changed

+4213
-637
lines changed

.github/workflows/contrib.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches-ignore:
66
- 'release/*'
7+
- 'otelbot/*'
78
pull_request:
89

910
permissions:

.github/workflows/lint_0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/misc_0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/templates/lint.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/templates/misc.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/templates/test.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/test_0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.pre-commit-config.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
33
# Ruff version.
4-
rev: v0.6.9
4+
rev: v0.14.1
55
hooks:
66
# Run the linter.
77
- id: ruff
@@ -13,3 +13,9 @@ repos:
1313
rev: 0.6.0
1414
hooks:
1515
- id: uv-lock
16+
- repo: https://github.com/rstcheck/rstcheck
17+
rev: 77490ffa33bfc0928975ae3cf904219903db755d # frozen: v6.2.5
18+
hooks:
19+
- id: rstcheck
20+
additional_dependencies: ['rstcheck[sphinx]']
21+
args: ["--report-level", "warning"]

.rstcheck.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[rstcheck]
2+
ignore_directives = automodule
3+
ignore_roles = scm_web,scm_raw_web

CHANGELOG.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
1313
## Unreleased
1414

15+
- docs: Added sqlcommenter example
16+
([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734))
17+
- build: bump ruff to 0.14.1
18+
([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782))
19+
- Add `opentelemetry-exporter-credential-provider-gcp` as an optional dependency to `opentelemetry-exporter-otlp-proto-grpc`
20+
and `opentelemetry-exporter-otlp-proto-http`
21+
([#4760](https://github.com/open-telemetry/opentelemetry-python/pull/4760))
22+
- semantic-conventions: Bump to 1.38.0
23+
([#4791](https://github.com/open-telemetry/opentelemetry-python/pull/4791))
24+
- Add configurable `max_export_batch_size` to OTLP HTTP metrics exporter
25+
([#4576](https://github.com/open-telemetry/opentelemetry-python/pull/4576))
26+
27+
## Version 1.38.0/0.59b0 (2025-10-16)
28+
29+
- Add `rstcheck` to pre-commit to stop introducing invalid RST
30+
([#4755](https://github.com/open-telemetry/opentelemetry-python/pull/4755))
31+
- logs: extend Logger.emit to accept separated keyword arguments
32+
([#4737](https://github.com/open-telemetry/opentelemetry-python/pull/4737))
33+
- logs: add warnings for classes that would be deprecated and renamed in 1.39.0
34+
([#4771](https://github.com/open-telemetry/opentelemetry-python/pull/4771))
35+
36+
## Version 1.37.0/0.58b0 (2025-09-11)
37+
1538
- Add experimental composite samplers
1639
([#4714](https://github.com/open-telemetry/opentelemetry-python/pull/4714))
1740
- Add new environment variables to the SDK `OTEL_PYTHON_EXPORTER_OTLP_{HTTP/GRPC}_{METRICS/TRACES/LOGS}_CREDENTIAL_PROVIDER` that can be used to
@@ -24,10 +47,12 @@ inject a `requests.Session` or `grpc.ChannelCredentials` object into OTLP export
2447
([#4634](https://github.com/open-telemetry/opentelemetry-python/pull/4634))
2548
- semantic-conventions: Bump to 1.37.0
2649
([#4731](https://github.com/open-telemetry/opentelemetry-python/pull/4731))
50+
- opentelemetry-sdk: fix handling of OTEL_ATTRIBUTE_COUNT_LIMIT in logs
51+
([#4677](https://github.com/open-telemetry/opentelemetry-python/pull/4677))
2752
- Performance: Cache `importlib_metadata.entry_points`
2853
([#4735](https://github.com/open-telemetry/opentelemetry-python/pull/4735))
29-
- Add configurable `max_export_batch_size` to OTLP HTTP metrics exporter
30-
([#4576](https://github.com/open-telemetry/opentelemetry-python/pull/4576))
54+
- opentelemetry-sdk: fix calling Logger.emit with an API LogRecord instance
55+
([#4741](https://github.com/open-telemetry/opentelemetry-python/pull/4741))
3156

3257
## Version 1.36.0/0.57b0 (2025-07-29)
3358

0 commit comments

Comments
 (0)