Skip to content

[pull] main from prometheus:main #50

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

Merged
merged 12 commits into from
Mar 19, 2025
Merged

[pull] main from prometheus:main #50

merged 12 commits into from
Mar 19, 2025

Conversation

pull[bot]
Copy link

@pull pull bot commented Mar 19, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

jackw and others added 12 commits November 19, 2024 09:58
Signed-off-by: Jack Westbrook <jack.westbrook@gmail.com>
The used version had a no-longer-supported actions/upload-artifact version

Which led to:

Error: This request has been automatically failed because it uses a deprecated version of `actions/upload-artifact: v3`. Learn more: https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/

as in https://github.com/prometheus/prometheus/actions/runs/13591433692/job/38242934626

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
avoiding

Error: This request has been automatically failed because it uses a deprecated version of `actions/cache: 0c45773b623bea8c8e75f6c82b208c3cf94ea4f9`. Please update your workflow to use v3/v4 of actions/cache to avoid interruptions. Learn more: https://github.blog/changelog/2024-12-05-notice-of-upcoming-releases-and-breaking-changes-for-github-actions/#actions-cache-v1-v2-and-actions-toolkit-cache-package-closing-down

like in https://github.com/prometheus/prometheus/actions/runs/13678387950/job/38244352964?pr=16090

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
* fix: set gogc default value when config body is empty

Signed-off-by: Danial Eskandari <doneskandari@gmail.com>

* refactor: explicitly check value 75 in `TestGoGCDefaultValueOnEmptyConfigBody`

add GoGC assertion in `TestEmptyConfig`, also removed the no longer needed runtime config assignment in `TestEmptyGlobalBlock`

Signed-off-by: Danial Eskandari <doneskandari@gmail.com>

* refactor: remove `TestGoGCDefaultValueOnEmptyConfigBody` to reduce duplicate assertions

Signed-off-by: Danial Eskandari <doneskandari@gmail.com>

---------

Signed-off-by: Danial Eskandari <doneskandari@gmail.com>
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
backport[2.53]: config: set gogc default value when config body is empty (#16052)
Returning 0 from Append means 'unknown', so the series is never cached.

Return arbitrary numbers instead.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Backport of #16174 to LTS release-2.53 branch.

We use the cache iteration number to detect when the same metric has
occurred twice in a scrape. We need to bump this number at the end of
every scrape, not just successful scrapes.

The `iter` number is also used:
* After a successful scrape, to delete older metrics and metadata.
* To detect when metadata changed in this scrape.

None of those additional cases is broken by incrementing the number
on error.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
[Release 2.53] [BUGFIX] Scraping: bump cache iteration after error
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
I used current version of the following:
# Conflicts:
#	.github/workflows/ci.yml
#	VERSION
#	config/config_test.go
#	scrape/helpers_test.go
#	scrape/scrape_test.go
#	web/ui/module/codemirror-promql/package.json
#	web/ui/module/lezer-promql/package.json
#	web/ui/package-lock.json
#	web/ui/package.json
#	web/ui/react-app/package.json
@pull pull bot added the ⤵️ pull label Mar 19, 2025
@pull pull bot merged commit f7af729 into kp-forks:main Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants