Skip to content

feat: add otlp tracing #228

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
atanmarko wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add otlp tracing #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b6788
feat: add otlp tracing
atanmarko Jun 2, 2025
7a38c32
fix: reviews
atanmarko Jun 4, 2025
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
187 changes: 170 additions & 17 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ prover-config = { path = "crates/prover-config" }
prover-elf-utils = { path = "crates/prover-elf-utils" }
prover-engine = { path = "crates/prover-engine" }
prover-executor = { path = "crates/prover-executor" }
prover-logger = { path = "crates/prover-logger" }
prover-tracer = { path = "crates/prover-tracer" }
prover-utils = { path = "crates/prover-utils" }

# TODO: this should probably move to interop
Expand Down
2 changes: 1 addition & 1 deletion crates/aggkit-prover-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ thiserror.workspace = true
toml.workspace = true

aggchain-proof-service.workspace = true
prover-logger.workspace = true
prover-tracer.workspace = true
prover-utils.workspace = true
prover-config.workspace = true

Expand Down
6 changes: 3 additions & 3 deletions crates/aggkit-prover-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{

use aggchain_proof_service::config::AggchainProofServiceConfig;
use prover_config::{NetworkProverConfig, ProverType};
use prover_logger::log::Log;
use prover_tracer::TracingConfig;
use serde::{Deserialize, Serialize};

pub use crate::{shutdown::ShutdownConfig, telemetry::TelemetryConfig};
Expand All @@ -28,7 +28,7 @@ pub struct ProverConfig {

/// The log configuration.
#[serde(default)]
pub log: Log,
pub log: TracingConfig,

/// Telemetry configuration.
#[serde(default)]
Expand All @@ -54,7 +54,7 @@ impl Default for ProverConfig {
fn default() -> Self {
Self {
grpc_endpoint: default_socket_addr(),
log: Log::default(),
log: TracingConfig::default(),
telemetry: TelemetryConfig::default(),
shutdown: ShutdownConfig::default(),
aggchain_proof_service: AggchainProofServiceConfig::default(),
Expand Down
2 changes: 1 addition & 1 deletion crates/aggkit-prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ proposer-service.workspace = true
prover-config.workspace = true
prover-engine.workspace = true
prover-executor.workspace = true
prover-logger.workspace = true
prover-tracer.workspace = true

[dev-dependencies]
hyper-util = "0.1.10"
Expand Down
10 changes: 5 additions & 5 deletions crates/aggkit-prover/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@ mod tests;
pub fn runtime(cfg: PathBuf, version: &str) -> anyhow::Result<()> {
let config = Arc::new(aggkit_prover_config::ProverConfig::try_load(&cfg)?);

// Initialize the logger
prover_logger::tracing(&config.log);

let global_cancellation_token = CancellationToken::new();

info!("Starting AggKit Prover version info: {}", version);

let prover_runtime = tokio::runtime::Builder::new_multi_thread()
.thread_name("aggkit-prover-runtime")
.enable_all()
Expand All @@ -33,6 +28,11 @@ pub fn runtime(cfg: PathBuf, version: &str) -> anyhow::Result<()> {
.enable_all()
.build()?;

// Initialize the tracing
metrics_runtime.block_on(async { prover_tracer::setup_tracing(&config.log, version) })?;
Comment on lines +31 to +32
Copy link
Copy Markdown
Contributor

@iljakuklic iljakuklic Jun 3, 2025

Choose a reason for hiding this comment

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

Nit: Would it make sense to put the block_on machinery inside some helper function prover_tracer?


info!("Running aggkit prover version info: {}", version);

let aggchain_proof_service = prover_runtime.block_on(async {
let grpc_service = GrpcService::new(&config.aggchain_proof_service).await?;
Ok::<AggchainProofServiceServer<GrpcService>, aggchain_proof_service::Error>(
Expand Down
2 changes: 1 addition & 1 deletion crates/agglayer-prover-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ serde = { workspace = true, features = ["derive"] }
thiserror.workspace = true
toml.workspace = true

prover-logger.workspace = true
prover-tracer.workspace = true
prover-utils.workspace = true
prover-config.workspace = true

Expand Down
Loading
Loading