Skip to content

Commit b27b4ea

Browse files
authored
Merge branch 'main' into docs/exponent-mapping-edge-case-assumptions
2 parents 34d07b7 + a9a1718 commit b27b4ea

86 files changed

Lines changed: 3028 additions & 370 deletions

File tree

Some content is hidden

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

.github/workflows/stale.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Mark stale PRs
2+
3+
on:
4+
schedule:
5+
- cron: "12 3 * * *"
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
stale:
13+
permissions:
14+
contents: read
15+
issues: write
16+
pull-requests: write
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
20+
with:
21+
repo-token: ${{ secrets.GITHUB_TOKEN }}
22+
days-before-pr-stale: 14
23+
days-before-pr-close: 14
24+
days-before-issue-stale: -1
25+
days-before-issue-close: -1
26+
stale-pr-message: >
27+
This PR has been automatically marked as stale because it has not had
28+
any activity for 14 days. It will be closed if no further activity
29+
occurs within 14 days of this comment.
30+
31+
If you're still working on this, please add a comment or push new commits.
32+
close-pr-message: >
33+
This PR has been closed due to inactivity. Please reopen if you would
34+
like to continue working on it.
35+
exempt-pr-labels: "hold,WIP,blocked by spec,do not merge"

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ignore=CVS,gen,proto
1111

1212
# Add files or directories matching the regex patterns to be excluded. The
1313
# regex matches against base names, not paths.
14-
ignore-patterns=
14+
ignore-patterns=^models\.py$
1515

1616
# Python code to execute, usually for sys.path manipulation such as
1717
# pygtk.require().

CHANGELOG.md

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

1313
## Unreleased
1414

15+
## Version 1.40.0/0.61b0 (2026-03-04)
16+
17+
- `opentelemetry-sdk`: deprecate `LoggingHandler` in favor of `opentelemetry-instrumentation-logging`, see `opentelemetry-instrumentation-logging` documentation
18+
([#4919](https://github.com/open-telemetry/opentelemetry-python/pull/4919))
19+
- `opentelemetry-sdk`: Clarify log processor error handling expectations in documentation
20+
([#4915](https://github.com/open-telemetry/opentelemetry-python/pull/4915))
21+
- bump semantic-conventions to v1.40.0
22+
([#4941](https://github.com/open-telemetry/opentelemetry-python/pull/4941))
23+
- Add stale PR GitHub Action
24+
([#4926](https://github.com/open-telemetry/opentelemetry-python/pull/4926))
25+
- `opentelemetry-sdk`: Drop unused Jaeger exporter environment variables (exporter removed in 1.22.0)
26+
([#4918](https://github.com/open-telemetry/opentelemetry-python/issues/4918))
1527
- `opentelemetry-sdk`: Clarify timeout units in environment variable documentation
1628
([#4906](https://github.com/open-telemetry/opentelemetry-python/pull/4906))
1729
- `opentelemetry-exporter-otlp-proto-grpc`: Fix re-initialization of gRPC channel on UNAVAILABLE error
@@ -32,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3244
([#4806](https://github.com/open-telemetry/opentelemetry-python/pull/4806))
3345
- Prevent possible endless recursion from happening in `SimpleLogRecordProcessor.on_emit`,
3446
([#4799](https://github.com/open-telemetry/opentelemetry-python/pull/4799)) and ([#4867](https://github.com/open-telemetry/opentelemetry-python/pull/4867)).
47+
- Implement span start/end metrics
48+
([#4880](https://github.com/open-telemetry/opentelemetry-python/pull/4880))
3549
- Add environment variable carriers to API
3650
([#4609](https://github.com/open-telemetry/opentelemetry-python/pull/4609))
3751
- Add experimental composable rule based sampler
@@ -40,10 +54,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4054
([#4862](https://github.com/open-telemetry/opentelemetry-python/pull/4862))
4155
- `opentelemetry-exporter-otlp-proto-http`: fix retry logic and error handling for connection failures in trace, metric, and log exporters
4256
([#4709](https://github.com/open-telemetry/opentelemetry-python/pull/4709))
57+
- `opentelemetry-sdk`: avoid RuntimeError during iteration of view instrument match dictionary in MetricReaderStorage.collect()
58+
([#4891](https://github.com/open-telemetry/opentelemetry-python/pull/4891))
4359
- Implement experimental TracerConfigurator
4460
([#4861](https://github.com/open-telemetry/opentelemetry-python/pull/4861))
61+
- `opentelemetry-sdk`: Fix instrument creation race condition
62+
([#4913](https://github.com/open-telemetry/opentelemetry-python/pull/4913))
4563
- bump semantic-conventions to v1.39.0
4664
([#4914](https://github.com/open-telemetry/opentelemetry-python/pull/4914))
65+
- `opentelemetry-sdk`: automatically generate configuration models using OTel config JSON schema
66+
([#4879](https://github.com/open-telemetry/opentelemetry-python/pull/4879))
4767

4868
## Version 1.39.0/0.60b0 (2025-12-03)
4969

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,12 @@ Please fork this repo in a personal Github account instead.
291291

292292
One of the maintainers will merge the PR once it is **ready to merge**.
293293

294+
### Stale PRs
295+
296+
PRs with no activity for 14 days will be automatically marked as stale and closed after a further 14 days of inactivity. To prevent a PR from being marked stale, ensure there is regular activity (commits, comments, reviews, etc).
297+
298+
Project managers can also exempt a PR from this by applying one of the following labels: `hold`, `WIP`, `blocked by spec`, `do not merge`.
299+
294300
## Design Choices
295301

296302
As with other OpenTelemetry clients, opentelemetry-python follows the

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ For more information about the maintainer role, see the [community repository](h
116116
- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
117117
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
118118
- [Liudmila Molkova](https://github.com/lmolkova), Grafana Labs
119+
- [Lukas Hering](https://github.com/herin049), Capital One
119120
- [Owais Lone](https://github.com/owais), Splunk
120121
- [Pablo Collins](https://github.com/pmcollins), Splunk
121122
- [Shalev Roda](https://github.com/shalevr), Cisco

docs/examples/logs/example.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
66
OTLPLogExporter,
77
)
8-
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
8+
9+
# this is available in the opentelemetry-instrumentation-logging package
10+
from opentelemetry.instrumentation.logging.handler import LoggingHandler
11+
from opentelemetry.sdk._logs import LoggerProvider
912
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
1013
from opentelemetry.sdk.resources import Resource
1114
from opentelemetry.sdk.trace import TracerProvider

docs/examples/opencensus-shim/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
# Set up OpenTelemetry
3333
tracer_provider = TracerProvider(
34-
resource=Resource(
34+
resource=Resource.create(
3535
{
3636
"service.name": "opencensus-shim-example-flask",
3737
}

docs/exporter/prometheus/prometheus.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Prometheus text format on request::
2727
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
2828

2929
# Service name is required for most backends
30-
resource = Resource(attributes={
30+
resource = Resource.create(attributes={
3131
SERVICE_NAME: "your-service-name"
3232
})
3333

eachdist.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.40.0.dev
14+
version=1.41.0.dev
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.61b0.dev
30+
version=0.62b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-opencensus/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"grpcio >= 1.66.2, < 2.0.0; python_version == '3.13'",
3333
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
3434
"opencensus-proto >= 0.1.0, < 1.0.0",
35-
"opentelemetry-api >= 1.40.0.dev",
35+
"opentelemetry-api >= 1.41.0.dev",
3636
"opentelemetry-sdk >= 1.15",
3737
"protobuf ~= 3.13",
3838
"setuptools >= 16.0",

0 commit comments

Comments
 (0)