@netlify/build 29.4.0 → 29.4.89-test

package/lib/plugins_core/functions/index.js

@@ -6,9 +6,10 @@ import { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle } fr
 import { getZipError } from './error.js';
 import { getUserAndInternalFunctions, validateFunctionsSrc } from './utils.js';
 import { getZisiParameters } from './zisi.js';
-// Returns `true` if at least one of the functions has been configured to use
-// esbuild.
-const isUsingEsbuild = (functionsConfig = {}) => Object.values(functionsConfig).some((configObject) => configObject.node_bundler === 'esbuild');
+// Get a list of all unique bundlers in this run
+const getBundlers = (results = []) => Array.from(new Set(results
+    .map((bundle) => (bundle.runtime === "js" /* RuntimeType.JAVASCRIPT */ ? bundle.bundler : null))
+    .filter(Boolean)));
 const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, }) => {
     const zisiParameters = getZisiParameters({
         buildDir,
@@ -20,14 +21,14 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
         isRunningLocally,
         repositoryRoot,
     });
-    const bundler = isUsingEsbuild(functionsConfig) ? 'esbuild' : 'zisi';
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
         const sourceDirectories = [internalFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
+        const bundlers = getBundlers(results);
         logBundleResults({ logs, results });
-        return { bundler };
+        return { bundlers };
     }
     catch (error) {
         throw await getZipError(error, functionsSrc);
@@ -39,7 +40,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     const functionsDist = resolve(buildDir, relativeFunctionsDist);
     const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
     const internalFunctionsSrcExists = await pathExists(internalFunctionsSrc);
-    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, logs, relativeFunctionsSrc });
+    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, relativeFunctionsSrc });
     const [userFunctions = [], internalFunctions = []] = await getUserAndInternalFunctions({
         featureFlags,
         functionsSrc,
@@ -64,7 +65,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     if (userFunctions.length === 0 && internalFunctions.length === 0) {
         return {};
     }
-    const { bundler } = await zipFunctionsAndLogResults({
+    const { bundlers } = await zipFunctionsAndLogResults({
         buildDir,
         childEnv,
         featureFlags,
@@ -78,7 +79,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     });
     return {
         tags: {
-            bundler,
+            bundler: bundlers,
         },
     };
 };

package/lib/report/statsd.js

@@ -1,31 +1,26 @@
 import { promisify } from 'util';
 import slugify from '@sindresorhus/slugify';
-import StatsdClient from 'statsd-client';
-// TODO: replace with `timers/promises` after dropping Node < 15.0.0
-const pSetTimeout = promisify(setTimeout);
-// See https://github.com/msiebuhr/node-statsd-client/blob/45a93ee4c94ca72f244a40b06cb542d4bd7c3766/lib/EphemeralSocket.js#L81
-const CLOSE_TIMEOUT = 11;
-// The socket creation is delayed until the first packet is sent. In our
-// case, this happens just before `client.close()` is called, which is too
-// late and make it not send anything. We need to manually create it using
-// the internal API.
+import { StatsD } from 'hot-shots';
 export const startClient = async function (host, port) {
-    const client = new StatsdClient({ host, port, socketTimeout: 0 });
-    // @ts-expect-error using internals :D
-    await promisify(client._socket._createSocket.bind(client._socket))();
-    return client;
+    return new StatsD({ host, port, cacheDns: true });
 };
-// UDP packets are buffered and flushed at regular intervals by statsd-client.
-// Closing force flushing all of them.
 export const closeClient = async function (client) {
-    client.close();
-    // statsd-client does not provide a way of knowing when the socket is done
-    // closing, so we need to use the following hack.
-    await pSetTimeout(CLOSE_TIMEOUT);
-    await pSetTimeout(CLOSE_TIMEOUT);
+    await promisify(client.close.bind(client))();
 };
 // Make sure the timer name does not include special characters.
 // For example, the `packageName` of local plugins includes dots.
 export const normalizeTagName = function (name) {
     return slugify(name, { separator: '_' });
 };
+export const formatTags = function (tags) {
+    return Object.entries(tags)
+        .map(([key, value]) => {
+        if (Array.isArray(value)) {
+            return value.map((subValue) => `${key}:${subValue}`);
+        }
+        else {
+            return `${key}:${value}`;
+        }
+    })
+        .flat();
+};

package/lib/time/report.js

@@ -1,24 +1,27 @@
-import { closeClient, startClient } from '../report/statsd.js';
+import { closeClient, formatTags, startClient } from '../report/statsd.js';
 import { addAggregatedTimers } from './aggregate.js';
 import { roundTimerToMillisecs } from './measure.js';
 // Record the duration of a build phase, for monitoring.
 // Sends to statsd daemon.
-export const reportTimers = async function ({ timers, statsdOpts: { host, port }, framework }) {
+export const reportTimers = async function ({ timers, statsdOpts: { host, port }, framework, }) {
     if (host === undefined) {
         return;
     }
     const timersA = addAggregatedTimers(timers);
-    await sendTimers({ timers: timersA, host, port, framework });
+    await sendTimers({ timers: timersA, statsdOpts: { host, port }, framework });
 };
-const sendTimers = async function ({ timers, host, port, framework }) {
+const sendTimers = async function ({ timers, statsdOpts: { host, port }, framework, }) {
     const client = await startClient(host, port);
     timers.forEach((timer) => {
         sendTimer({ timer, client, framework });
     });
     await closeClient(client);
 };
-const sendTimer = function ({ timer: { metricName, stageTag, parentTag, durationNs, tags }, client, framework }) {
+const sendTimer = function ({ timer: { metricName, stageTag, parentTag, durationNs, tags }, client, framework, }) {
     const durationMs = roundTimerToMillisecs(durationNs);
-    const frameworkTag = framework === undefined ? {} : { framework };
-    client.distribution(metricName, durationMs, { stage: stageTag, parent: parentTag, ...tags, ...frameworkTag });
+    const statsdTags = { stage: stageTag, parent: parentTag, ...tags };
+    if (framework != undefined) {
+        statsdTags.framework = framework;
+    }
+    client.distribution(metricName, durationMs, formatTags(statsdTags));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.4.0",
+  "version": "29.4.89-test",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -69,7 +69,7 @@
     "@netlify/edge-bundler": "8.0.0",
     "@netlify/functions-utils": "^5.1.1",
     "@netlify/git-utils": "^5.1.0",
-    "@netlify/plugins-list": "^6.59.0",
+    "@netlify/plugins-list": "^6.61.0",
     "@netlify/run-utils": "^5.1.0",
     "@netlify/zip-it-and-ship-it": "^8.2.0",
     "@sindresorhus/slugify": "^2.0.0",
@@ -80,6 +80,7 @@
     "figures": "^4.0.0",
     "filter-obj": "^3.0.0",
     "got": "^10.0.0",
+    "hot-shots": "9.3.0",
     "indent-string": "^5.0.0",
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
@@ -105,7 +106,6 @@
     "rfdc": "^1.3.0",
     "safe-json-stringify": "^1.2.0",
     "semver": "^7.0.0",
-    "statsd-client": "0.4.7",
     "string-width": "^5.0.0",
     "strip-ansi": "^7.0.0",
     "supports-color": "^9.0.0",
@@ -120,7 +120,6 @@
   "devDependencies": {
     "@netlify/nock-udp": "^3.1.0",
     "@types/node": "^14.18.31",
-    "@types/statsd-client": "^0.4.3",
     "atob": "^2.1.2",
     "ava": "^4.0.0",
     "c8": "^7.12.0",
@@ -148,6 +147,5 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  },
-  "gitHead": "87d6d9344ac37b4c40b70c582958347c0f7fd8eb"
+  }
 }