Use manifest/2.0, resolved/2.0 for file format, add version bump enforcement

.github/workflows/ci.yml

@@ -67,6 +67,8 @@ jobs:
         run: cargo test --workspace --no-default-features
       - name: History check
         run: cargo xtask history
+      - name: Schema compat check
+        run: cargo xtask schema-compat
   msrv:
     name: Check MSRV
     runs-on: ubuntu-latest

crates/weaver_resolved_schema/src/lib.rs

@@ -38,9 +38,9 @@ pub use error::Error;
 pub const OTEL_REGISTRY_ID: &str = "OTEL";
 
 /// Version string denoting V1 resolved schema.
-pub(crate) const V1_RESOLVED_FILE_FORMAT: &str = "resolved/1.0.0";
+pub(crate) const V1_RESOLVED_FILE_FORMAT: &str = "resolved/1.0";
 /// Version string denoting V2 resolved schema.
-pub(crate) const V2_RESOLVED_FILE_FORMAT: &str = "resolved/2.0.0";
+pub(crate) const V2_RESOLVED_FILE_FORMAT: &str = "resolved/2.0";
 
 /// A Resolved Telemetry Schema.
 /// A Resolved Telemetry Schema is self-contained and doesn't contain any

crates/weaver_resolved_schema/src/v2/mod.rs

