Skip to content

feat: base subscribers on tracing #151

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

Draft
willkill07 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: base subscribers on tracing #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
478 changes: 478 additions & 0 deletions ATTRIBUTIONS-Rust.md
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crates/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ bitflags = { version = "2", features = ["serde"] }
thiserror = "2"
tokio = { version = "1", default-features = false, features = ["rt", "macros", "sync"] }
tokio-stream = { version = "0.1", default-features = false }
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = ["registry", "std"] }
typed-builder = "0.23.2"
opentelemetry = { version = "0.31", default-features = false, features = ["trace"], optional = true }
opentelemetry_sdk = { version = "0.31", default-features = false, features = ["trace"], optional = true }
Expand All @@ -74,6 +76,7 @@ web-sys = { version = "0.3", features = ["Headers", "Request", "RequestInit", "R
tokio = { version = "1", features = ["rt", "macros", "sync", "test-util", "rt-multi-thread"] }
futures = "0.3"
opentelemetry_sdk = { version = "0.31", default-features = false, features = ["trace", "testing"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "registry", "std"] }
serde_json = "1"

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/api/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ impl Event {

/// Return this event as canonical JSON.
pub fn to_json_string(&self) -> serde_json::Result<String> {
serde_json::to_string(&self.try_to_json_value()?)
serde_json::to_string(self)
}

/// Return the lifecycle phase for scope events.
Expand Down
1 change: 1 addition & 0 deletions crates/core/src/api/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ pub use scope_stack::{
restore_thread_scope_stack, scope_stack_active, set_thread_scope_stack,
sync_thread_scope_stack, task_scope_push, task_scope_remove, task_scope_top,
};
pub(crate) use state::EventSubscriberSnapshot;
pub use state::NemoRelayContextState;
8 changes: 7 additions & 1 deletion crates/core/src/api/runtime/scope_stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,13 @@ impl ScopeStack {
self.stack
.iter()
.filter_map(|handle| self.scope_registries.get(&handle.uuid))
.flat_map(|registries| registries.event_subscribers.values().cloned())
.flat_map(|registries| {
registries
.event_subscribers
.values()
.chain(registries.anonymous_event_subscribers.values())
.cloned()
})
.collect()
}
}
Expand Down
Loading
Loading