Update register and install_plugin_modules

Taken from Bryan

Author: bouwkast

packages/datadog-instrumentations/src/helpers/register.js

@@ -16,6 +16,7 @@ const {
 
 const hooks = require('./hooks')
 const instrumentations = require('./instrumentations')
+const latests = require('./latests.json')
 const names = Object.keys(hooks)
 const pathSepExpr = new RegExp(`\\${path.sep}`, 'g')
 const disabledInstrumentations = new Set(
@@ -111,7 +112,7 @@ for (const packageName of names) {
           namesAndSuccesses[`${name}@${version}`] = false
         }
 
-        if (matchVersion(version, versions)) {
+        if (matchVersion(version, versions) && matchesLatestSupported(name, version)) {
           // Check if the hook already has a set moduleExport
           if (hook[HOOK_SYMBOL].has(moduleExports)) {
             namesAndSuccesses[`${name}@${version}`] = true
@@ -159,6 +160,17 @@ function matchVersion (version, ranges) {
   return !version || (ranges && ranges.some(range => semver.satisfies(semver.coerce(version), range)))
 }
 
+function matchesLatestSupported (name, version) {
+  if (latests.pinned.includes(name)) {
+    // These ones are deliberately pinned to a specific version. That
+    // means we can skip this check, since it will already have been checked
+    // to be lower than latest.
+    return true
+  }
+  const latest = latests.latests[name]
+  return matchVersion(version, ['<=' + latest])
+}
+
 function getVersion (moduleBaseDir) {
   if (moduleBaseDir) {
     return requirePackageJson(moduleBaseDir, module).version

scripts/install_plugin_modules.js

@@ -5,18 +5,21 @@ const os = require('os')
 const path = require('path')
 const crypto = require('crypto')
 const semver = require('semver')
-const proxyquire = require('proxyquire')
 const exec = require('./helpers/exec')
-const childProcess = require('child_process')
 const externals = require('../packages/dd-trace/test/plugins/externals')
+const {
+  getVersionList,
+  getInternals,
+  npmView
+} = require('./helpers/versioning')
+const latests = require('../packages/datadog-instrumentations/src/helpers/latests.json')
 
 const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require-package-json')
 
 // Can remove aerospike after removing support for aerospike < 5.2.0 (for Node.js 22, v5.12.1 is required)
 // Can remove couchbase after removing support for couchbase <= 3.2.0
 const excludeList = os.arch() === 'arm64' ? ['aerospike', 'couchbase', 'grpc', 'oracledb'] : []
 const workspaces = new Set()
-const versionLists = {}
 const deps = {}
 const filter = process.env.hasOwnProperty('PLUGINS') && process.env.PLUGINS.split('|')
 
@@ -46,21 +49,7 @@ async function run () {
 }
 
 async function assertVersions () {
-  const internals = names
-    .map(key => {
-      const instrumentations = []
-      const name = key
-
-      try {
-        loadInstFile(`${name}/server.js`, instrumentations)
-        loadInstFile(`${name}/client.js`, instrumentations)
-      } catch (e) {
-        loadInstFile(`${name}.js`, instrumentations)
-      }
-
-      return instrumentations
-    })
-    .reduce((prev, next) => prev.concat(next), [])
+  const internals = getInternals()
 
   for (const inst of internals) {
     await assertInstrumentation(inst, false)
@@ -145,7 +134,17 @@ async function assertPackage (name, version, dependency, external) {
 }
 
 async function addDependencies (dependencies, name, versionRange) {
-  const versionList = await getVersionList(name)
+  let versionList = await getVersionList(name)
+  if (!latests.pinned.includes(name)) {
+    const maxVersion = latests.latests[name]
+    versionList = versionList.map(version => {
+      if (version.startsWith('>=') && !version.includes('<')) {
+        return version + ' <=' + maxVersion
+      } else {
+        return version
+      }
+    })
+  }
   const version = semver.maxSatisfying(versionList, versionRange)
   const pkgJson = await npmView(`${name}@${version}`)
   for (const dep of deps[name]) {
@@ -158,27 +157,6 @@ async function addDependencies (dependencies, name, versionRange) {
   }
 }
 
-async function getVersionList (name) {
-  if (versionLists[name]) {
-    return versionLists[name]
-  }
-  const list = await npmView(`${name} versions`)
-  versionLists[name] = list
-  return list
-}
-
-function npmView (input) {
-  return new Promise((resolve, reject) => {
-    childProcess.exec(`npm view ${input} --json`, (err, stdout) => {
-      if (err) {
-        reject(err)
-        return
-      }
-      resolve(JSON.parse(stdout.toString('utf8')))
-    })
-  })
-}
-
 function assertIndex (name, version) {
   const index = `'use strict'
 
@@ -234,18 +212,3 @@ function sha1 (str) {
   shasum.update(str)
   return shasum.digest('hex')
 }
-
-function loadInstFile (file, instrumentations) {
-  const instrument = {
-    addHook (instrumentation) {
-      instrumentations.push(instrumentation)
-    }
-  }
-
-  const instPath = path.join(__dirname, `../packages/datadog-instrumentations/src/${file}`)
-
-  proxyquire.noPreserveCache()(instPath, {
-    './helpers/instrument': instrument,
-    '../helpers/instrument': instrument
-  })
-}