@@ -48,6 +48,8 @@ pub mod stats;
 #[serde(deny_unknown_fields)]
 pub struct ResolvedTelemetrySchema {
     /// Version of the file structure.
+    /// Always `"resolved/2.0"` in this version.
+    #[schemars(extend("const" = "resolved/2.0"))]
     pub file_format: String,
     /// Schema URL that this file is published at.
     pub schema_url: SchemaUrl,

crates/weaver_resolver/data/registry-test-published-1/published/registry_manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 stability: stable
 schema_url: https://opentelemetry.io/schemas/1.0.0
 resolved_schema_uri: resolved_schema.yaml

crates/weaver_resolver/data/registry-test-published-1/published/resolved_schema.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://opentelemetry.io/schemas/1.0.0
 attribute_catalog:
 - key: a

crates/weaver_resolver/data/registry-test-published-2/published/registry_manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 stability: stable
 schema_url: https://opentelemetry.io/schemas/1.0.0
 resolved_schema_uri: resolved_schema.yaml

crates/weaver_resolver/data/registry-test-published-2/published/resolved_schema.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://opentelemetry.io/schemas/1.0.0
 attribute_catalog:
 - key: a

crates/weaver_resolver/data/registry-test-v2-5-published/expected-schema.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://opentelemetry.io/schemas/1.0.0
 attribute_catalog:
 - key: local.attr

crates/weaver_resolver/data/registry-test-v2-5-published/published/registry_manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 stability: stable
 schema_url: https://example.com/schemas/1.2.3
 resolved_schema_uri: resolved_schema.yaml

crates/weaver_resolver/data/registry-test-v2-5-published/published/resolved_schema.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://opentelemetry.io/schemas/1.0.0
 attribute_catalog:
 - key: a

crates/weaver_resolver/data/registry-test-v2-dep/consumer_published/manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 schema_url: https://consumer.example.com/schemas/1.0.0
 description: Consumer registry that depends on the server V2 package.
 dependencies:

crates/weaver_resolver/data/registry-test-v2-dep/consumer_published/resolved.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://consumer.example.com/schemas/1.0.0
 attribute_catalog:
 - key: server.port

crates/weaver_resolver/data/registry-test-v2-dep/published/manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 schema_url: https://server.example.com/schemas/1.0.0
 description: Server semantic conventions.
 stability: development

crates/weaver_resolver/data/registry-test-v2-dep/published/resolved.yaml

@@ -1,4 +1,4 @@
-file_format: resolved/2.0.0
+file_format: resolved/2.0
 schema_url: https://server.example.com/schemas/1.0.0
 attribute_catalog:
 - key: server.port

crates/weaver_resolver/src/dependency.rs

@@ -822,7 +822,7 @@ mod tests {
 
     fn example_v2_schema() -> weaver_resolved_schema::v2::ResolvedTelemetrySchema {
         weaver_resolved_schema::v2::ResolvedTelemetrySchema {
-            file_format: "resolved/2.0.0".to_owned(),
+            file_format: "resolved/2.0".to_owned(),
             schema_url: "http://test/schemas/2.0.0".try_into().unwrap(),
             registry: weaver_resolved_schema::v2::registry::Registry {
                 attribute_groups: vec![

crates/weaver_semconv/src/manifest.rs

@@ -23,7 +23,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 use weaver_common::vdir::VirtualDirectoryPath;
 
 /// The file format version of the publication manifest.
-pub const PUBLICATION_MANIFEST_FILE_FORMAT: &str = "manifest/2.0.0";
+pub const PUBLICATION_MANIFEST_FILE_FORMAT: &str = "manifest/2.0";
 
 /// Represents the definition manifest for a semantic convention registry.
 ///
@@ -234,7 +234,7 @@ impl RawManifestFields {
 /// A registry manifest that can be either a definition or a publication manifest.
 ///
 /// The `file_format` field is the discriminator:
-/// - `"manifest/2.0.0"` → [`PublicationRegistryManifest`]
+/// - `"manifest/2.0"` → [`PublicationRegistryManifest`]
 /// - absent → [`DefinitionRegistryManifest`]
 #[derive(Debug, Clone, JsonSchema)]
 #[serde(untagged)]
@@ -336,8 +336,8 @@ impl RegistryManifest {
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
 pub struct PublicationRegistryManifest {
     /// The file format version of this publication manifest.
-    /// Always `"manifest/2.0.0"`in this version.
-    #[schemars(extend("const" = "manifest/2.0.0"))]
+    /// Always `"manifest/2.0"`in this version.
+    #[schemars(extend("const" = "manifest/2.0"))]
     pub file_format: String,
 
     /// The schema URL for this registry.
@@ -641,7 +641,7 @@ stability: stable
     fn test_publication_manifest_parsed_as_publication_variant() {
         let manifest = manifest_from_yaml(
             r#"
-file_format: "manifest/2.0.0"
+file_format: "manifest/2.0"
 schema_url: "https://example.com/schemas/1.0.0"
 resolved_schema_uri: "https://example.com/resolved/1.0.0/resolved.yaml"
 "#,
@@ -701,12 +701,12 @@ stability: stable
 
     #[test]
     fn test_publication_manifest_parsed_as_publication_variant() {
-        // A manifest with file_format "manifest/2.0.0" and resolved_schema_uri
+        // A manifest with file_format "manifest/2.0" and resolved_schema_uri
         // is parsed as the Publication variant.
         let manifest = manifest_from_yaml(
             r#"
 schema_url: "https://example.com/schemas/1.0.0"
-file_format: "manifest/2.0.0"
+file_format: "manifest/2.0"
 resolved_schema_uri: "https://example.com/resolved/1.0.0/resolved.yaml"
 "#,
         )

crates/weaver_semconv/tests/published_repository/3.0.0/registry_manifest.yaml

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 description: Test repository that has been resolved.
 schema_url: http://resolved/3.0.0
 repository_url: https://github.com/open-telemetry/weaver.git

crates/weaver_semconv/tests/published_repository/resolved/1.0.0

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 description: Test repository that has been resolved.
 schema_url: http://resolved/1.0.0
 repository_url: https://github.com/open-telemetry/weaver.git

crates/weaver_semconv/tests/published_repository/resolved/2.0.0

@@ -1,4 +1,4 @@
-file_format: manifest/2.0.0
+file_format: manifest/2.0
 description: Test repository that has been resolved.
 schema_url: http://resolved/2.0.0
 repository_url: https://github.com/open-telemetry/weaver.git

crates/weaver_semconv_gen/src/v2.rs

@@ -449,7 +449,7 @@ mod tests {
 
     fn test_registry() -> ResolvedTelemetrySchema {
         ResolvedTelemetrySchema {
-            file_format: "resolved/2.0.0".to_owned(),
+            file_format: "resolved/2.0".to_owned(),
             schema_url: "https://todo/1.0.0".try_into().unwrap(),
             attribute_catalog: vec![Attribute {
                 key: "attr1".to_owned(),

crates/xtask/Cargo.toml

@@ -11,6 +11,7 @@ rust-version.workspace = true
 [dependencies]
 anyhow.workspace = true
 assert_cmd = "2.0.17"
+serde_json.workspace = true
 gix = { version = "0.79.0", default-features = false, features = [
     "comfort",
     "blocking-http-transport-reqwest",

crates/xtask/src/main.rs

@@ -11,6 +11,7 @@
 #![allow(clippy::print_stderr)]
 
 mod history;
+mod schema_compat;
 mod validate;
 
 #[cfg(not(tarpaulin_include))]
@@ -22,6 +23,7 @@ fn main() -> anyhow::Result<()> {
         Some(task) => match task.as_str() {
             "validate" => validate::run(),
             "history" => history::run(std::env::args().nth(2)),
+            "schema-compat" => schema_compat::run(),
             "help" => print_help(),
             _ => {
                 eprintln!("Unknown task: {task}");
@@ -42,6 +44,7 @@ Tasks:
   - validate: Validate the entire structure of the weaver project.
   - history: Run registry check on semconv models within back compatibility range.
              Optionally provide a start semver e.g. `history 1.29.0`.
+  - schema-compat: Check JSON schema backwards and forwards compatibility against the latest release.
 "
     );
     Ok(())