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.

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

fix: Use separate variable to track the consume offset #15095

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

grobinson-grafana
Copy link
Contributor

@grobinson-grafana grobinson-grafana commented Nov 25, 2024

What this PR does / why we need it:

This commit updates reader_service.go to use a separate variable to track the consume offset instead of mutating the last committed offset. I found this makes the code easier to follow as the last committed offset does not change.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@grobinson-grafana grobinson-grafana requested a review from a team as a code owner November 25, 2024 09:25
if lastCommittedOffset >= 0 {
lastCommittedOffset++ // We want to begin to read from the next offset, but only if we've previously committed an offset.
consumeOffset := kafkaStartOffset
if lastCommittedOffset > 0 {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Owen's PR changed this from > 0 to >= 0. I assume 0 is a valid commit offset (the 0th message), so we should read from 1?

Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

This commit updates reader_service.go to use a separate variable to
track the consume offset instead of mutating the last committed
offset. I found this makes the code easier to follow as the last
committed offset does not change.
@grobinson-grafana grobinson-grafana merged commit 161a192 into main Nov 25, 2024
58 checks passed
@grobinson-grafana grobinson-grafana deleted the grobinson/small-cleanup branch November 25, 2024 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants