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

MVP: Cost attribution #10269

Open
wants to merge 42 commits into
base: main
Choose a base branch
from
Open

MVP: Cost attribution #10269

wants to merge 42 commits into from

Conversation

ying-jeanne
Copy link
Contributor

@ying-jeanne ying-jeanne commented Dec 17, 2024

What this PR does

This is the follow up of #9733,

The PR intent to export extra attributed metrics in distributor and ingester, in order to get sample received, sample discarded and active_series attributed by cost attribution label.

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@ying-jeanne ying-jeanne force-pushed the final-cost-attribution branch from 5165a5b to 6f36b5f Compare December 17, 2024 21:07
@ying-jeanne ying-jeanne changed the title Final cost attribution MVP: Cost attribution Dec 17, 2024
@ying-jeanne ying-jeanne requested a review from colega December 17, 2024 21:10
@ying-jeanne ying-jeanne force-pushed the final-cost-attribution branch from 6f36b5f to 077a94a Compare December 17, 2024 22:01
@ying-jeanne ying-jeanne force-pushed the final-cost-attribution branch from 077a94a to f04c28f Compare December 17, 2024 22:08
@ying-jeanne ying-jeanne marked this pull request as ready for review December 17, 2024 22:13
@ying-jeanne ying-jeanne requested review from tacole02 and a team as code owners December 17, 2024 22:13
pkg/costattribution/manager.go Outdated Show resolved Hide resolved
pkg/costattribution/manager.go Outdated Show resolved Hide resolved
pkg/costattribution/manager.go Outdated Show resolved Hide resolved
pkg/costattribution/manager.go Outdated Show resolved Hide resolved
pkg/ingester/activeseries/active_series.go Outdated Show resolved Hide resolved
@@ -502,6 +525,18 @@ func (s *seriesStripe) remove(ref storage.SeriesRef) {
}

s.active--
if s.cat != nil {
if idx == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, we should assume this isn't nil. Just skipping the removal will break the numbers forever.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

vendor and update in commit 4706bde

Copy link
Contributor

Choose a reason for hiding this comment

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

Please update the active series tracker tests with the costattribution.Tracker, otherwise the new code isn't tested.

Comment on lines 3276 to 3280
idx, err := db.Head().Index()
if err != nil {
level.Warn(i.logger).Log("msg", "failed to get the index of the TSDB head", "user", userID, "err", err)
idx = nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

As commented previously, we should never proceed without an index.

If you check the implementation of db.Head().Index() it never returns an error. We have three options here:

  1. Skip tenants if they don't have index: this is the least effort one.
  2. Panic if err is not nil, this is ugly
  3. Update mimir-prometheus to add a MustIndex() IndexReader method that does not return an error, and use that one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

PR in mimir-prometheus grafana/mimir-prometheus#811

Copy link
Contributor Author

Choose a reason for hiding this comment

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

vendor and update in commit 4706bde

if t.Cfg.CostAttributionRegistryPath != "" {
reg := prometheus.NewRegistry()
var err error
t.CostAttributionManager, err = costattribution.NewManager(3*time.Minute, time.Minute, t.Cfg.CostAttributionEvictionInterval, util_log.Logger, t.Overrides, reg)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think these values should not be hardcoded.

Copy link
Contributor

@tacole02 tacole02 left a comment

Choose a reason for hiding this comment

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

Thanks for updating the docs! I left a few suggestions.

}
}

func (t *Tracker) shouldDelete(deadline int64) bool {
Copy link
Contributor

Choose a reason for hiding this comment

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

I would rename this method to "recovered from overflow". The fact that it should be deleted is a decision of the Manager.

Copy link
Contributor Author

@ying-jeanne ying-jeanne Dec 24, 2024

Choose a reason for hiding this comment

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

addressed in 1ab1f00

}

func (t *Tracker) shouldDelete(deadline int64) bool {
if t.cooldownUntil != nil && t.cooldownUntil.Load() < deadline {
Copy link
Contributor

Choose a reason for hiding this comment

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

You can't check whether t.cooldownUntil without holding the mutex here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

addressed in fe8a1e5

newTrackedLabels := m.limits.CostAttributionLabels(userID)

// sort the labels to ensure the order is consistent
sort.Slice(newTrackedLabels, func(i, j int) bool {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it safe to modify the slice returned by m.limits.CostAttributionLabels(userID)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

modify the copy instead, addressed in 888d8b0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants