Skip to content

chore(deps): bump dskit to emit trace_id pprof label - #5261

Merged
marcsanmi merged 1 commit into
mainfrom
deps/dskit-trace-id
Jun 17, 2026
Merged

chore(deps): bump dskit to emit trace_id pprof label#5261
marcsanmi merged 1 commit into
mainfrom
deps/dskit-trace-id

Conversation

@marcsanmi

@marcsanmi marcsanmi commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Bumps dskit to pick up grafana/dskit#1006, so Pyroscope's own self-profiling emits a trace_id pprof label for traces↔profiles correlation by trace ID. The dskit bump also requires adapting to its new dns.NewProvider signature (3 call sites) and bumping the grafana/memberlist replace to match dskit's.

@marcsanmi
marcsanmi requested review from a team and aleks-p as code owners June 16, 2026 14:57
@marcsanmi
marcsanmi force-pushed the deps/dskit-trace-id branch from 6f7446c to 2f29087 Compare June 16, 2026 15:10
@marcsanmi
marcsanmi requested a review from a team as a code owner June 16, 2026 15:10
Comment thread pkg/metastore/discovery/parse.go

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Updates core dependencies to pick up grafana/dskit#1006, enabling Pyroscope self-profiling to emit a trace_id pprof label for traces↔profiles correlation, and adapts the codebase and generated docs/help outputs to the updated dependency surface.

Changes:

  • Bump github.com/grafana/dskit (and aligned deps like grafana/memberlist and OpenTelemetry modules) to versions that include trace_id pprof label emission.
  • Update all dns.NewProvider call sites to match the new dskit function signature.
  • Refresh generated CLI help and configuration reference docs to include new runtime-config HTTP client and memberlist options.

Reviewed changes

Copilot reviewed 6 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
pkg/pyroscope/modules.go Update memberlist DNS provider construction for new dskit dns.NewProvider signature.
pkg/metastore/raftnode/node_bootstrap.go Update metastore raft bootstrap DNS provider construction for new dskit signature.
pkg/metastore/discovery/parse.go Update discovery DNS provider creation to new dskit signature.
go.mod Bump dskit + related deps; update grafana/memberlist replace to match dskit expectations.
go.sum Update dependency checksums to reflect the module upgrades.
docs/sources/configure-server/reference-configuration-parameters/index.md Update generated config reference to include newly exposed options from bumped deps.
cmd/pyroscope/help-all.txt.tmpl Update generated full help output to include newly exposed CLI flags.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@marcsanmi
marcsanmi merged commit f5c7ba4 into main Jun 17, 2026
34 checks passed
@marcsanmi
marcsanmi deleted the deps/dskit-trace-id branch June 17, 2026 08:59
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