File tree 2 files changed +4
-15
lines changed
2 files changed +4
-15
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,9 @@ async fn main_inner(args: Args) -> anyhow::Result<()> {
42
42
env:: set_var ( "OTEL_SERVICE_NAME" , service_name) ;
43
43
}
44
44
45
+ // Init logging subsystem
46
+ crate :: logs:: init ( & config) ;
47
+
45
48
// Init tracing subsystem
46
49
crate :: trace:: init ( & config) ;
47
50
@@ -145,6 +148,7 @@ mod config;
145
148
mod context;
146
149
mod handler;
147
150
mod http;
151
+ mod logs;
148
152
mod lua;
149
153
mod middleware;
150
154
mod storage;
Original file line number Diff line number Diff line change @@ -7,25 +7,10 @@ use ntex::time::Millis;
7
7
use opentelemetry_http:: { HttpClient , HttpError , Request , Response } ;
8
8
use opentelemetry_sdk:: trace:: { self , RandomIdGenerator , Sampler } ;
9
9
use tokio:: sync:: { mpsc, oneshot} ;
10
- use tracing_subscriber:: layer:: SubscriberExt ;
11
- use tracing_subscriber:: util:: SubscriberInitExt as _;
12
- use tracing_subscriber:: EnvFilter ;
13
10
14
11
use crate :: config:: Config ;
15
12
16
13
pub fn init ( config : & Config ) {
17
- init_opentelemetry ( config) ;
18
-
19
- let env_filter = EnvFilter :: try_from_default_env ( ) . unwrap_or ( EnvFilter :: new ( "info" ) ) ;
20
- let fmt_layer = tracing_subscriber:: fmt:: layer ( ) ;
21
-
22
- tracing_subscriber:: registry ( )
23
- . with ( env_filter)
24
- . with ( fmt_layer)
25
- . init ( ) ;
26
- }
27
-
28
- fn init_opentelemetry ( config : & Config ) {
29
14
let tracing_conf = match config. tracing {
30
15
Some ( ref tracing_conf) if tracing_conf. enabled => tracing_conf,
31
16
_ => return ,
You can’t perform that action at this time.
0 commit comments