fixup!

Author: BridgeAR

packages/dd-trace/test/plugins/externals.json

@@ -528,6 +528,10 @@
       "name": "express",
       "versions": [">=4"]
     },
+    {
+      "name": "mysql2",
+      "dep": true
+    },
     {
       "name": "sqlite3",
       "versions": ["^5.0.8"]

scripts/flakiness.mjs

@@ -73,7 +73,34 @@ async function fetchJobsAttemptRest (params) {
   })
 
   const headers = Object.fromEntries(res.headers.entries())
-  const text = await res.text()
+  let text = ''
+  try {
+    text = await res.text()
+  } catch (err) {
+    const summary = {
+      status: res.status,
+      headers: redactHeaders(headers),
+      bodyUsed: res.bodyUsed,
+      // Commonly useful when debugging truncated/gzipped payloads.
+      contentEncoding: headers['content-encoding'],
+      contentLength: headers['content-length'],
+      githubRequestId: headers['x-github-request-id'],
+    }
+    throw new TypeError(
+      `Failed to read jobs REST response body (${inspect(summary, { depth: 5 })}): ${inspect(err, { depth: 5 })}`
+    )
+  }
+
+  if (!res.ok) {
+    const summary = {
+      status: res.status,
+      headers: redactHeaders(headers),
+      bodyLength: text.length,
+      bodyPrefix: text.slice(0, 200),
+    }
+    throw new TypeError(`GitHub REST request failed (${inspect(summary, { depth: 5 })})`)
+  }
+
   try {
     return JSON.parse(text)
   } catch (err) {
@@ -152,14 +179,19 @@ async function checkWorkflowJobs (id, attempt, page = 1) {
   let jobs = response?.data?.jobs
 
   // If Octokit returns an invalid shape (including `data: ''`), fall back to a raw REST fetch.
+  // `@octokit/request` may return `data: ""` if it fails to read/parse the response body.
   if (!Array.isArray(jobs)) {
+    const headers = response?.headers || {}
     console.warn(
       `Octokit jobs response invalid; attempting REST fallback: ${inspect({
         id,
         attempt,
         page,
         status: response?.status,
         url: response?.url,
+        githubRequestId: headers?.['x-github-request-id'],
+        contentEncoding: headers?.['content-encoding'],
+        contentLength: headers?.['content-length'],
         headers: redactHeaders(response?.headers),
         data: response?.data
       }, { depth: 5 })}`
@@ -169,7 +201,6 @@ async function checkWorkflowJobs (id, attempt, page = 1) {
     jobs = rest?.jobs
   }
 
-  // Octokit v5 format: response.data.jobs is an array.
   if (!Array.isArray(jobs)) {
     throw new TypeError(`Unexpected jobs response shape (${inspect(response, { depth: Infinity })})`)
   }

scripts/install_plugin_modules.js

@@ -22,6 +22,9 @@ const excludeList = arch() === 'arm64' ? ['aerospike', 'couchbase', 'grpc', 'ora
 const workspaces = new Set()
 const externalDeps = new Map()
 const packagePromises = new Map()
+const externalSelfNames = new Set(Object.entries(externals)
+  .filter(([key, entries]) => entries.some(entry => entry.name === key))
+  .map(([key]) => key))
 
 Object.keys(externals).forEach(external => externals[external].forEach(thing => {
   if (thing.dep) {
@@ -84,7 +87,11 @@ async function assertInstrumentation (instrumentation, external) {
   // Some tests depend on it, but creating it for every version key caused concurrent writes corrupting package.json.
   const unversionedVersion = versions.includes('*') ? '*' : versions.find(Boolean)
   if (unversionedVersion) {
-    await assertPackageOnce(instrumentation.name, null, unversionedVersion, external)
+    // If the package is also defined in externals.json as a "self entry" (name === key), prefer the external variant
+    // for the unversioned install. This allows yarn to hoist it to `versions/node_modules`, making it available as a
+    // peer/optional dependency to other generated packages (e.g. sequelize -> mysql2).
+    const unversionedExternal = external || externalSelfNames.has(instrumentation.name)
+    await assertPackageOnce(instrumentation.name, null, unversionedVersion, unversionedExternal)
   }
 
   const versionKeys = new Set()