Skip to content

Commit 357f191

Browse files
committed
Merge branch 'main' of github.com:DylanRussell/opentelemetry-python into fixlint
2 parents 403765c + 8d391bb commit 357f191

File tree

67 files changed

+1432
-645
lines changed

Some content is hidden

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

67 files changed

+1432
-645
lines changed

.github/workflows/misc_0.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -66,44 +66,6 @@ jobs:
6666
- name: Run tests
6767
run: tox -e tracecontext
6868

69-
mypy:
70-
name: mypy
71-
runs-on: ubuntu-latest
72-
timeout-minutes: 30
73-
steps:
74-
- name: Checkout repo @ SHA - ${{ github.sha }}
75-
uses: actions/checkout@v4
76-
77-
- name: Set up Python 3.11
78-
uses: actions/setup-python@v5
79-
with:
80-
python-version: "3.11"
81-
82-
- name: Install tox
83-
run: pip install tox
84-
85-
- name: Run tests
86-
run: tox -e mypy
87-
88-
mypyinstalled:
89-
name: mypyinstalled
90-
runs-on: ubuntu-latest
91-
timeout-minutes: 30
92-
steps:
93-
- name: Checkout repo @ SHA - ${{ github.sha }}
94-
uses: actions/checkout@v4
95-
96-
- name: Set up Python 3.11
97-
uses: actions/setup-python@v5
98-
with:
99-
python-version: "3.11"
100-
101-
- name: Install tox
102-
run: pip install tox
103-
104-
- name: Run tests
105-
run: tox -e mypyinstalled
106-
10769
typecheck:
10870
name: typecheck
10971
runs-on: ubuntu-latest

CHANGELOG.md

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

88
## Unreleased
99

10+
- typecheck: add sdk/resources and drop mypy
11+
([#4578](https://github.com/open-telemetry/opentelemetry-python/pull/4578))
12+
- Refactor `BatchLogRecordProcessor` to simplify code and make the control flow more
13+
clear ([#4562](https://github.com/open-telemetry/opentelemetry-python/pull/4562/)
14+
and [#4535](https://github.com/open-telemetry/opentelemetry-python/pull/4535)).
15+
16+
## Version 1.33.0/0.54b0 (2025-05-09)
17+
1018
- Fix intermittent `Connection aborted` error when using otlp/http exporters
1119
([#4477](https://github.com/open-telemetry/opentelemetry-python/pull/4477))
1220
- opentelemetry-sdk: use stable code attributes: `code.function` -> `code.function.name`, `code.lineno` -> `code.line.number`, `code.filepath` -> `code.file.path`
@@ -17,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1725
([#4553](https://github.com/open-telemetry/opentelemetry-python/pull/4553))
1826
- docs: updated and added to the metrics and log examples
1927
([#4559](https://github.com/open-telemetry/opentelemetry-python/pull/4559))
28+
- Bump semantic conventions to 1.33.0
29+
([#4567](https://github.com/open-telemetry/opentelemetry-python/pull/4567))
2030

2131
## Version 1.32.0/0.53b0 (2025-04-10)
2232

@@ -83,6 +93,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8393
([#4353](https://github.com/open-telemetry/opentelemetry-python/pull/4353))
8494
- sdk: don't log or print warnings when the SDK has been disabled
8595
([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
96+
- Configurable max retry timeout for grpc exporter
97+
([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
8698
- Fix span context manager typing by using ParamSpec from typing_extensions
8799
([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
88100
- Fix serialization of None values in logs body to match 1.31.0+ data model

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ For additional exporter and instrumentation packages, see the
9191

9292
For information about contributing to OpenTelemetry Python, see [CONTRIBUTING.md](CONTRIBUTING.md).
9393

94-
We meet weekly on Thursdays at 9AM PST. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com) for specific dates and Zoom meeting links.
94+
We meet weekly on Thursdays at 9AM PST. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=c_2bf73e3b6b530da4babd444e72b76a6ad893a5c3f43cf40467abc7a9a897f977%40group.calendar.google.com) for specific dates and Zoom meeting links.
9595

9696
Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit).
9797

dev-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pylint==3.3.4
22
httpretty==1.1.4
33
pyright==1.1.396
4-
mypy==1.9.0
54
sphinx==7.1.2
65
sphinx-rtd-theme==2.0.0rc4
76
sphinx-autodoc-typehints==1.25.2

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.33.0.dev
14+
version=1.34.0.dev
1515

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

2929
[prerelease]
30-
version=0.54b0.dev
30+
version=0.55b0.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.63.2, < 2.0.0; python_version < '3.13'",
3333
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3434
"opencensus-proto >= 0.1.0, < 1.0.0",
35-
"opentelemetry-api >= 1.33.0.dev",
35+
"opentelemetry-api >= 1.34.0.dev",
3636
"opentelemetry-sdk >= 1.15",
3737
"protobuf ~= 3.13",
3838
"setuptools >= 16.0",

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.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.54b0.dev"
15+
__version__ = "0.55b0.dev"

exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
"Programming Language :: Python :: 3.13",
2929
]
3030
dependencies = [
31-
"opentelemetry-proto == 1.33.0.dev",
31+
"opentelemetry-proto == 1.34.0.dev",
3232
]
3333

3434
[project.urls]

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.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__ = "1.33.0.dev"
15+
__version__ = "1.34.0.dev"

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ dependencies = [
3333
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3434
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3535
"opentelemetry-api ~= 1.15",
36-
"opentelemetry-proto == 1.33.0.dev",
37-
"opentelemetry-sdk ~= 1.33.0.dev",
38-
"opentelemetry-exporter-otlp-proto-common == 1.33.0.dev",
36+
"opentelemetry-proto == 1.34.0.dev",
37+
"opentelemetry-sdk ~= 1.34.0.dev",
38+
"opentelemetry-exporter-otlp-proto-common == 1.34.0.dev",
3939
]
4040

4141
[project.entry-points.opentelemetry_logs_exporter]

0 commit comments

Comments
 (0)