Skip to content

Expand dependency conflict resolution to allow different versions if major-version is compatible#1573

Merged
jsuereth merged 13 commits into
open-telemetry:mainfrom
jsuereth:pr-version-conflict-resolution
Jul 15, 2026
Merged

Expand dependency conflict resolution to allow different versions if major-version is compatible#1573
jsuereth merged 13 commits into
open-telemetry:mainfrom
jsuereth:pr-version-conflict-resolution

Conversation

@jsuereth

@jsuereth jsuereth commented Jul 6, 2026

Copy link
Copy Markdown
Contributor
  • Fix forge tests
  • Add new tests for dependencies
  • Implement very simple "latest version in major-series wins" conflict resolution algorithm

Comment thread crates/weaver_resolver/src/attribute.rs Fixed
@codecov

codecov Bot commented Jul 6, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 68.78049% with 128 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.1%. Comparing base (62d1f2d) to head (c356743).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
crates/weaver_resolver/src/dependency.rs 63.9% 70 Missing ⚠️
crates/weaver_resolver/src/attribute.rs 69.5% 32 Missing ⚠️
crates/weaver_resolver/src/loader.rs 53.6% 19 Missing ⚠️
crates/weaver_resolver/src/lib.rs 86.6% 4 Missing ⚠️
crates/weaver_resolver/src/registry.rs 85.7% 3 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #1573     +/-   ##
=======================================
- Coverage   82.3%   81.1%   -1.3%     
=======================================
  Files        129     130      +1     
  Lines      11004   11514    +510     
=======================================
+ Hits        9066    9344    +278     
- Misses      1938    2170    +232     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jsuereth
jsuereth marked this pull request as ready for review July 9, 2026 22:10
@jsuereth
jsuereth requested a review from a team as a code owner July 9, 2026 22:10
Comment thread crates/weaver_resolver/src/attribute.rs Outdated
Comment thread crates/weaver_resolver/src/attribute.rs
Comment thread crates/weaver_resolver/src/attribute.rs Outdated
Comment thread crates/weaver_resolver/src/attribute.rs Outdated
Comment thread crates/weaver_resolver/src/conflict_strategy.rs Outdated
Comment thread crates/weaver_resolver/src/dependency.rs
Comment thread crates/weaver_resolver/src/loader.rs Outdated
for (name, main_url) in main_dependencies.iter() {
if let Some(selected_url) = chosen_versions.get(name) {
if selected_url != main_url {
warnings.push(Error::ConversionError {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this a warning/NFE ? ConversionError seems to be regular error

Comment thread crates/weaver_resolver/src/lib.rs Outdated
Comment thread crates/weaver_resolver/src/registry.rs Outdated
@opentelemetry-pr-dashboard

Copy link
Copy Markdown

This PR has review comments. Review suggestions, whether from maintainers or automated reviewers, aren't always correct or required. Please evaluate each comment on its merits, then make sure each thread has a clear outcome.

For example, link to the commit if you applied a suggestion, explain why it wasn't applied, or ask a follow-up question.

Automation flags a PR for human review once every review thread has a reply or is marked as resolved.

Status across open PRs is visible on the pull request dashboard.

@jsuereth
jsuereth enabled auto-merge (squash) July 15, 2026 18:48
@jsuereth
jsuereth merged commit 2d53b1a into open-telemetry:main Jul 15, 2026
26 checks passed
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