Skip to content

fix(deps): [Release 3.6.x] Update dskit to resolve Otel conflict - #20368

Merged
paul1r merged 1 commit into
grafana:release-3.6.xfrom
bboreham:update-dskit-fix-tracing
Jan 8, 2026
Merged

fix(deps): [Release 3.6.x] Update dskit to resolve Otel conflict#20368
paul1r merged 1 commit into
grafana:release-3.6.xfrom
bboreham:update-dskit-fix-tracing

Conversation

@bboreham

@bboreham bboreham commented Jan 8, 2026

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:
This is the same dependency change from #19562, backported to the release-3.6.x branch.
The symptom was:

err="failed to initialise trace resource: conflicting Schema URL: https://opentelemetry.io/schemas/1.37.0 and https://opentelemetry.io/schemas/1.34.0"

This dskit update removes 1.34.0 so the conflict goes away.
It also makes a small change in tracing, with no outward effect.

Which issue(s) this PR fixes:
Fixes #19975

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • NA Documentation added
  • NA Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
@bboreham
bboreham requested a review from a team as a code owner January 8, 2026 19:24
@paul1r paul1r changed the title fix(deps) [Release 3.6.x] Update dskit to resolve Otel conflict Jan 8, 2026
@paul1r
paul1r merged commit fb05a36 into grafana:release-3.6.x Jan 8, 2026
68 of 69 checks passed
@bboreham
bboreham deleted the update-dskit-fix-tracing branch January 9, 2026 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants