Merge branch 'master' into feature/video-gifs

src/main.rs

@@ -38,7 +38,7 @@ use crate::database::*;
 use crate::files::{
     is_image_or_video, is_valid_full_path, move_file, RealFileSystem, RefreshThumbnailsMessage,
 };
-use crate::otel::global_tracer;
+use crate::otel::{extract_context_from_request, global_tracer};
 use crate::service::ServiceBuilder;
 use crate::state::AppState;
 use crate::tags::*;
@@ -85,6 +85,11 @@ async fn get_image(
     req: web::Query<ThumbnailRequest>,
     app_state: Data<AppState>,
 ) -> impl Responder {
+    let tracer = global_tracer();
+    let context = extract_context_from_request(&request);
+
+    let mut span = tracer.start_with_context("get_image", &context);
+
     if let Some(path) = is_valid_full_path(&app_state.base_path, &req.path, false) {
         let image_size = req.size.unwrap_or(PhotoSize::Full);
         if image_size == PhotoSize::Thumb {
@@ -97,16 +102,21 @@ async fn get_image(
 
             trace!("Thumbnail path: {:?}", thumb_path);
             if let Ok(file) = NamedFile::open(&thumb_path) {
+                span.set_status(Status::Ok);
                 file.into_response(&request)
             } else {
+                span.set_status(Status::error("Not found"));
                 HttpResponse::NotFound().finish()
             }
         } else if let Ok(file) = NamedFile::open(path) {
+            span.set_status(Status::Ok);
             file.into_response(&request)
         } else {
+            span.set_status(Status::error("Not found"));
             HttpResponse::NotFound().finish()
         }
     } else {
+        span.set_status(Status::error("Bad photos request"));
         error!("Bad photos request: {}", req.path);
         HttpResponse::BadRequest().finish()
     }
@@ -115,11 +125,13 @@ async fn get_image(
 #[get("/image/metadata")]
 async fn get_file_metadata(
     _: Claims,
+    request: HttpRequest,
     path: web::Query<ThumbnailRequest>,
     app_state: Data<AppState>,
 ) -> impl Responder {
     let tracer = global_tracer();
-    let mut span = tracer.start("get_file_metadata");
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("get_file_metadata", &context);
     match is_valid_full_path(&app_state.base_path, &path.path, false)
         .ok_or_else(|| ErrorKind::InvalidData.into())
         .and_then(File::open)
@@ -148,11 +160,13 @@ async fn get_file_metadata(
 #[post("/image")]
 async fn upload_image(
     _: Claims,
+    request: HttpRequest,
     mut payload: mp::Multipart,
     app_state: Data<AppState>,
 ) -> impl Responder {
     let tracer = global_tracer();
-    let mut span = tracer.start("upload_image");
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("upload_image", &context);
 
     let mut file_content: BytesMut = BytesMut::new();
     let mut file_name: Option<String> = None;
@@ -235,11 +249,14 @@ async fn upload_image(
 #[post("/video/generate")]
 async fn generate_video(
     _claims: Claims,
+    request: HttpRequest,
     app_state: Data<AppState>,
     body: web::Json<ThumbnailRequest>,
 ) -> impl Responder {
     let tracer = global_tracer();
-    let mut span = tracer.start("generate_video");
+
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("generate_video", &context);
 
     let filename = PathBuf::from(&body.path);
 
@@ -283,7 +300,8 @@ async fn stream_video(
     app_state: Data<AppState>,
 ) -> impl Responder {
     let tracer = global::tracer("image-server");
-    let mut span = tracer.start("stream_video");
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("stream_video", &context);
 
     let playlist = &path.path;
     debug!("Playlist: {}", playlist);
@@ -311,8 +329,9 @@ async fn get_video_part(
     path: web::Path<ThumbnailRequest>,
     app_state: Data<AppState>,
 ) -> impl Responder {
-    let tracer = global::tracer("image-server");
-    let mut span = tracer.start("get_video_part");
+    let tracer = global_tracer();
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("get_video_part", &context);
 
     let part = &path.path;
     debug!("Video part: {}", part);
@@ -337,8 +356,13 @@ async fn get_video_part(
 #[get("image/favorites")]
 async fn favorites(
     claims: Claims,
+    request: HttpRequest,
     favorites_dao: Data<Mutex<Box<dyn FavoriteDao>>>,
 ) -> impl Responder {
+    let tracer = global_tracer();
+    let context = extract_context_from_request(&request);
+    let mut span = tracer.start_with_context("get favorites", &context);
+
     match web::block(move || {
         favorites_dao
             .lock()
@@ -353,12 +377,14 @@ async fn favorites(
                 .map(|favorite| favorite.path)
                 .collect::<Vec<String>>();
 
+            span.set_status(Status::Ok);
             HttpResponse::Ok().json(PhotosResponse {
                 photos: favorites,
                 dirs: Vec::new(),
             })
         }
         Ok(Err(e)) => {
+            span.set_status(Status::error(format!("Error getting favorites: {:?}", e)));
             error!("Error getting favorites: {:?}", e);
             HttpResponse::InternalServerError().finish()
         }
@@ -383,15 +409,15 @@ async fn put_add_favorite(
         .await
         {
             Ok(Err(e)) if e.kind == DbErrorKind::AlreadyExists => {
-                debug!("Favorite: {} exists for user: {}", &body.path, user_id);
+                warn!("Favorite: {} exists for user: {}", &body.path, user_id);
                 HttpResponse::Ok()
             }
             Ok(Err(e)) => {
-                info!("{:?} {}. for user: {}", e, body.path, user_id);
+                error!("{:?} {}. for user: {}", e, body.path, user_id);
                 HttpResponse::BadRequest()
             }
             Ok(Ok(_)) => {
-                debug!("Adding favorite \"{}\" for userid: {}", body.path, user_id);
+                info!("Adding favorite \"{}\" for userid: {}", body.path, user_id);
                 HttpResponse::Created()
             }
             Err(e) => {
@@ -652,7 +678,13 @@ fn watch_files() {
             let ev = wrx.recv();
             if let Ok(Ok(event)) = ev {
                 match event.kind {
-                    EventKind::Create(_) => create_thumbnails(),
+                    EventKind::Create(create_kind) => {
+                        info!(
+                            "Creating thumbnails {:?} create event kind: {:?}",
+                            event.paths, create_kind
+                        );
+                        create_thumbnails();
+                    }
                     EventKind::Modify(kind) => {
                         debug!("All modified paths: {:?}", event.paths);
                         debug!("Modify kind: {:?}", kind);