Skip to content

Commit ede1b48

Browse files
authored
Merge branch 'main' into feat/util-opentelemetry-util-http
2 parents 6a509d6 + 40d8942 commit ede1b48

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

CHANGELOG.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
1212
## Unreleased
1313

14-
## Version 1.34.0/0.55b0 (2025-06-04)
15-
1614
### Fixed
1715

1816
- `opentelemetry-resource-detector-containerid`: make it more quiet on platforms without cgroups
1917
([#3579](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3579))
2018

21-
### Added
22-
23-
- `opentelemetry-instrumentation-aiokafka` Add instrumentation of `consumer.getmany` (batch)
24-
([#3257](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3257))
19+
## Version 1.34.0/0.55b0 (2025-06-04)
2520

2621
### Fixed
2722

@@ -78,7 +73,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7873
([#3513](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3513))
7974
- `opentelemetry-instrumentation` Allow re-raising exception when instrumentation fails
8075
([#3545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3545))
81-
76+
- `opentelemetry-instrumentation-aiokafka` Add instrumentation of `consumer.getmany` (batch)
77+
([#3257](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3257))
78+
8279
### Deprecated
8380

8481
- Drop support for Python 3.8, bump baseline to Python 3.9.

README.md

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,16 @@ We meet weekly on Thursday at 9AM PT. The meeting is subject to change depending
111111

112112
Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-python/discussions).
113113

114-
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
114+
### Maintainers
115+
116+
- [Aaron Abbott](https://github.com/aabmass), Google
117+
- [Leighton Chen](https://github.com/lzchen), Microsoft
118+
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
119+
- [Shalev Roda](https://github.com/shalevr), Cisco
120+
121+
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
122+
123+
### Approvers
115124

116125
- [Emídio Neto](https://github.com/emdneto), PicPay
117126
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
@@ -121,34 +130,29 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
121130
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
122131
- [Tammy Baylis](https://github.com/tammy-baylis-swi), SolarWinds
123132

124-
Emeritus Approvers:
125-
126-
- [Ashutosh Goel](https://github.com/ashu658), Cisco
127-
- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
128-
- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Oxeye
129-
- [Nikolay Sokolik](https://github.com/nikosokolik), Oxeye
130-
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
131-
132-
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
133+
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
133134

134-
Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
135-
136-
- [Aaron Abbott](https://github.com/aabmass), Google
137-
- [Leighton Chen](https://github.com/lzchen), Microsoft
138-
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
139-
- [Shalev Roda](https://github.com/shalevr), Cisco
140-
141-
Emeritus Maintainers:
135+
### Emeritus Maintainers
142136

143137
- [Alex Boten](https://github.com/codeboten), Lightstep
144138
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
145139
- [Owais Lone](https://github.com/owais), Splunk
146140
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
147141

148-
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
142+
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
143+
144+
### Emeritus Approvers
145+
146+
- [Ashutosh Goel](https://github.com/ashu658), Cisco
147+
- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
148+
- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Oxeye
149+
- [Nikolay Sokolik](https://github.com/nikosokolik), Oxeye
150+
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
151+
152+
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
149153

150-
### Thanks to all the people who already contributed
154+
### Thanks to all of our contributors!
151155

152156
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/graphs/contributors">
153-
<img src="https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-python-contrib" />
157+
<img alt="Repo contributors" src="https://contrib.rocks/image?repo=open-telemetry/opentelemetry-python-contrib" />
154158
</a>

0 commit comments

Comments
 (0)