Add a timer around yt-dlp actions

hifiwi-fi · Oct 27, 2022 · 95c6962 · 95c6962
1 parent df678bb
commit 95c6962
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 17 deletions.
diff --git a/lib/run-yt-dlp.js b/lib/run-yt-dlp.js
@@ -50,19 +50,25 @@ function getFormatArg (medium) {
 
 export async function getYTDLPUrl ({
   url,
-  medium
+  medium,
+  histogram
 }) {
-  const formatOpts = getFormatArg(medium)
+  const endTimer = histogram.startTimer()
+  try {
+    const formatOpts = getFormatArg(medium)
 
-  const ytDlpWrap = new YTDlpWrap(binPath)
-  const args = [
-    url,
-    '-f',
-    formatOpts
-  ]
+    const ytDlpWrap = new YTDlpWrap(binPath)
+    const args = [
+      url,
+      '-f',
+      formatOpts
+    ]
 
-  const metadata = await ytDlpWrap.getVideoInfo(args)
-  return metadata
+    const metadata = await ytDlpWrap.getVideoInfo(args)
+    return metadata
+  } finally {
+    endTimer()
+  }
 }
 
 export function runYTDLP ({
@@ -71,9 +77,11 @@ export function runYTDLP ({
   episodeId,
   medium,
   pg,
+  histogram,
   log
 }) {
   return async () => {
+    const endTimer = histogram.startTimer()
     const ytDlpWrap = new YTDlpWrap(binPath)
     const bookmarkQuery = SQL`
               select url from bookmarks
@@ -94,7 +102,7 @@ export function runYTDLP ({
 
     try {
       const metadata = await ytDlpWrap.getVideoInfo(args)
-      console.dir(metadata, { colors: true, depth: 999 })
+      // console.dir(metadata, { colors: true, depth: 999 })
       const videoData = []
 
       videoData.push(SQL`ready = true`)
@@ -136,6 +144,8 @@ export function runYTDLP ({
         where id = ${episodeId}
         and owner_id =${userId};`
       await pg.query(errorQuery)
+    } finally {
+      endTimer()
     }
   }
 }
diff --git a/plugins/prom.js b/plugins/prom.js
@@ -59,6 +59,11 @@ export default fp(async function (fastify, opts) {
     help: 'The number of times a new user is created'
   })
 
+  fastify.metrics.ytdlpSeconds = new fastify.metrics.client.Histogram({
+    name: 'breadcrum_ytdlp_seconds',
+    help: 'The time it takes for ytdlp items to finish'
+  })
+
   const promServer = Fastify({
     logger: true
   })

diff --git a/routes/api/bookmarks/_id/put-bookmark.js b/routes/api/bookmarks/_id/put-bookmark.js
@@ -120,7 +120,8 @@ export async function putBookmark (fastify, opts) {
           episodeId,
           medium: episodeMedium,
           pg: fastify.pg,
-          log: request.log
+          log: request.log,
+          histogram: fastify.metrics.ytdlpSeconds
         })).then(() => fastify.metrics.episodeCounter.inc()).catch(request.log.error)
       }
 

diff --git a/routes/api/bookmarks/put-bookmarks.js b/routes/api/bookmarks/put-bookmarks.js
@@ -132,7 +132,8 @@ export async function putBookmarks (fastify, opts) {
             episodeId,
             medium: episodeMedium,
             pg: fastify.pg,
-            log: request.log
+            log: request.log,
+            histogram: fastify.metrics.ytdlpSeconds
           }))
             .then(() => { fastify.metrics.episodeCounter.inc() })
             .catch(request.log.error)

diff --git a/routes/api/episodes/_episode_id/put-episode.js b/routes/api/episodes/_episode_id/put-episode.js
@@ -45,8 +45,6 @@ export async function putEpisode (fastify, opts) {
       // TODO: change medium or type?
       // TODO: re-run create episode steps
 
-      console.log({ updates })
-
       if (updates.length > 0) {
         const query = SQL`
           update episodes

diff --git a/routes/api/feeds/_feed/episode/_episode/index.js b/routes/api/feeds/_feed/episode/_episode/index.js
@@ -87,7 +87,9 @@ export default async function podcastFeedsRoutes (fastify, opts) {
         reply.header('fly-cache-status', 'MISS')
       }
 
-      const metadata = await fastify.pqueue.add(() => getYTDLPUrl({ url: episode.src_url, medium: episode.medium }))
+      const metadata = await fastify.pqueue.add(() => {
+        return getYTDLPUrl({ url: episode.src_url, medium: episode.medium, histogram: fastify.metrics.ytdlpSeconds })
+      })
       cache.set(cacheKey, metadata.urls, metadata.urls)
       reply.redirect(302, metadata.urls)
     }

diff --git a/routes/api/feeds/_feed/episode/placeholder/index.js b/routes/api/feeds/_feed/episode/placeholder/index.js
@@ -35,7 +35,9 @@ export default async function podcastFeedsRoutes (fastify, opts) {
         reply.header('fly-cache-status', 'MISS')
       }
 
-      const metadata = await fastify.pqueue.add(() => getYTDLPUrl({ url: PLACEHOLDER_URL, medium: 'video' }))
+      const metadata = await fastify.pqueue.add(() => {
+        return getYTDLPUrl({ url: PLACEHOLDER_URL, medium: 'video', histogram: fastify.metrics.ytdlpSeconds })
+      })
       cache.set(cacheKey, metadata.urls, metadata.urls)
       reply.redirect(302, metadata.urls)
     }