Repository navigation
Reduce lock scope in Kafka metrics reporter - #20535
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-15 12:26 UTC Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Reduce lock scope in Kafka metrics reporter
Reduce lock scope in Kafka metrics reporter
Oct 12, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The cleanup refactor consistently preserves ordering and close-failure semantics without holding the bookkeeping lock during external calls.
0 open findings
What changed in this PR
Reduces Kafka metrics reporter lock contention while preserving ordered observable cleanup.
Changes:
- Snapshots registrations under lock, then logs and closes them outside it.
- Removes registrations only after successful closure across replacement, removal, and shutdown.
| File | Description |
|---|---|
OpenTelemetryMetricsReporter.java |
Narrows lock scope for observable lifecycle operations. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
trask
marked this pull request as ready for review
October 12, 2026 16:45
trask
approved these changes
Oct 12, 2026
trask
approved these changes
Oct 12, 2026
laurit
reviewed
Oct 13, 2026
| private void closeInstrumentAndRemove(RegisteredObservable registeredObservable) { | ||
| closeInstrument(registeredObservable.getObservable()); | ||
| synchronized (lock) { | ||
| for (Iterator<RegisteredObservable> it = registeredObservables.iterator(); it.hasNext(); ) { |
Contributor
There was a problem hiding this comment.
could this be replaced with registeredObservables.remove(registeredObservable)?
laurit
reviewed
Oct 13, 2026
| } | ||
|
|
||
| for (RegisteredObservable registeredObservable : observablesToClose) { | ||
| closeInstrumentAndRemove(registeredObservable); |
Contributor
There was a problem hiding this comment.
Feels inefficient. It needs to loop over registeredObservables list to remove each element while previously it looped only once.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: ee62c0a6-39b4-4534-92d6-83f191bb8a8c
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: ee62c0a6-39b4-4534-92d6-83f191bb8a8c
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0c244542-4785-4886-a331-68c25ca59fa2
laurit
approved these changes
Oct 15, 2026
This was referenced Oct 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Move observable cleanup and replacement logging outside the reporter’s bookkeeping lock while preserving callback order and close-failure behavior.