Merge branch 'main' into repo-sync

Author: Octomerger

middleware/abort.js

@@ -1,3 +1,5 @@
+import statsd from '../lib/statsd.js'
+
 export default function abort(req, res, next) {
   // If the client aborts the connection, send an error
   req.once('aborted', () => {
@@ -7,6 +9,18 @@ export default function abort(req, res, next) {
     }
     // NOTE: Node.js will also automatically set `req.aborted = true`
 
+    const incrementTags = []
+    // Be careful with depending on attributes set on the `req` because
+    // under certain conditions the contextualizers might not yet have
+    // had a chance to run.
+    if (req.pagePath) {
+      incrementTags.push(`path:${req.pagePath}`)
+    }
+    if (req.context?.currentCategory) {
+      incrementTags.push(`product:${req.context.currentCategory}`)
+    }
+    statsd.increment('middleware.abort', 1, incrementTags)
+
     const abortError = new Error('Client closed request')
     abortError.statusCode = 499
     abortError.code = 'ECONNRESET'

middleware/timeout.js

@@ -1,5 +1,7 @@
 import timeout from 'express-timeout-handler'
 
+import statsd from '../lib/statsd.js'
+
 // Heroku router requests timeout after 30 seconds. We should stop them earlier!
 const maxRequestTimeout = parseInt(process.env.REQUEST_TIMEOUT, 10) || 10000
 
@@ -14,6 +16,18 @@ export default timeout.handler({
   disable: [],
 
   onTimeout: function (req, res, next) {
+    const incrementTags = []
+    // Be careful with depending on attributes set on the `req` because
+    // under certain conditions the contextualizers might not yet have
+    // had a chance to run.
+    if (req.pagePath) {
+      incrementTags.push(`path:${req.pagePath}`)
+    }
+    if (req.context?.currentCategory) {
+      incrementTags.push(`product:${req.context.currentCategory}`)
+    }
+    statsd.increment('middleware.timeout', 1, incrementTags)
+
     // Create a custom timeout error
     const timeoutError = new Error('Request timed out')
     timeoutError.statusCode = 503

stylesheets/syntax-highlighting.scss

@@ -33,6 +33,9 @@ from https://unpkg.com/highlight.js@9.15.8/styles/github.css
 .hljs-section,
 .hljs-selector-id {
   color: var(--color-prettylights-syntax-markup-heading);
+}
+
+.hljs-section {
   font-weight: bold;
 }