Merge branch 'master' into feature/video-gifs

src/video/actors.rs

@@ -1,7 +1,10 @@
 use crate::is_video;
+use crate::otel::global_tracer;
 use actix::prelude::*;
 use futures::TryFutureExt;
 use log::{debug, error, info, trace, warn};
+use opentelemetry::trace::{Span, Status, Tracer};
+use opentelemetry::KeyValue;
 use std::io::Result;
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, ExitStatus, Stdio};
@@ -122,6 +125,9 @@ impl Handler<ScanDirectoryMessage> for VideoPlaylistManager {
     type Result = ResponseFuture<()>;
 
     fn handle(&mut self, msg: ScanDirectoryMessage, _ctx: &mut Self::Context) -> Self::Result {
+        let tracer = global_tracer();
+        let mut span = tracer.start("videoplaylistmanager.scan_directory");
+
         let start = std::time::Instant::now();
         info!(
             "Starting scan directory for video playlist generation: {}",
@@ -157,6 +163,11 @@ impl Handler<ScanDirectoryMessage> for VideoPlaylistManager {
                     .expect("Failed to send generate playlist message")
                 {
                     Ok(_) => {
+                        span.add_event(
+                            "Playlist generated",
+                            vec![KeyValue::new("video_path", path_as_str.to_string())],
+                        );
+
                         debug!(
                             "Successfully generated playlist for file: '{}'",
                             path_as_str
@@ -168,6 +179,10 @@ impl Handler<ScanDirectoryMessage> for VideoPlaylistManager {
                 }
             }
 
+            span.add_event(
+                "Finished directory scan",
+                vec![KeyValue::new("directory", scan_dir_name.to_string())],
+            );
             info!(
                 "Finished directory scan of '{}' in {:?}",
                 scan_dir_name,
@@ -219,6 +234,16 @@ impl Handler<GeneratePlaylistMessage> for PlaylistGenerator {
             playlist_path,
             msg.video_path.file_name().unwrap().to_str().unwrap()
         );
+
+        let tracer = global_tracer();
+        let mut span = tracer
+            .span_builder("playlistgenerator.generate_playlist")
+            .with_attributes(vec![
+                KeyValue::new("video_file", video_file.clone()),
+                KeyValue::new("playlist_file", playlist_file.clone()),
+            ])
+            .start(&tracer);
+
         Box::pin(async move {
             let wait_start = std::time::Instant::now();
             let permit = semaphore
@@ -230,9 +255,20 @@ impl Handler<GeneratePlaylistMessage> for PlaylistGenerator {
                 "Waited for {:?} before starting ffmpeg",
                 wait_start.elapsed()
             );
+            span.add_event(
+                "Waited for FFMPEG semaphore",
+                vec![KeyValue::new(
+                    "wait_time",
+                    wait_start.elapsed().as_secs_f64(),
+                )],
+            );
 
             if Path::new(&playlist_file).exists() {
                 debug!("Playlist already exists: {}", playlist_file);
+                span.set_status(Status::error(format!(
+                    "Playlist already exists: {}",
+                    playlist_file
+                )));
                 return Err(std::io::Error::from(std::io::ErrorKind::AlreadyExists));
             }
 
@@ -267,6 +303,8 @@ impl Handler<GeneratePlaylistMessage> for PlaylistGenerator {
                     debug!("ffmpeg output: {:?}", res);
                 }
 
+                span.set_status(Status::Ok);
+
                 ffmpeg_result
             });