insight into which page has what page.render statsd timer (#23747)

Author: Peter Bengtsson

lib/page.js

@@ -13,7 +13,6 @@ import renderContent from './render-content/index.js'
 import processLearningTracks from './process-learning-tracks.js'
 import { productMap } from './all-products.js'
 import slash from 'slash'
-import statsd from './statsd.js'
 import readFileContents from './read-file-contents.js'
 import getLinkData from './get-link-data.js'
 import getDocumentType from './get-document-type.js'
@@ -114,9 +113,7 @@ class Page {
       this.showMiniToc = this.showMiniToc === false ? this.showMiniToc : true
     }
 
-    // Instrument the `_render` method, so externally we call #render
-    // but it's wrapped in a timer that reports to Datadog
-    this.render = statsd.asyncTimer(this._render.bind(this), 'page.render')
+    this.render = this._render.bind(this)
 
     return this
   }

middleware/render-page.js

@@ -2,6 +2,7 @@ import { get } from 'lodash-es'
 import patterns from '../lib/patterns.js'
 import getMiniTocItems from '../lib/get-mini-toc-items.js'
 import Page from '../lib/page.js'
+import statsd from '../lib/statsd.js'
 import { isConnectionDropped } from './halt-on-dropped-connection.js'
 import { nextApp, nextHandleRequest } from './next.js'
 
@@ -47,7 +48,10 @@ export default async function renderPage(req, res, next) {
   if (isConnectionDropped(req, res)) return
 
   // render page
-  context.renderedPage = await page.render(context)
+  const pageRenderTimed = statsd.asyncTimer(page.render, 'middleware.render_page', [
+    `path:${req.pagePath || req.path}`,
+  ])
+  context.renderedPage = await pageRenderTimed(context)
 
   // Stop processing if the connection was already dropped
   if (isConnectionDropped(req, res)) return