Skip to content

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

Draft
jsuereth wants to merge 3 commits into
open-telemetry:mainfrom
jsuereth:pr-version-conflict-resolution
Draft

Expand dependency conflict resolution to allow different versions if major-version is compatible#1573
jsuereth wants to merge 3 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

assert_eq!(r#ref, attr_name);
assert_eq!(schema_url1, "local");
assert_eq!(schema_url2, "http://test/schema/v2");
let urls = vec![schema_url1, schema_url2];
@codecov

codecov Bot commented Jul 6, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 71.00000% with 58 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.0%. Comparing base (4352e77) to head (41231b9).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
crates/weaver_resolver/src/attribute.rs 64.2% 30 Missing ⚠️
crates/weaver_resolver/src/loader.rs 64.0% 18 Missing ⚠️
crates/weaver_resolver/src/dependency.rs 83.0% 10 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #1573     +/-   ##
=======================================
- Coverage   82.2%   82.0%   -0.3%     
=======================================
  Files        129     129             
  Lines      10949   11078    +129     
=======================================
+ Hits        9010    9086     +76     
- Misses      1939    1992     +53     

☔ 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.

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.

2 participants