Skip to content

Point to Weaver main branch to include gix fix to not build openssl on windows platform and fix tag parsing issue causing crashes in latest weaver release bit. #2910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmacd merged 5 commits into from
May 12, 2026
+15 −10
Merged

Point to Weaver main branch to include gix fix to not build openssl on windows platform and fix tag parsing issue causing crashes in latest weaver release bit. #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
102c657
Point to weaver main branch to avoid default openssl build as part of…
sapatrjv May 8, 2026
f469e7c
Merge branch 'main' into dev/sapatr/referweaverbrachtoavoidopensslbuild
sapatrjv May 8, 2026
5567bc2
Merge branch 'main' into dev/sapatr/referweaverbrachtoavoidopensslbuild
sapatrjv May 8, 2026
42af323
Point to weaver main branch to avoid default openssl build as part of…
sapatrjv May 8, 2026
f474da9
Merge branch 'main' into dev/sapatr/referweaverbrachtoavoidopensslbuild
sapatrjv May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rust/otap-dataflow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Copy link
Copy Markdown
Member

@cijothomas cijothomas May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we ask weaver for a release instead?

Copy link
Copy Markdown
Member

@cijothomas cijothomas May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, it looks like there is a new release already, but then I am wondering why we use commit hash instead of tag?

Copy link
Copy Markdown
Contributor Author

@sapatrjv sapatrjv May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested for the same but no response. It is almost 2 weeks no weaver release. Hence taking this approach. Once weaver release is done rev# will be replaced with tag#.

Copy link
Copy Markdown
Member

@cijothomas cijothomas May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lquerel should be able to help with weaver release, if we badly need it soon

Copy link
Copy Markdown
Contributor

@jmacd jmacd May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not wait.

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"] }
Expand Down
5 changes: 3 additions & 2 deletions rust/otap-dataflow/crates/core-nodes/src/receivers/host_metrics_receiver/procfs/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"),
Expand Down
6 changes: 4 additions & 2 deletions rust/otap-dataflow/crates/core-nodes/src/receivers/traffic_generator/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 3 additions & 1 deletion rust/otap-dataflow/crates/validation/src/encode_decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
Loading