update schemas, clean up versions and file_format

Author: lmolkova

crates/weaver_emit/src/lib.rs

@@ -590,7 +590,7 @@ mod tests {
         };
 
         let registry = ForgeResolvedRegistry {
-            file_format: "2.0.0".to_owned(),
+            file_format: "2/materialized".to_owned(),
             schema_url: "TEST_SCHEMA_URL".to_owned(),
             registry: Registry {
                 attributes: vec![],

crates/weaver_forge/data/http.yaml

@@ -1,4 +1,4 @@
-version: "2"
+file_format: "2"
 attribute_groups:
   - id: http.client.server_and_port
     visibility: internal

crates/weaver_forge/data/registry-http.yaml

@@ -1,4 +1,4 @@
-version: "2"
+file_format: "2"
 attributes:
   - key: http.request.body.size
     type: int

crates/weaver_forge/src/v2/registry.rs

@@ -16,6 +16,9 @@ use crate::{
     },
 };
 
+fn forge_file_format() -> String {
+    "2/materialized".to_owned()
+}
 /// A resolved semantic convention registry used in the context of the template and policy
 /// engines.
 ///
@@ -24,6 +27,7 @@ use crate::{
 #[serde(deny_unknown_fields)]
 pub struct ForgeResolvedRegistry {
     /// Version of the file structure.
+    #[serde(default = "forge_file_format")]
     pub file_format: String,
     /// Schema URL for corresponding resolved schema version
     #[serde(skip_serializing_if = "String::is_empty")]
@@ -414,7 +418,7 @@ impl ForgeResolvedRegistry {
         }
 
         Ok(Self {
-            file_format: schema.file_format,
+            file_format: "2/materialized".to_owned(),
             schema_url: schema.schema_url.clone(),
             registry: Registry {
                 attributes,
@@ -449,17 +453,15 @@ mod tests {
     #[test]
     fn test_try_from_resolved_schema() {
         let resolved_schema = ResolvedTelemetrySchema {
-            file_format: "2.0.0".to_owned(),
+            file_format: "2/materialized".to_owned(),
             schema_url: "https://example.com/schema".to_owned(),
-            registry_url: "my-registry".to_owned(),
-            attribute_catalog: vec![attribute::Attribute {
+                attribute_catalog: vec![attribute::Attribute {
                 key: "test.attr".to_owned(),
                 r#type: AttributeType::PrimitiveOrArray(PrimitiveOrArrayTypeSpec::String),
                 examples: None,
                 common: CommonFields::default(),
             }],
             registry: v2::registry::Registry {
-                registry_url: "https://example.com/registry".to_owned(),
                 attributes: vec![attribute::AttributeRef(0)],
                 spans: vec![span::Span {
                     r#type: SignalId::from("my-span".to_owned()),
@@ -613,12 +615,10 @@ mod tests {
     #[test]
     fn test_try_from_resolved_schema_with_missing_attribute() {
         let resolved_schema = ResolvedTelemetrySchema {
-            file_format: "2.0.0".to_owned(),
+            file_format: "2/materialized".to_owned(),
             schema_url: "https://example.com/schema".to_owned(),
-            registry_url: "http://example.com/registry".to_owned(),
             attribute_catalog: vec![],
             registry: v2::registry::Registry {
-                registry_url: "https://example.com/registry".to_owned(),
                 attributes: vec![], // No attributes - This is the logic bug.
                 spans: vec![span::Span {
                     r#type: SignalId::from("my-span".to_owned()),

crates/weaver_live_check/src/live_checker.rs

@@ -507,7 +507,7 @@ mod tests {
     fn make_registry(use_v2: bool) -> VersionedRegistry {
         if use_v2 {
             VersionedRegistry::V2(ForgeResolvedRegistry {
-                file_format: "2.0.0".to_owned(),
+                file_format: "2/materialized".to_owned(),
                 schema_url: "TEST".to_owned(),
                 registry: Registry {
                     attributes: vec![
@@ -794,7 +794,7 @@ mod tests {
             };
 
             VersionedRegistry::V2(ForgeResolvedRegistry {
-                file_format: "2.0.0".to_owned(),
+                file_format: "2/materialized".to_owned(),
                 schema_url: "TEST_METRICS".to_owned(),
                 registry: Registry {
                     attributes: vec![memory_state_attr.clone()],
@@ -1003,7 +1003,7 @@ mod tests {
             };
 
             VersionedRegistry::V2(ForgeResolvedRegistry {
-                file_format: "2.0.0".to_owned(),
+                file_format: "2/materialized".to_owned(),
                 schema_url: "TEST".to_owned(),
 
                 registry: Registry {
@@ -1519,7 +1519,7 @@ mod tests {
             };
 
             VersionedRegistry::V2(ForgeResolvedRegistry {
-                file_format: "2.0.0".to_owned(),
+                file_format: "2/materialized".to_owned(),
                 schema_url: "TEST_EVENTS".to_owned(),
                 registry: Registry {
                     attributes: vec![session_id_attr.clone(), session_previous_id_attr.clone()],

crates/weaver_resolved_schema/src/v2/mod.rs

@@ -26,9 +26,9 @@ use crate::v2::{
     stats::Stats,
 };
 
-/// Returns the default file format version for v2 schemas.
-fn default_file_format() -> String {
-    "2.0.0".to_owned()
+/// Returns the file format version for v2 resolved schema.
+fn resolved_file_format() -> String {
+    "2/resolved".to_owned()
 }
 
 pub mod attribute;
@@ -49,13 +49,11 @@ pub mod stats;
 #[serde(deny_unknown_fields)]
 pub struct ResolvedTelemetrySchema {
     /// Version of the file structure.
-    #[serde(default = "default_file_format")]
+    #[serde(default = "resolved_file_format")]
     pub file_format: String,
-    /// Schema URL that this file is published at.
-    pub schema_url: String,
     /// The URL of the registry that this schema belongs to.
     #[serde(skip_serializing_if = "String::is_empty")]
-    pub registry_url: String,
+    pub schema_url: String,
     /// Catalog of attributes. Note: this will include duplicates for the same key.
     pub attribute_catalog: Vec<Attribute>,
     /// The registry that this schema belongs to.
@@ -130,9 +128,8 @@ impl TryFrom<crate::ResolvedTelemetrySchema> for ResolvedTelemetrySchema {
         let (attribute_catalog, registry, refinements) =
             convert_v1_to_v2(value.catalog, value.registry)?;
         Ok(ResolvedTelemetrySchema {
-            file_format: default_file_format(),
+            file_format: resolved_file_format(),
             schema_url: value.schema_url,
-            registry_url: value.registry_id,
             attribute_catalog,
             registry,
             refinements,
@@ -505,7 +502,6 @@ pub fn convert_v1_to_v2(
     }
 
     let v2_registry = Registry {
-        registry_url: r.registry_url,
         attributes,
         spans,
         metrics,
@@ -1005,9 +1001,8 @@ mod tests {
         let v2_schema: Result<ResolvedTelemetrySchema, _> = v1_schema.try_into();
         assert!(v2_schema.is_ok());
         let v2_schema = v2_schema.unwrap();
-        assert_eq!(v2_schema.file_format, default_file_format());
+        assert_eq!(v2_schema.file_format, resolved_file_format());
         assert_eq!(v2_schema.schema_url, "my.schema.url");
-        assert_eq!(v2_schema.registry_url, "my-registry");
     }
 
     #[test]
@@ -1214,14 +1209,12 @@ mod tests {
     // create an empty schema for testing.
     fn empty_v2_schema() -> ResolvedTelemetrySchema {
         ResolvedTelemetrySchema {
-            file_format: default_file_format(),
+            file_format: resolved_file_format(),
             schema_url: "my.schema.url".to_owned(),
-            registry_url: "main".to_owned(),
             attribute_catalog: vec![],
             registry: Registry {
                 attributes: vec![],
                 attribute_groups: vec![],
-                registry_url: "todo".to_owned(),
                 spans: vec![],
                 metrics: vec![],
                 events: vec![],

crates/weaver_resolved_schema/src/v2/registry.rs

@@ -35,11 +35,6 @@ pub struct Registry {
     /// Catalog of (public) attribute groups.
     pub attribute_groups: Vec<AttributeGroup>,
 
-    /// The semantic convention registry url.
-    ///
-    /// This is the base URL, under which this registry can be found.
-    pub registry_url: String,
-
     /// A  list of span signal definitions.
     pub spans: Vec<Span>,
 
@@ -267,7 +262,6 @@ mod test {
         }];
         let registry = Registry {
             attribute_groups: vec![],
-            registry_url: "https://opentelemetry.io/schemas/1.23.0".to_owned(),
             spans: vec![Span {
                 r#type: "test.span".to_owned().into(),
                 kind: SpanKindSpec::Client,

crates/weaver_resolver/data/registry-test-16-attr-conflict/registry/test-16.yaml

@@ -1,4 +1,4 @@
-version: "2"
+file_format: "2"
 attributes:
   - key: test.attr.one
     stability: stable

crates/weaver_resolver/data/registry-test-v2-1-everything/registry/http.yaml

@@ -1,4 +1,4 @@
-version: "2"
+file_format: "2"
 attributes:
   - key: server.port
     stability: stable

crates/weaver_resolver/data/registry-test-v2-2-multifile/registry/http.yaml

@@ -1,4 +1,4 @@
-version: "2"
+file_format: "2"
 metrics:
   - name: http.server.request.duration
     brief: "Duration of HTTP server requests."