Update Prometheus to 2.25.0 #415
Merged
Conversation
This file contains 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
rfratto
commented
Feb 18, 2021
| @@ -3,55 +3,54 @@ module github.com/grafana/agent | |||
| go 1.15 | |||
|
|
|||
| require ( | |||
There was a problem hiding this comment.
I wish I knew why sometimes go mod vendor changes the indentation depending on what computer I'm on 😞
rfratto
commented
Feb 18, 2021
Comment on lines
+924
to
+950
| var ErrNotReady = errors.New("Scrape manager not ready") | ||
|
|
||
| // readyScrapeManager allows a scrape manager to be retrieved. Even if it's set at a later point in time. | ||
| type readyScrapeManager struct { | ||
| mtx sync.RWMutex | ||
| m *scrape.Manager | ||
| } | ||
|
|
||
| // Set the scrape manager. | ||
| func (rm *readyScrapeManager) Set(m *scrape.Manager) { | ||
| rm.mtx.Lock() | ||
| defer rm.mtx.Unlock() | ||
|
|
||
| rm.m = m | ||
| } | ||
|
|
||
| // Get the scrape manager. If is not ready, return an error. | ||
| func (rm *readyScrapeManager) Get() (*scrape.Manager, error) { | ||
| rm.mtx.RLock() | ||
| defer rm.mtx.RUnlock() | ||
|
|
||
| if rm.m != nil { | ||
| return rm.m, nil | ||
| } | ||
|
|
||
| return nil, ErrNotReady | ||
| } |
There was a problem hiding this comment.
We used to import this directly from Prometheus but recently the logic got moved to Prometheus' main package, so we have to reimplement it now.
rfratto
commented
Feb 18, 2021
| @@ -40,7 +40,7 @@ func (r walReplayer) Replay(dir string) error { | |||
| startFrom++ | |||
| } | |||
|
|
|||
| _, last, err := w.Segments() | |||
| _, last, err := wal.Segments(w.Dir()) | |||
There was a problem hiding this comment.
wal.(*Wal).Segments got removed and replaced with a package-level function.
mattdurham
approved these changes
Feb 18, 2021
mattdurham
pushed a commit
that referenced
this pull request
Nov 11, 2021
* update prometheus to 2.25.0 * changelog * update docs to include new headers field in remote_write
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR Description
Updates the Prometheus dependency to 2.25.0.
Which issue(s) this PR fixes
Closes #410
Closes #412
Closes #340
Closes #385
Notes to the Reviewer
PR Checklist