Skip to content

Comments

[bot] Bump openshift/prometheus to v2.45.0#166

Merged
openshift-merge-robot merged 119 commits intoopenshift:masterfrom
rhobs:automated-updates-master
Jun 27, 2023
Merged

[bot] Bump openshift/prometheus to v2.45.0#166
openshift-merge-robot merged 119 commits intoopenshift:masterfrom
rhobs:automated-updates-master

Conversation

@openshift-monitoring-bot
Copy link

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus repo,

git fetch https://github.com/prometheus/prometheus --tags
if ! git merge refs/tags/v2.45.0 --no-edit; then
  git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml
  git checkout --ours 
  git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml 
  git merge --continue
fi
go mod tidy
go mod vendor

pr00se and others added 30 commits February 26, 2023 22:56
Signed-off-by: Patryk Prus <p@trykpr.us>
Signed-off-by: René Scheibe <rene.scheibe@gmail.com>
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
Fix changelog about scrape configs
Signed-off-by: znley <shanjiantao@loongson.cn>
Signed-off-by: Justin Lei <justin.lei@grafana.com>
Signed-off-by: Justin Lei <justin.lei@grafana.com>
Signed-off-by: Justin Lei <justin.lei@grafana.com>
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Justin Lei <justin.lei@grafana.com>
Signed-off-by: Justin Lei <justin.lei@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Refactors textparser test to use a common test utility to create
protobuf representation from MetricFamily

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
…e and return an error

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: cui fliter <imcusg@gmail.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu>
Signed-off-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
…us-vazquez-as-2-45-release-shepherd

Propose Jesus Vazquez as 2.45 release shepherd
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu>
Signed-off-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Consider code like:

	for i := 0; i < numTargets; i++ {
		stopFuncs = append(stopFuncs, func() {
			time.Sleep(i*20*time.Millisecond)
		})
	}

Because the loop variable i is shared by all closures,
all the stopFuncs sleep for numTargets*20 ms.

If the i were made per-iteration, as we are considering
for a future Go release, the stopFuncs would have sleep
durations ranging from 0 to (numTargets-1)*20 ms.

Two tests had code like this and were checking that the
aggregate sleep was at least numTargets*20 ms
("at least as long as the last target slept"). This is only true
today because i == numTarget during all the sleeps.

To keep the code working even if the semantics of this loop
change, this PR computes

	d := time.Duration((i+1)*20) * time.Millisecond

outside the closure (but inside the loop body), and then each
closure has its own d. Now the sleeps range from 20 ms
to numTargets*20 ms, keeping the test passing
(and probably behaving closer to the intent of the test author).

The failure being fixed can be reproduced by using the current
Go development branch with

	GOEXPERIMENT=loopvar go test

Signed-off-by: Russ Cox <rsc@golang.org>
scrape: fix two loop variable scoping bugs in test
The storage.ChunkSeries iterator assumes that a histogram sample can always be
appended to the currently open chunk. This is not the case when there is a counter reset,
or when appending a stale sample to a chunk with non-stale samples. In addition, the open chunk sometimes
needs to be recoded before a sample can be appended.

This commit addresses the issue by implementing a RecodingAppender which can recode incoming
samples in a transparent way. It also detects cases when a sample cannot be appended at all and
returns `false` so that the caller can open a new chunk.

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Julien Pivotto and others added 6 commits June 17, 2023 10:16
Add support for inline TLS certificates
…)"

This reverts commit dfae954.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
Revert "Improving Performance on the API Gzip Handler (prometheus#12363)"
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 24, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jun 24, 2023

Hi @openshift-monitoring-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested review from JoaoBraveCoding and sthaha June 24, 2023 00:55
@monitoring-commit-bot monitoring-commit-bot bot force-pushed the automated-updates-master branch 2 times, most recently from 6cb079b to 2ebf7a2 Compare June 26, 2023 00:57
@simonpasquier
Copy link

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 26, 2023
@simonpasquier
Copy link

/test e2e-agnostic-cmo

github-actions bot added 5 commits June 27, 2023 00:53
v2.45.0

# -----BEGIN PGP SIGNATURE-----
#
# iQGzBAABCAAdFiEEu716pYzBHhE8naWpGN/83iMsuS0FAmSVtQMACgkQGN/83iMs
# uS3ZiAv/ZyMGu4JQbs7XS2CB94cB5TUJkaqtNtiQudbhzwoOTHVf5O9SJ0RXLJqk
# wsQV4hAiWCjZjsMsPqxcsFQItCMVYSrL1IyHc05rcVI7hf6iVHfYQ7jBtRu0CkIM
# L0RD84JTtDQgQU6Iumy0KWHKcwAzbK+ui0fRtg3NHEYncUNDRKwF2FgJqHgSDrRT
# 8SVOBRk0anyw0Eko5nwdPZFdxJdQTAFOfxHiE8iBxrV/+rPgqzYqHk5RgTCuSJzW
# YolZ2irsqR0F3KjtkPgdwxWTFZCuAHnm42dZzGWJ+EI76PGsJ0NH6yzjWI2QRx5U
# iQGxfh2giuuj7ewt6aAUsGJhUpt1CRk1OB+EO0hx9GbYgbQZmP2CX/it8g7j6HSm
# hENU/4rVTygfpGnfJgSQTRlbP8KO/3B7x+i5hc+l4Yd0KxhvSp0HsEJJAQevZsWa
# y6bIxW4dVtGcht07L+oT4hOA4ppBYUUfUdq6OxOTWbn5NPOiFZo9SjPggyzcsWIJ
# zWYEoEkt
# =41CO
# -----END PGP SIGNATURE-----
# gpg: directory '/home/runner/.gnupg' created
# gpg: keybox '/home/runner/.gnupg/pubring.kbx' created
# gpg: Signature made Fri Jun 23 15:06:43 2023 UTC
# gpg:                using RSA key BBBD7AA58CC11E113C9DA5A918DFFCDE232CB92D
# gpg: Can't check signature: No public key
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@monitoring-commit-bot monitoring-commit-bot bot force-pushed the automated-updates-master branch from 2ebf7a2 to 8db7e26 Compare June 27, 2023 00:56
@openshift-ci
Copy link

openshift-ci bot commented Jun 27, 2023

@openshift-monitoring-bot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@simonpasquier
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 27, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jun 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-monitoring-bot[bot], simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 27, 2023
@openshift-merge-robot openshift-merge-robot merged commit 6b7a128 into openshift:master Jun 27, 2023
openshift-merge-bot bot pushed a commit that referenced this pull request Oct 9, 2025
When doing a config reload that need to stop some providers while also sending SIGTERM to Prometheus at the same time can sometimes hang

1: sync.WaitGroup.Wait [83 minutes] [Created by run.(*Group).Run in goroutine 1 @ group.go:37]
    sync         sema.go:110              runtime_SemacquireWaitGroup(*uint32(#166))
    sync         waitgroup.go:118         (*WaitGroup).Wait(*WaitGroup(#23))
    discovery    manager.go:276           (*Manager).ApplyConfig(#23, #167)
    main         main.go:964              main.func5(#120)
    main         main.go:1505             reloadConfig({#183, 0x1b}, 1, #40, #43, #50, {#31, 0xa, 0})
    main         main.go:1182             main.func22()
    run          group.go:38              (*Group).Run.func1(*Group(#26), #51)

Add a test for it.

Signed-off-by: Lukasz Mierzwa <l.mierzwa@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.