Use stackable-tracing

Author: sbernauer

Cargo.lock

@@ -10,6 +10,7 @@ publish = false
 
 [dependencies]
 stackable-secret-operator-utils = { path = "../utils" }
+stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", features = ["clap"], tag = "stackable-telemetry-0.6.1" }
 
 clap = { workspace = true, features = ["derive"] }
 hex.workspace = true

rust/cert-tools/Cargo.toml

@@ -1,14 +1,24 @@
 use std::{fs, path::PathBuf};
 
-use clap::Parser;
+use clap::{Parser, Subcommand};
 use openssl::x509::X509;
 use snafu::{ResultExt, ensure_whatever};
+use stackable_telemetry::tracing::TelemetryOptions;
 
 use crate::parsers::{parse_pem_contents, parse_pkcs12_file_workaround};
 
 #[derive(Parser, Debug)]
 #[command(version, about)]
-pub enum Cli {
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: CliCommand,
+
+    #[command(flatten, next_help_heading = "Tracing options")]
+    pub telemetry: TelemetryOptions,
+}
+
+#[derive(Subcommand, Debug)]
+pub enum CliCommand {
     /// Generate PKCS12 truststore files from PEM or PKCS12 files
     GeneratePkcs12Truststore(GeneratePkcs12),
 }

rust/cert-tools/src/cli_args.rs

@@ -2,33 +2,28 @@ use std::{collections::HashMap, fs};
 
 use cert_ext::CertExt;
 use clap::Parser;
-use cli_args::{Cli, GeneratePkcs12};
+use cli_args::{Cli, CliCommand, GeneratePkcs12};
 use openssl::x509::X509;
 use snafu::{ResultExt, ensure_whatever};
 use stackable_secret_operator_utils::pkcs12::pkcs12_truststore;
-use tracing::{info, level_filters::LevelFilter, warn};
+use stackable_telemetry::Tracing;
+use tracing::{info, warn};
 
 mod cert_ext;
 mod cli_args;
 mod parsers;
 
 #[snafu::report]
 pub fn main() -> Result<(), snafu::Whatever> {
-    let filter = tracing_subscriber::EnvFilter::builder()
-        .with_default_directive(LevelFilter::INFO.into())
-        .from_env()
-        .whatever_context("failed to create tracing subscriber EnvFilter")?;
-    tracing_subscriber::fmt()
-        // Short running tool does not need any complex output
-        .with_target(false)
-        .without_time()
-        .with_env_filter(filter)
-        .init();
-
     let cli = Cli::parse();
 
-    match cli {
-        Cli::GeneratePkcs12Truststore(cli_args) => generate_pkcs12_truststore(cli_args)?,
+    // Use `CONSOLE_LOG_LEVEL` to modify the console log level
+    let _tracing_guard = Tracing::pre_configured("cert-tools", cli.telemetry)
+        .init()
+        .whatever_context("failed to initialize tracing")?;
+
+    match cli.command {
+        CliCommand::GeneratePkcs12Truststore(cli_args) => generate_pkcs12_truststore(cli_args)?,
     }
 
     Ok(())