Skip to content

Commit 2713115

Browse files
authored
Merge pull request #19 from calebschoepp/default-off
Use spin_telemetry
2 parents 9ad3b3c + 258eaa4 commit 2713115

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

Cargo.lock

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ serde = "1.0"
2020
spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.5.1" }
2121
spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.5.1" }
2222
spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v2.5.1" }
23+
spin-telemetry = { git = "https://github.com/fermyon/spin", tag = "v2.5.1" }
2324
tokio = { version = "1.23", features = ["full"] }
2425
tracing = { version = "0.1", features = ["log"] }
25-
tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
2626
wasmtime-wasi = { version = "18.0.4", features = ["tokio"] }
2727

2828
[target.'cfg(target_os = "linux")'.dependencies]

src/main.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
use clap::Parser;
22
use spin_trigger::cli::TriggerExecutorCommand;
3-
use std::io::IsTerminal;
43
use trigger_command::CommandTrigger;
54

65
type Command = TriggerExecutorCommand<CommandTrigger>;
76

87
#[tokio::main]
98
async fn main() -> anyhow::Result<()> {
10-
tracing_subscriber::fmt()
11-
.with_writer(std::io::stderr)
12-
.with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
13-
.with_ansi(std::io::stderr().is_terminal())
14-
.init();
9+
let _telemetry_guard = spin_telemetry::init(build_info())?;
1510

1611
let t = Command::parse();
1712
t.run().await
1813
}
14+
15+
/// Returns build information of the parent Spin process, similar to: 0.1.0 (2be4034 2022-03-31).
16+
fn build_info() -> String {
17+
let spin_version = env_var("SPIN_VERSION");
18+
let spin_commit_sha = env_var("SPIN_COMMIT_SHA");
19+
let spin_commit_date = env_var("SPIN_COMMIT_DATE");
20+
format!("{spin_version} ({spin_commit_sha} {spin_commit_date})")
21+
}
22+
23+
fn env_var(name: &str) -> String {
24+
std::env::var(name).unwrap_or_else(|_| "unknown".to_string())
25+
}

0 commit comments

Comments
 (0)