Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

starlette: Replace _meter_provider by meter_provider on _instrument #3048

Merged
merged 3 commits into from
Nov 26, 2024
Merged

starlette: Replace _meter_provider by meter_provider on _instrument #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cfb577
starlette: Replace `_meter_provider` by `meter_provider` on `_instrum…
Kludex Nov 26, 2024
9359d21
Add PR on the changelog
Kludex Nov 26, 2024
92a8b6a
Merge branch 'main' into replace-_meter_provider-by-meter_provider
xrmx Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- `opentelemetry-instrumentation-starlette`: Retrieve `meter_provider` key instead of `_meter_provider` on `_instrument`
([#3048](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3048))
- `opentelemetry-instrumentation-httpx`: instrument_client is a static method again
([#3003](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3003))
- `opentelemetry-instrumentation-system_metrics`: fix callbacks reading wrong config
Expand Down
2 changes: 1 addition & 1 deletion ...lemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def _instrument(self, **kwargs):
_InstrumentedStarlette._client_response_hook = kwargs.get(
"client_response_hook"
)
_InstrumentedStarlette._meter_provider = kwargs.get("_meter_provider")
_InstrumentedStarlette._meter_provider = kwargs.get("meter_provider")

applications.Starlette = _InstrumentedStarlette

Expand Down