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

Author: jsuereth

Cargo.lock

@@ -4,6 +4,6 @@
 # the public API. Ideally this can have a few exceptions as possible.
 allowed_external_types = [
     "serde_core::ser::Serialize",
-    "weaver_semconv::group::GroupSpec",
+    "weaver_semconv::v2::SemConvSpecV2",
     "weaver_live_check::Sample",
 ]

crates/weaver_infer/allowed-external-types.toml

@@ -245,11 +245,12 @@ impl AccumulatedSamples {
                     },
                     attributes,
                     entity_associations: vec![],
+                    requirement_level: None,
                     common: inferred_common_fields(),
                 }
             })
             .collect::<Vec<_>>();
-        spans.sort_by(|left, right| left.r#type.to_string().cmp(&right.r#type.to_string()));
+        spans.sort_by_key(|left| left.r#type.to_string());
 
         let mut metrics = self
             .metrics
@@ -272,11 +273,12 @@ impl AccumulatedSamples {
                     unit: metric.unit.clone(),
                     attributes,
                     entity_associations: vec![],
+                    requirement_level: None,
                     common: inferred_common_fields(),
                 }
             })
             .collect::<Vec<_>>();
-        metrics.sort_by(|left, right| left.name.to_string().cmp(&right.name.to_string()));
+        metrics.sort_by_key(|left| left.name.to_string());
 
         let mut merged_events: HashMap<String, Vec<String>> = self
             .events
@@ -311,11 +313,12 @@ impl AccumulatedSamples {
                         .map(|attribute_name| attribute_or_group_ref(&attribute_name))
                         .collect(),
                     entity_associations: vec![],
+                    requirement_level: None,
                     common: inferred_common_fields(),
                 }
             })
             .collect::<Vec<_>>();
-        events.sort_by(|left, right| left.name.to_string().cmp(&right.name.to_string()));
+        events.sort_by_key(|left| left.name.to_string());
 
         let mut attributes = attribute_defs.into_values().collect::<Vec<_>>();
         attributes.sort_by(|left, right| left.key.cmp(&right.key));

crates/weaver_infer/src/lib.rs

@@ -17,6 +17,7 @@ weaver_diff = { path = "../weaver_diff" }
 weaver_semconv = { path = "../weaver_semconv" }
 weaver_resolved_schema = { path = "../weaver_resolved_schema" }
 
+semver.workspace = true
 thiserror.workspace = true
 rayon.workspace = true
 serde.workspace = true

crates/weaver_resolver/Cargo.toml

@@ -1,11 +1,16 @@
-groups:
+file_format: definition/2
+attributes:
+  - key: registry_a.name
+    type: string
+    brief: Name from registry A.
+    stability: stable
+    examples: ["A"]
+
+attribute_groups:
   - id: registry_a.example
-    type: attribute_group
+    visibility: public
     brief: Example attributes from registry A.
+    stability: stable
     attributes:
-      - id: registry_a.name
-        type: string
-        brief: Name from registry A.
-        stability: stable
-        requirement_level: required
-        examples: "A"
+      - ref: registry_a.name
+        requirement_level: required

crates/weaver_resolver/data/circular-registry-test/registry_a/registry_a.yaml

@@ -1,7 +1,6 @@
 name: registry_a
 description: Test registry A for circular dependency testing.
-semconv_version: 0.1.0
-schema_base_url: https://example.com/registry_a/schemas/
+schema_url: https://example.com/registry_a/schemas/0.1.0
 dependencies:
   - schema_url: https://example.com/registry_b/schemas/1.0.0
     registry_path: data/circular-registry-test/registry_b

crates/weaver_resolver/data/circular-registry-test/registry_a/registry_manifest.yaml

@@ -1,11 +1,16 @@
-groups:
+file_format: definition/2
+attributes:
+  - key: registry_b.name
+    type: string
+    brief: Name from registry B.
+    stability: stable
+    examples: ["B"]
+
+attribute_groups:
   - id: registry_b.example
-    type: attribute_group
+    visibility: public
     brief: Example attributes from registry B.
+    stability: stable
     attributes:
-      - id: registry_b.name
-        type: string
-        brief: Name from registry B.
-        stability: stable
-        requirement_level: required
-        examples: "B"
+      - ref: registry_b.name
+        requirement_level: required

crates/weaver_resolver/data/circular-registry-test/registry_b/registry_b.yaml

@@ -1,7 +1,6 @@
 name: registry_b
 description: Test registry B for circular dependency testing.
-semconv_version: 0.1.0
-schema_base_url: https://example.com/registry_b/schemas/
+schema_url: https://example.com/registry_b/schemas/0.1.0
 dependencies:
   - name: registry_a
     # schema_url: is not necessary here, we're using deprecated, but valid for now `name`

crates/weaver_resolver/data/circular-registry-test/registry_b/registry_manifest.yaml

@@ -1,7 +1,6 @@
 name: main
 description: Main Registry
-semconv_version: 0.1.0
-schema_base_url: https://example.com/main/
+schema_url: https://example.com/main/0.1.0
 dependencies:
   - schema_url: https://example.com/a/0.1.0
     registry_path: data/compatible-version-conflict/registry_a

crates/weaver_resolver/data/compatible-version-conflict/main/registry_manifest.yaml

@@ -0,0 +1,6 @@
+file_format: definition/2
+imports:
+  metrics:
+    - c.metric.1
+  spans:
+    - c.span.2