diff --git a/rust/otap-dataflow/Cargo.toml b/rust/otap-dataflow/Cargo.toml
index 15c6d090d5..b8fa00788a 100644
--- a/rust/otap-dataflow/Cargo.toml
+++ b/rust/otap-dataflow/Cargo.toml
@@ -207,11 +207,11 @@ trybuild = "1.0"
 unsync = "0.1.2"
 url = "2.5.7"
 uuid = { version = "1.17.0", features = ["v4", "v7"] }
-weaver_common = { git = "https://github.com/open-telemetry/weaver.git", tag = "v0.21.2"}
-weaver_forge = { git = "https://github.com/open-telemetry/weaver.git", tag = "v0.21.2" }
-weaver_resolved_schema = { git = "https://github.com/open-telemetry/weaver.git", tag = "v0.21.2"}
-weaver_resolver = { git = "https://github.com/open-telemetry/weaver.git", tag = "v0.21.2"}
-weaver_semconv = { git = "https://github.com/open-telemetry/weaver.git", tag = "v0.21.2"}
+weaver_common = { git = "https://github.com/open-telemetry/weaver.git", rev = "37c645a5ebc9e0d2a68f9228205f1d7d6a32ccbc"}
+weaver_forge = { git = "https://github.com/open-telemetry/weaver.git", rev = "37c645a5ebc9e0d2a68f9228205f1d7d6a32ccbc" }
+weaver_resolved_schema = { git = "https://github.com/open-telemetry/weaver.git", rev = "37c645a5ebc9e0d2a68f9228205f1d7d6a32ccbc"}
+weaver_resolver = { git = "https://github.com/open-telemetry/weaver.git", rev = "37c645a5ebc9e0d2a68f9228205f1d7d6a32ccbc"}
+weaver_semconv = { git = "https://github.com/open-telemetry/weaver.git", rev = "37c645a5ebc9e0d2a68f9228205f1d7d6a32ccbc"}
 xxhash-rust = { version = "0.8", features = ["xxh3"] }
 zip = "=8.6.0"
 byte-unit = { version = "5.2.0", features = ["serde"] }
diff --git a/rust/otap-dataflow/crates/core-nodes/src/receivers/host_metrics_receiver/procfs/tests.rs b/rust/otap-dataflow/crates/core-nodes/src/receivers/host_metrics_receiver/procfs/tests.rs
index 799c197fb0..dfffc65986 100644
--- a/rust/otap-dataflow/crates/core-nodes/src/receivers/host_metrics_receiver/procfs/tests.rs
+++ b/rust/otap-dataflow/crates/core-nodes/src/receivers/host_metrics_receiver/procfs/tests.rs
@@ -1413,8 +1413,9 @@ fn load_semconv_registry() -> ResolvedRegistry {
             )),
         });
 
-    let registry_repo =
-        RegistryRepo::try_new("main", &registry_path).expect("semantic convention registry");
+    let mut semconv_errors = Vec::new();
+    let registry_repo = RegistryRepo::try_new(None, &registry_path, &mut semconv_errors)
+        .expect("semantic convention registry");
     let registry = match SchemaResolver::load_semconv_repository(registry_repo, false) {
         WResult::Ok(registry) | WResult::OkWithNFEs(registry, _) => registry,
         WResult::FatalErr(err) => panic!("failed to load semantic convention registry: {err}"),
diff --git a/rust/otap-dataflow/crates/core-nodes/src/receivers/traffic_generator/config.rs b/rust/otap-dataflow/crates/core-nodes/src/receivers/traffic_generator/config.rs
index 1b49637454..f8cfd37859 100644
--- a/rust/otap-dataflow/crates/core-nodes/src/receivers/traffic_generator/config.rs
+++ b/rust/otap-dataflow/crates/core-nodes/src/receivers/traffic_generator/config.rs
@@ -284,11 +284,13 @@ impl Config {
     /// Provide a reference to the ResolvedRegistry.
     /// Returns None if data_source is Static.
     pub fn get_registry(&self) -> Result<Option<ResolvedRegistry>, String> {
+        let mut semconv_errors = Vec::new();
         match self.data_source {
             DataSource::Static => Ok(None),
             DataSource::SemanticConventions => {
-                let registry_repo = RegistryRepo::try_new("main", &self.registry_path)
-                    .map_err(|err| err.to_string())?;
+                let registry_repo =
+                    RegistryRepo::try_new(None, &self.registry_path, &mut semconv_errors)
+                        .map_err(|err| err.to_string())?;
 
                 // Load the semantic convention registry.
                 let registry = match SchemaResolver::load_semconv_repository(registry_repo, false) {
diff --git a/rust/otap-dataflow/crates/validation/src/encode_decode.rs b/rust/otap-dataflow/crates/validation/src/encode_decode.rs
index 30f0372200..2ded4a74cf 100644
--- a/rust/otap-dataflow/crates/validation/src/encode_decode.rs
+++ b/rust/otap-dataflow/crates/validation/src/encode_decode.rs
@@ -77,13 +77,15 @@ mod test {
     const ITERATIONS: usize = 10;
 
     fn get_registry() -> ResolvedRegistry {
+        let mut semconv_errors = Vec::new();
         let registry_repo = RegistryRepo::try_new(
-            "main",
+            None,
             &VirtualDirectoryPath::GitRepo {
                 url: "https://github.com/open-telemetry/semantic-conventions.git".to_owned(),
                 sub_folder: Some("model".to_owned()),
                 refspec: None,
             },
+            &mut semconv_errors,
         )
         .expect("all registries are definied under the model folder in semantic convention repo");