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

Sync upstream to f7373a1f91e63556ca3d0a8d21896b2cdace260c #815

Merged
merged 30 commits into from
Jan 8, 2025

Conversation

julienduchesne
Copy link
Member

@julienduchesne julienduchesne commented Jan 8, 2025

jan--f and others added 29 commits November 27, 2024 21:16
Signed-off-by: Jan Fajerski <[email protected]>
Bumps the go-opentelemetry-io group with 2 updates: [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) and [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector).


Updates `go.opentelemetry.io/collector/pdata` from 1.20.0 to 1.21.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](open-telemetry/opentelemetry-collector@pdata/v1.20.0...pdata/v1.21.0)

Updates `go.opentelemetry.io/collector/semconv` from 0.114.0 to 0.115.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](open-telemetry/opentelemetry-collector@v0.114.0...v0.115.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.3.1+incompatible to 27.4.0+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v27.3.1...v27.4.0)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
This addresses extreme slowness when you have thousands of rules in
potentially hundreds of rule groups. It can still be a bit slow even with
pagination and infinite scroll for very large use cases, but it's much
better already than before.

Fixes prometheus/prometheus#15551

Signed-off-by: Julius Volz <[email protected]>
Signed-off-by: Joel Beckmeyer <[email protected]>
Refactoring in prevision of prometheus/prometheus#15681

By moving the `eval` function outside of the for loop, we can modify the rule execution order more easily (without huge git changes)

Signed-off-by: Julien Duchesne <[email protected]>
Signed-off-by: neozhao98 <[email protected]>
Signed-off-by: root <[email protected]>
Paginate rule groups, add infinite scroll to rules within groups
[DEPS] upgrade crypto to address reported vulnerability
…b.com/docker/docker-27.4.0incompatible

chore(deps): bump github.com/docker/docker from 27.3.1+incompatible to 27.4.0+incompatible
…entelemetry-io-84fb557ae6

chore(deps): bump the go-opentelemetry-io group with 2 updates
Preparation for release 3.1.

Did not update Kubernetes as it forces Go to version 1.23, and we like to support 2 latest versions.

Signed-off-by: Bryan Boreham <[email protected]>
Bug filed upstream at fsnotify/fsnotify#656

Signed-off-by: Bryan Boreham <[email protected]>
[DEPS] Pin fsnotify to avoid deadlock bug
ci: We removed funbench functionality from the test-infra, removing CI job for it.
…l_smoothing` with histograms (#15686)

PromQL: Fix deriv, predict_linear and double_exponential_smoothing with histograms

Signed-off-by: Neeraj Gartia <[email protected]>

---------

Signed-off-by: Neeraj Gartia <[email protected]>
PromQL: Adds tests for delta with histograms

Signed-off-by: Neeraj Gartia <[email protected]>

--------

Signed-off-by: Neeraj Gartia <[email protected]>
This amends #15686.

Signed-off-by: beorn7 <[email protected]>
@CLAassistant
Copy link

CLAassistant commented Jan 8, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 8 committers have signed the CLA.

✅ beorn7
✅ bboreham
❌ juliusv
❌ jan--f
❌ root
❌ bwplotka
❌ TinfoilSubmarine
❌ NeerajGartia21


root seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

…chesne/upstream-pt1

CONFLICTS:
- `go.mod`: prometheus/prometheus@5122ff2 with `go-yaml` replace
- `rules/group.go`: Mine: This refactor: prometheus/prometheus@6151953
@julienduchesne julienduchesne force-pushed the julienduchesne/upstream-pt1 branch from 3877f1c to 3c031c3 Compare January 8, 2025 15:23
@julienduchesne julienduchesne marked this pull request as ready for review January 8, 2025 15:35
Copy link
Contributor

@gotjosh gotjosh left a comment

Choose a reason for hiding this comment

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

LGTM

@julienduchesne julienduchesne merged commit 2129bae into main Jan 8, 2025
7 of 8 checks passed
@julienduchesne julienduchesne deleted the julienduchesne/upstream-pt1 branch January 8, 2025 16:55
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.