Migrate from logging to tracing #61

Author: maxicarlos08

Cargo.toml

@@ -14,7 +14,7 @@ readme = "README.md"
 [features]
 # Uses gp_log_add_func instead of gp_context_set_log_func for logging (not supported on many systems)
 extended_logs = []
-test = ["libgphoto2_sys/test"]
+test = ["libgphoto2_sys/test", "dep:tracing-subscriber"]
 serde = ["dep:serde"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -25,10 +25,10 @@ members = ["libgphoto2-sys", "gphoto2-test"]
 [dependencies]
 libgphoto2_sys = { path = "libgphoto2-sys", version = "1.2" }
 libc = "0.2"
-log = "0.4"
 crossbeam-channel = "0.5.6"
 serde = { version = "1", optional = true, features = ["derive"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.17", optional = true, features = ["env-filter"] }
 
 [dev-dependencies]
-env_logger = "0.9.1"
 insta = "1.20.0"

examples/bulb_capture.rs

@@ -3,12 +3,14 @@
 //! There are also actions for capturing movies, changing liveview, etc.  
 //! This example will only work for Nikon DSLR cameras.
 
+mod logging;
+
 use gphoto2::widget::{RadioWidget, ToggleWidget};
 use gphoto2::{camera::CameraEvent, Context, Result};
 use std::{thread::sleep, time::Duration};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
 

examples/camera_info.rs

@@ -1,7 +1,9 @@
+mod logging;
+
 use gphoto2::{Context, Result};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
 

examples/camera_ls.rs

@@ -1,3 +1,5 @@
+mod logging;
+
 use gphoto2::{filesys::CameraFS, Context, Result};
 use std::collections::HashMap;
 
@@ -24,7 +26,7 @@ fn list_folder_recursive(fs: &CameraFS, folder_name: &str) -> Result<FolderConte
 }
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
   let fs = camera.fs();

examples/camera_progress.rs

@@ -1,5 +1,7 @@
 #![allow(dead_code)] // This is just an example
 
+mod logging;
+
 use gphoto2::{Context, Result};
 use std::{collections::HashMap, path::Path};
 
@@ -60,7 +62,7 @@ impl ContextProgress {
 fn main() -> Result<()> {
   let mut context = Context::new()?;
 
-  env_logger::init();
+  logging::setup();
 
   context.set_progress_handlers(ProgressManager::new());
 

examples/capture.rs

@@ -1,8 +1,10 @@
+mod logging;
+
 use gphoto2::{Context, Result};
 use std::path::Path;
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
 

examples/capture_preview.rs

@@ -1,10 +1,12 @@
 //! Capture a preview and save it to /tmp/preview_image
 
+mod logging;
+
 use gphoto2::{Context, Result};
 use std::{fs, io::Write};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let context = Context::new()?;
   let camera = context.autodetect_camera().wait()?;

examples/drop_camera.rs

@@ -1,9 +1,11 @@
 //! Test if the camera can be dropped while there are is still eg. a widget of that camera present
 
+mod logging;
+
 use gphoto2::{Context, Result};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
 

examples/list_cameras.rs

@@ -1,8 +1,10 @@
+mod logging;
+
 use gphoto2::list::CameraDescriptor;
 use gphoto2::{Context, Result};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let context = Context::new()?;
 

examples/list_config.rs

@@ -1,10 +1,12 @@
 //! Recursively list all configuration
 //! Warning: Output might be very large
 
+mod logging;
+
 use gphoto2::{Context, Result};
 
 fn main() -> Result<()> {
-  env_logger::init();
+  logging::setup();
 
   let camera = Context::new()?.autodetect_camera().wait()?;
   println!("{:#?}", camera.config().wait()?);