Skip to content

Update dskit and adjust memcached interface signature#5604

Merged
zalegrala merged 2 commits intografana:mainfrom
zalegrala:dskitUpdate
Sep 3, 2025
Merged

Update dskit and adjust memcached interface signature#5604
zalegrala merged 2 commits intografana:mainfrom
zalegrala:dskitUpdate

Conversation

@zalegrala
Copy link
Copy Markdown
Contributor

@zalegrala zalegrala commented Sep 3, 2025

What this PR does:

  • update dskit
  • adjust memcached interface to include context for upstream dskit change
  • re-generate config manifest

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@zalegrala zalegrala enabled auto-merge (squash) September 3, 2025 15:13
@zalegrala zalegrala merged commit c5bba7c into grafana:main Sep 3, 2025
23 checks passed
@zalegrala zalegrala deleted the dskitUpdate branch September 3, 2025 16:34
ie-pham pushed a commit that referenced this pull request Apr 8, 2026
* Update dskit and adjust memcached interface signature

* Generate config manifest
ie-pham added a commit that referenced this pull request Apr 9, 2026
* chore(deps): update grpc to v1.79.3, otel to v1.40.0, dskit, and gomemcache

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(deps): update module go.opentelemetry.io/otel/sdk to v1.40.0 [security] (main) (#6518)

* fix(deps): update module go.opentelemetry.io/otel/sdk to v1.40.0 [security]

| datasource | package                      | from    | to      |
| ---------- | ---------------------------- | ------- | ------- |
| go         | go.opentelemetry.io/otel/sdk | v1.38.0 | v1.40.0 |
| go         | go.opentelemetry.io/otel/sdk | v1.39.0 | v1.40.0 |

Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>

* include missing implementation

---------

Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Co-authored-by: javiermolinar <javimolina@fastmail.com>

* Update dskit and adjust memcached interface signature (#5604)

* Update dskit and adjust memcached interface signature

* Generate config manifest

* [rhythm] Add endpoint for partition downscaling (#4913)

* Add endpoint for partition downscaling

Introduce `/ingester/prepare-partition-downscale` endpoint to manage ingester partition states. This enables transitions between ACTIVE and INACTIVE states, supporting partition downscaling.

Signed-off-by: Mario <mariorvinas@gmail.com>

* chlog

* Add partition downscale integration tests

* fmt

* Remove unused code

* More stable?

* Unnecessary cleanup

* Fix harder

* Implement missing method

* pls

* Return partition state

* fix

* switch

* comment

---------

Signed-off-by: Mario <mariorvinas@gmail.com>

* manifest.md

* chore: fix vendor after cherry-pick of 6b3e4a5

Remove e2e vendor files added by the cherry-pick that are inconsistent
with the pinned go.mod version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* revert: undo cherry-pick of 6b3e4a5 (partition downscaling feature)

Cherry-pick brought in too much unrelated feature code for a release branch:
new integration tests, production code, and an e2e dependency upgrade.
Will apply the minimal fix (GetSubringForOperationStates on mockRing) manually instead.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: add GetSubringForOperationStates to mockRing to satisfy ring.ReadRing interface

Required by dskit upgrade; method added to ring.ReadRing interface.
Minimal manual fix — no suitable targeted cherry-pick available.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* manifest.md

---------

Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Signed-off-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com>
Co-authored-by: javiermolinar <javimolina@fastmail.com>
Co-authored-by: Zach Leslie <zach.leslie@grafana.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
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.

3 participants