Skip to content

Commit

Permalink
remove resolved and resolver any_value.rs just use AnyValueSpec in …
Browse files Browse the repository at this point in the history
…resolved schema
  • Loading branch information
MSNev committed Sep 20, 2024
1 parent ea68fa7 commit 7aad66b
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 104 deletions.
4 changes: 4 additions & 0 deletions crates/weaver_forge/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ pub struct ResolvedGroup {
/// The readable name for attribute groups used when generating registry tables.
#[serde(skip_serializing_if = "Option::is_none")]
pub display_name: Option<String>,
// /// The body specification used for event semantic conventions.
// #[serde(skip_serializing_if = "Option::is_none")]
// pub body: Option<AnyValueSpec>,
}

impl ResolvedGroup {
Expand Down Expand Up @@ -134,6 +137,7 @@ impl ResolvedGroup {
})
.collect();
let lineage = group.lineage.clone();

if !errors.is_empty() {
return Err(Error::CompoundError(errors));
}
Expand Down
57 changes: 0 additions & 57 deletions crates/weaver_resolved_schema/src/any_value.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/weaver_resolved_schema/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use weaver_version::Versions;

pub mod any_value;
pub mod attribute;
pub mod catalog;
mod error;
Expand Down
2 changes: 1 addition & 1 deletion crates/weaver_resolved_schema/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub struct Group {
// /// The body of the event.
// /// This fields is only used for event groups.
// #[serde(skip_serializing_if = "Option::is_none")]
// pub body: Option<AnyValue>,
// pub body: Option<AnyValueSpec>,
}

/// Common statistics for a group.
Expand Down
3 changes: 3 additions & 0 deletions crates/weaver_resolved_schema/src/signal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ pub struct Event {
/// A set of tags for the event.
#[serde(skip_serializing_if = "Option::is_none")]
tags: Option<Tags>,
// /// The body of the event, not used for Span events.
// #[serde(skip_serializing_if = "Option::is_none")]
// body: Option<AnyValueSpec>,
}

/// A span signal.
Expand Down
44 changes: 0 additions & 44 deletions crates/weaver_resolver/src/any_value.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/weaver_resolver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use weaver_semconv::semconv::SemConvSpec;
use crate::attribute::AttributeCatalog;
use crate::registry::resolve_semconv_registry;

pub mod any_value;
pub mod attribute;
mod constraint;
pub mod registry;
Expand Down

0 comments on commit 7aad66b

Please sign in to comment.