File tree Expand file tree Collapse file tree 3 files changed +15
-20
lines changed Expand file tree Collapse file tree 3 files changed +15
-20
lines changed Original file line number Diff line number Diff line change @@ -20,9 +20,9 @@ serde = "1.0"
20
20
spin-app = { git = " https://github.com/fermyon/spin" , tag = " v2.5.1" }
21
21
spin-core = { git = " https://github.com/fermyon/spin" , tag = " v2.5.1" }
22
22
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" }
23
24
tokio = { version = " 1.23" , features = [" full" ] }
24
25
tracing = { version = " 0.1" , features = [" log" ] }
25
- tracing-subscriber = { version = " 0.3.7" , features = [" env-filter" ] }
26
26
wasmtime-wasi = { version = " 18.0.4" , features = [" tokio" ] }
27
27
28
28
[target .'cfg(target_os = "linux")' .dependencies ]
Original file line number Diff line number Diff line change 1
1
use clap:: Parser ;
2
2
use spin_trigger:: cli:: TriggerExecutorCommand ;
3
- use std:: io:: IsTerminal ;
4
3
use trigger_command:: CommandTrigger ;
5
4
6
5
type Command = TriggerExecutorCommand < CommandTrigger > ;
7
6
8
7
#[ tokio:: main]
9
8
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 ( ) ) ?;
15
10
16
11
let t = Command :: parse ( ) ;
17
12
t. run ( ) . await
18
13
}
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
+ }
You can’t perform that action at this time.
0 commit comments