Skip to content

Extract tracing into dedicated crate #2513

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

Open
Mirko-von-Leipzig wants to merge 1 commit into from
Open

Extract tracing into dedicated crate #2513

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
60 changes: 38 additions & 22 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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ members = [
"crates/rpc",
"crates/store",
"crates/test-macro",
"crates/tracing",
"crates/tracing-macro",
"crates/utils",
"proto",
Expand Down Expand Up @@ -51,6 +52,7 @@ miden-node-proto-build = { path = "proto", version = "0.16.0-rc.2" }
miden-node-rpc = { path = "crates/rpc", version = "0.16.0-rc.2" }
miden-node-store = { path = "crates/store", version = "0.16.0-rc.2" }
miden-node-test-macro = { path = "crates/test-macro" }
miden-node-tracing = { path = "crates/tracing", version = "0.16.0-rc.2" }
miden-node-tracing-macro = { path = "crates/tracing-macro", version = "0.16.0-rc.2" }
miden-node-utils = { path = "crates/utils", version = "0.16.0-rc.2" }

Expand Down Expand Up @@ -131,6 +133,7 @@ tonic-reflection = { version = "0.14" }
tonic-web = { version = "0.14" }
tower = { version = "0.5" }
tower-http = { features = ["cors", "trace"], version = "0.6" }
tower_governor = { version = "0.8" }
tracing = { version = "0.1" }
tracing-subscriber = { features = ["env-filter", "fmt", "json"], version = "0.3" }
trybuild = { version = "1.0" }
Expand Down
28 changes: 14 additions & 14 deletions bin/benchmark/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ version.workspace = true
workspace = true

[dependencies]
anyhow = { workspace = true }
clap = { features = ["env", "string"], workspace = true }
fs-err = { workspace = true }
hex = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-utils = { workspace = true }
miden-protocol = { features = ["std", "testing"], workspace = true }
miden-standards = { workspace = true }
miden-tx = { features = ["concurrent", "std"], workspace = true }
rand = { workspace = true }
rayon = { workspace = true }
tokio = { features = ["full"], workspace = true }
tonic = { workspace = true }
url = { features = ["serde"], workspace = true }
anyhow = { workspace = true }
clap = { features = ["env", "string"], workspace = true }
fs-err = { workspace = true }
hex = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-tracing = { workspace = true }
miden-protocol = { features = ["std", "testing"], workspace = true }
miden-standards = { workspace = true }
miden-tx = { features = ["concurrent", "std"], workspace = true }
rand = { workspace = true }
rayon = { workspace = true }
tokio = { features = ["full"], workspace = true }
tonic = { workspace = true }
url = { features = ["serde"], workspace = true }
2 changes: 1 addition & 1 deletion bin/benchmark/src/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::time::{Duration, Instant};
use anyhow::{Context, Result};
use miden_node_proto::clients::{Builder, RemoteProverClient};
use miden_node_proto::generated::remote_prover::{ProofRequest, ProofType};
use miden_node_utils::spawn::spawn_blocking_in_current_span;
use miden_node_tracing::spawn::spawn_blocking_in_current_span;
use miden_protocol::transaction::{ExecutedTransaction, ProvenTransaction, TransactionInputs};
use miden_protocol::utils::serde::{Deserializable, Serializable};
use miden_tx::{LocalTransactionProver, TransactionProverError};
Expand Down
6 changes: 1 addition & 5 deletions bin/network-monitor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ version.workspace = true
[lints]
workspace = true

[package.metadata.cargo-shear]
# Required by expansions of the Miden tracing macros.
ignored = ["tracing"]

[dependencies]
anyhow = { workspace = true }
axum = { workspace = true }
Expand All @@ -28,6 +24,7 @@ hex = { workspace = true }
humantime = { workspace = true }
maud = { features = ["axum"], version = "0.27" }
miden-node-proto = { workspace = true }
miden-node-tracing = { workspace = true }
miden-node-utils = { workspace = true }
miden-protocol = { features = ["std"], workspace = true }
miden-standards = { workspace = true }
Expand All @@ -43,7 +40,6 @@ time = { features = ["formatting", "macros"], version = "0.3" }
tokio = { features = ["full"], workspace = true }
tonic = { features = ["codegen", "tls-native-roots", "transport"], workspace = true }
tonic-health = { workspace = true }
tracing = { workspace = true }
url = { features = ["serde"], workspace = true }

[dev-dependencies]
Expand Down
5 changes: 2 additions & 3 deletions bin/network-monitor/src/commands/start.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
//! This module contains the implementation for starting the network monitoring service.

use anyhow::Result;
use miden_node_utils::logging::OpenTelemetry;
use miden_node_utils::tracing::{info, miden_instrument};
use miden_node_tracing::{OpenTelemetry, info, miden_instrument};

use crate::config::MonitorConfig;
use crate::frontend::ServerState;
Expand All @@ -30,7 +29,7 @@ pub async fn start_monitor(config: MonitorConfig) -> Result<()> {
info!(target: LOG_TARGET, "Loaded configuration", port = config.port);

let _otel_guard =
miden_node_utils::logging::setup_tracing(OpenTelemetry::from_env().with_name("monitor"))?;
miden_node_tracing::setup_tracing(OpenTelemetry::from_env().with_name("monitor"))?;

let mut tasks = Tasks::new();

Expand Down
4 changes: 2 additions & 2 deletions bin/network-monitor/src/counter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use std::time::{Duration, Instant};

use anyhow::{Context, Result};
use miden_node_proto::clients::RpcClient;
use miden_node_utils::spawn::spawn_blocking_in_current_span;
use miden_node_utils::tracing::{debug, error, info, miden_instrument, warn};
use miden_node_tracing::spawn::spawn_blocking_in_current_span;
use miden_node_tracing::{debug, error, info, miden_instrument, warn};
use miden_protocol::account::auth::AuthSecretKey;
use miden_protocol::account::{Account, AccountCode, AccountId, AccountPatch};
use miden_protocol::asset::AssetVault;
Expand Down
2 changes: 1 addition & 1 deletion bin/network-monitor/src/deploy/counter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use std::collections::BTreeSet;

use anyhow::Result;
use miden_node_utils::tracing::miden_instrument;
use miden_node_tracing::miden_instrument;
use miden_protocol::account::component::AccountComponentMetadata;
use miden_protocol::account::{
Account,
Expand Down
4 changes: 2 additions & 2 deletions bin/network-monitor/src/deploy/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ use miden_node_proto::generated::rpc::{
SyncChainMmrRequest,
};
use miden_node_proto::generated::transaction::ProvenTransaction as ProtoProvenTransaction;
use miden_node_tracing::spawn::spawn_blocking_in_current_span;
use miden_node_tracing::{debug, info, miden_instrument, warn};
use miden_node_utils::retry;
use miden_node_utils::spawn::spawn_blocking_in_current_span;
use miden_node_utils::tracing::{debug, info, miden_instrument, warn};
use miden_protocol::Word;
use miden_protocol::account::{
Account,
Expand Down
2 changes: 1 addition & 1 deletion bin/network-monitor/src/deploy/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use std::sync::LazyLock;

use anyhow::{Context, Result};
use miden_node_utils::tracing::miden_instrument;
use miden_node_tracing::miden_instrument;
use miden_protocol::Word;
use miden_protocol::account::auth::AuthScheme;
use miden_protocol::account::{
Expand Down
Loading
Loading