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

Merge feat-shared-interner to release-2.30.2-grafana #23

Merged
merged 2 commits into from
Oct 4, 2021

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Oct 4, 2021

Merge conflicts were just related to tests. Should be good to go.

This commit exposes the string interner globally with a shared pool and
modifies both the scraper and remote_write to use that shared pool.

Note that the string_interner_zero_reference_releases_total now has a
different namespace and subsystem from what it was initially set to in
the RW code.

Signed-off-by: Robert Fratto <robert.fratto@grafana.com>
pkg/intern/intern.go Outdated Show resolved Hide resolved
Copy link

@mattdurham mattdurham left a comment

Choose a reason for hiding this comment

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

One small typo but looks good

Signed-off-by: Robert Fratto <robertfratto@gmail.com>
@rfratto rfratto merged commit 138f5fe into release-2.30.2-grafana Oct 4, 2021
rlankfo pushed a commit that referenced this pull request Nov 3, 2021
* share string interner between scraper and remote_write

This commit exposes the string interner globally with a shared pool and
modifies both the scraper and remote_write to use that shared pool.

Note that the string_interner_zero_reference_releases_total now has a
different namespace and subsystem from what it was initially set to in
the RW code.

Signed-off-by: Robert Fratto <robert.fratto@grafana.com>

* fix lint errors

Signed-off-by: Robert Fratto <robertfratto@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants