@@ -235,14 +235,14 @@ impl TelemetryService {
235
235
if config. allow_reconfigure {
236
236
Self :: set_global_tracing_pipeline (
237
237
registry ( )
238
- . with ( self . tracing_console_log ( config) ?)
239
- . with ( self . tracing_dyn_filter ( config) ?) ,
238
+ . with ( self . tracing_dyn_filter ( config) ?)
239
+ . with ( self . tracing_console_log ( config) ?) ,
240
240
) ?;
241
241
} else {
242
242
Self :: set_global_tracing_pipeline (
243
243
registry ( )
244
- . with ( self . tracing_console_log ( config) ?)
245
- . with ( self . tracing_fixed_filter ( config) ?) ,
244
+ . with ( self . tracing_fixed_filter ( config) ?)
245
+ . with ( self . tracing_console_log ( config) ?) ,
246
246
) ?;
247
247
}
248
248
} else {
@@ -253,27 +253,31 @@ impl TelemetryService {
253
253
( true , true ) => {
254
254
Self :: set_global_tracing_pipeline (
255
255
registry ( )
256
- . with ( self . tracing_ot ( config, resource , scope ) ?)
256
+ . with ( self . tracing_dyn_filter ( config) ?)
257
257
. with ( self . tracing_console_log ( config) ?)
258
- . with ( self . tracing_dyn_filter ( config) ?) ,
258
+ . with ( self . tracing_ot ( config, resource , scope ) ?) ,
259
259
) ?;
260
260
}
261
261
( true , false ) => {
262
262
Self :: set_global_tracing_pipeline (
263
263
registry ( )
264
- . with ( self . tracing_ot ( config, resource , scope ) ?)
264
+ . with ( self . tracing_fixed_filter ( config) ?)
265
265
. with ( self . tracing_console_log ( config) ?)
266
- . with ( self . tracing_fixed_filter ( config) ?) ,
266
+ . with ( self . tracing_ot ( config, resource , scope ) ?) ,
267
267
) ?;
268
268
}
269
269
( false , true ) => {
270
270
Self :: set_global_tracing_pipeline (
271
- registry ( ) . with ( self . tracing_ot ( config, resource, scope) ?) , //todo: ot + EnvFilter seems to be broken .with(self.tracing_dyn_filter(config)?),
271
+ registry ( )
272
+ . with ( self . tracing_dyn_filter ( config) ?)
273
+ . with ( self . tracing_ot ( config, resource, scope) ?) ,
272
274
) ?;
273
275
}
274
276
( false , false ) => {
275
277
Self :: set_global_tracing_pipeline (
276
- registry ( ) . with ( self . tracing_ot ( config, resource, scope) ?) , //todo: ot + EnvFilter seems to be broken .with(self.tracing_fixed_filter(config)?),
278
+ registry ( )
279
+ . with ( self . tracing_fixed_filter ( config) ?)
280
+ . with ( self . tracing_ot ( config, resource, scope) ?) ,
277
281
) ?;
278
282
}
279
283
}
0 commit comments