@netlify/build 29.25.0 → 29.26.0

package/lib/steps/error.js

@@ -3,7 +3,7 @@ import { handleBuildError } from '../error/handle.js';
 import { getFullErrorInfo, parseErrorInfo } from '../error/parse/parse.js';
 import { serializeErrorStatus } from '../error/parse/serialize_status.js';
 import { isSoftFailEvent } from '../plugins/events.js';
-import { addErrorToActiveSpan } from '../tracing/main.js';
+import { addErrorToActiveSpan, addEventToActiveSpan } from '../tracing/main.js';
 // Handle build command errors and plugin errors:
 //  - usually, propagate the error to make the build stop.
 //  - `utils.build.cancelBuild()` also cancels the build by calling the API
@@ -18,7 +18,7 @@ export const handleStepError = function ({ event, newError, childEnv, mode, api,
         return { newError };
     }
     const fullErrorInfo = getFullErrorInfo({ error: newError, colors: false, debug });
-    const { type } = fullErrorInfo;
+    const { errorInfo: { location: { packageName } = {} }, message, title, type, } = fullErrorInfo;
     if (type === 'failPlugin' || isSoftFailEvent(event)) {
         return handleFailPlugin({
             fullErrorInfo,
@@ -33,6 +33,12 @@ export const handleStepError = function ({ event, newError, childEnv, mode, api,
         });
     }
     if (type === 'cancelBuild') {
+        const cancellationAttributes = {
+            'build.cancellation.title': title,
+            'build.cancellation.message': message,
+            'build.cancellation.packageName': packageName,
+        };
+        addEventToActiveSpan('build.cancelled', cancellationAttributes);
         return handleCancelBuild({ fullErrorInfo, newError, api, deployId });
     }
     return handleFailBuild({ fullErrorInfo, newError });

package/lib/tracing/main.d.ts

@@ -9,6 +9,9 @@ export declare const setMultiSpanAttributes: (attributes: {
 }) => import("@opentelemetry/api").Context;
 /** Add error information to the current active span (if any) */
 export declare const addErrorToActiveSpan: (error: Error) => void;
+export declare const addEventToActiveSpan: (eventName: string, attributes?: {
+    [key: string]: string;
+} | undefined) => void;
 export declare const loadBaggageFromFile: (baggageFilePath: string) => import("@opentelemetry/api").Context;
 /** Attributes used for the root span of our execution */
 export type RootExecutionAttributes = {

package/lib/tracing/main.js

@@ -2,6 +2,8 @@ import { readFileSync } from 'node:fs';
 import { HoneycombSDK } from '@honeycombio/opentelemetry-node';
 import { context, trace, propagation, SpanStatusCode, diag, DiagLogLevel } from '@opentelemetry/api';
 import { parseKeyPairsIntoRecord } from '@opentelemetry/core/build/src/baggage/utils.js';
+import { isBuildError } from '../error/info.js';
+import { parseErrorInfo } from '../error/parse/parse.js';
 import { ROOT_PACKAGE_JSON } from '../utils/json.js';
 let sdk;
 /** Given a simple logging function return a `DiagLogger`. Used to setup our system logger as the diag logger.*/
@@ -79,12 +81,24 @@ export const addErrorToActiveSpan = function (error) {
     const span = trace.getActiveSpan();
     if (!span)
         return;
+    if (isBuildError(error)) {
+        const { severity, type } = parseErrorInfo(error);
+        if (severity == 'none')
+            return;
+        span.setAttributes({ severity, type });
+    }
     span.recordException(error);
     span.setStatus({
         code: SpanStatusCode.ERROR,
         message: error.message,
     });
 };
+export const addEventToActiveSpan = function (eventName, attributes) {
+    const span = trace.getActiveSpan();
+    if (!span)
+        return;
+    span.addEvent(eventName, attributes);
+};
 //** Loads the baggage attributes from a baggabe file which follows W3C Baggage specification */
 export const loadBaggageFromFile = function (baggageFilePath) {
     if (baggageFilePath.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.25.0",
+  "version": "29.26.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -146,5 +146,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "633f90410881f22105c6cb78003e92b92d0b02ef"
+  "gitHead": "147c3b3639a47b840490e6c0888f99812d8d8c6b"
 }