Skip to content

Resolve CVEs and prepare for 2.8.2 #5484

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 16 commits into from
Aug 6, 2025

Conversation

mattdurham
Copy link
Contributor

Resolve CVEs

dependabot bot and others added 3 commits August 5, 2025 10:01
…#5333)

Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/go-viper/mapstructure/releases)
- [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md)
- [Commits](go-viper/mapstructure@v2.2.1...v2.3.0)

---
updated-dependencies:
- dependency-name: github.com/go-viper/mapstructure/v2
  dependency-version: 2.3.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mattdurham mattdurham changed the title Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 (#5333) Resolve CVEs Aug 5, 2025
ie-pham and others added 7 commits August 6, 2025 09:18
…shards (grafana#5438)

* Correctly assign backend shard numbers depending on ingester shards

Signed-off-by: Joe Elliott <number101010@gmail.com>

* changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* test cleanup

Signed-off-by: Joe Elliott <number101010@gmail.com>

* a single space raised up as an offering to the lint gods

Signed-off-by: Joe Elliott <number101010@gmail.com>

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>
)

* Propagate OTel context in distributor

* Changelog

* chlog v2

* Only propagate sampled traces

* Refactor
# Conflicts:
#	CHANGELOG.md
* [bugfix] TraceQL Metrics: correct interval number calculation

* [bugfix] Force to return one interval for instant queries

* linter fix: apply De Morgan's law

* e2e: refactoring

* e2e: refactoring

* e2e: function to call instant query

* e2e: instant query

* e2e: remove redundant param

* e2e: add traces with high cardinality attributes

* e2e: test instant bottomk/topk

* Add tests for topk and bottomk Instant queries

* Changelog

* test refactoring

* Basic test to check corner cases for instant query

* [bugfix] Correct instant query calculation
when query both generator and backend

---------

Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
* Nil check partitionAssignmentVar

* Changelog
# Conflicts:
#	CHANGELOG.md
@mattdurham mattdurham changed the title Resolve CVEs Resolve CVEs and prepare for 2.8.2 Aug 6, 2025
* [BUGFIX] Fix ingester issue where a hash collision could lead to spans stored incorrectly [#5276](https://github.com/grafana/tempo/pull/5276) (@carles-grafana)

# v2.8.0

* [CHANGE] **BREAKING CHANGE** Change default http-listen-port from 80 to 3200 [#4960](https://github.com/grafana/tempo/pull/4960) (@martialblog)
* [CHANGE] **BREAKING CHANGE** Upgrade OTEL Collector to v0.122.1 [#4893](https://github.com/grafana/tempo/pull/4893) (@javiermolinar)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These changes are to true up between main and release. Looks like we did some cleanup.

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
@knylander-grafana
Copy link
Contributor

Release notes PR: #5486

mattdurham and others added 2 commits August 6, 2025 11:39
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
@mattdurham mattdurham merged commit 6b92615 into grafana:release-v2.8 Aug 6, 2025
19 checks passed
@mattdurham mattdurham deleted the prep-release-v2.8.2 branch August 6, 2025 20:04
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.

8 participants