feat: Enable server-side instrumentation via tracing.server.ts

This commit consolidates all changes to support server-side instrumentation:
- Add support for tracing.server.ts configuration file
- Implement adapter support for Netlify, Cloudflare, Vercel, and Node
- Add better export generation and catalog functionality
- Include necessary type definitions and configuration options
- Fix various bugs and conflicts during development

Author: elliott-with-the-longest-name-on-github

packages/adapter-cloudflare/index.js

@@ -113,6 +113,11 @@ export default function (options = {}) {
 					ASSETS: assets_binding
 				}
 			});
+			builder.trace({
+				entrypoint: worker_dest,
+				tracing: `${builder.getServerDirectory()}/tracing.server.js`,
+				tla: false
+			});
 
 			// _headers
 			if (existsSync('_headers')) {
@@ -184,7 +189,8 @@ export default function (options = {}) {
 				}
 
 				return true;
-			}
+			},
+			tracing: () => true
 		}
 	};
 }

packages/adapter-netlify/index.js

@@ -1,3 +1,4 @@
+/** @import { BuildOptions } from 'esbuild' */
 import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve, posix } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -106,7 +107,8 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 				}
 
 				return true;
-			}
+			},
+			tracing: () => true
 		}
 	};
 }
@@ -174,9 +176,8 @@ async function generate_edge_functions({ builder }) {
 		version: 1
 	};
 
-	await esbuild.build({
-		entryPoints: [`${tmp}/entry.js`],
-		outfile: '.netlify/edge-functions/render.js',
+	/** @type {BuildOptions} */
+	const esbuild_config = {
 		bundle: true,
 		format: 'esm',
 		platform: 'browser',
@@ -194,6 +195,21 @@ async function generate_edge_functions({ builder }) {
 		// https://docs.netlify.com/edge-functions/api/#runtime-environment
 		external: builtinModules.map((id) => `node:${id}`),
 		alias: Object.fromEntries(builtinModules.map((id) => [id, `node:${id}`]))
+	};
+	await esbuild.build({
+		entryPoints: [`${tmp}/entry.js`],
+		outfile: '.netlify/edge-functions/render.js',
+		...esbuild_config
+	});
+	await esbuild.build({
+		entryPoints: [`${builder.getServerDirectory()}/tracing.server.js`],
+		outfile: '.netlify/edge-functions/tracing.server.js',
+		...esbuild_config
+	});
+	builder.trace({
+		entrypoint: '.netlify/edge-functions/render.js',
+		tracing: '.netlify/edge-functions/tracing.server.js',
+		tla: false
 	});
 
 	writeFileSync('.netlify/edge-functions/manifest.json', JSON.stringify(edge_manifest));
@@ -272,6 +288,12 @@ function generate_lambda_functions({ builder, publish, split }) {
 
 			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
 			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
+			builder.trace({
+				entrypoint: `.netlify/functions-internal/${name}.mjs`,
+				tracing: '.netlify/server/tracing.server.js',
+				start: `${name}.start.mjs`,
+				exports: ['handler']
+			});
 
 			const redirect = `/.netlify/functions/${name} 200`;
 			redirects.push(`${pattern} ${redirect}`);
@@ -286,6 +308,12 @@ function generate_lambda_functions({ builder, publish, split }) {
 
 		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.json`, fn_config);
 		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
+		builder.trace({
+			entrypoint: `.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`,
+			tracing: '.netlify/server/tracing.server.js',
+			exports: ['handler']
+		});
+
 		redirects.push(`* /.netlify/functions/${FUNCTION_PREFIX}render 200`);
 	}
 

packages/adapter-node/index.js

@@ -48,14 +48,18 @@ export default function (opts = {}) {
 
 			const pkg = JSON.parse(readFileSync('package.json', 'utf8'));
 
+			/** @type {Record<string, string>} */
+			const input = {
+				index: `${tmp}/index.js`,
+				manifest: `${tmp}/manifest.js`,
+				'tracing.server': `${tmp}/tracing.server.js`
+			};
+
 			// we bundle the Vite output so that deployments only need
 			// their production dependencies. Anything in devDependencies
 			// will get included in the bundled code
 			const bundle = await rollup({
-				input: {
-					index: `${tmp}/index.js`,
-					manifest: `${tmp}/manifest.js`
-				},
+				input,
 				external: [
 					// dependencies could have deep exports, so we need a regex
 					...Object.keys(pkg.dependencies || {}).map((d) => new RegExp(`^${d}(\\/.*)?$`))
@@ -89,10 +93,17 @@ export default function (opts = {}) {
 					ENV_PREFIX: JSON.stringify(envPrefix)
 				}
 			});
+
+			builder.trace({
+				entrypoint: `${out}/index.js`,
+				tracing: `${out}/server/tracing.server.js`,
+				exports: ['path', 'host', 'port', 'server']
+			});
 		},
 
 		supports: {
-			read: () => true
+			read: () => true,
+			tracing: () => true
 		}
 	};
 }

packages/adapter-node/rollup.config.js

@@ -42,14 +42,8 @@ export default [
 			file: 'files/index.js',
 			format: 'esm'
 		},
-		plugins: [
-			clearOutput('files/index.js'),
-			nodeResolve({ preferBuiltins: true }),
-			commonjs(),
-			json(),
-			prefixBuiltinModules()
-		],
-		external: ['ENV', 'HANDLER']
+		plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json(), prefixBuiltinModules()],
+		external: ['./start.js']
 	},
 	{
 		input: 'src/env.js',

packages/adapter-vercel/index.js

@@ -1,3 +1,4 @@
+/** @import { BuildOptions } from 'esbuild' */
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
@@ -93,13 +94,16 @@ const plugin = function (defaults = {}) {
 				const dir = `${dirs.functions}/${name}.func`;
 
 				const relativePath = path.posix.relative(tmp, builder.getServerDirectory());
-
 				builder.copy(`${files}/serverless.js`, `${tmp}/index.js`, {
 					replace: {
 						SERVER: `${relativePath}/index.js`,
 						MANIFEST: './manifest.js'
 					}
 				});
+				builder.trace({
+					entrypoint: `${tmp}/index.js`,
+					tracing: `${builder.getServerDirectory()}/tracing.server.js`
+				});
 
 				write(
 					`${tmp}/manifest.js`,
@@ -136,9 +140,9 @@ const plugin = function (defaults = {}) {
 				);
 
 				try {
-					const result = await esbuild.build({
-						entryPoints: [`${tmp}/edge.js`],
-						outfile: `${dirs.functions}/${name}.func/index.js`,
+					const outdir = `${dirs.functions}/${name}.func`;
+					/** @type {BuildOptions} */
+					const esbuild_config = {
 						// minimum Node.js version supported is v14.6.0 that is mapped to ES2019
 						// https://edge-runtime.vercel.app/features/polyfills
 						// TODO verify the latest ES version the edge runtime supports
@@ -168,13 +172,32 @@ const plugin = function (defaults = {}) {
 							'.eot': 'copy',
 							'.otf': 'copy'
 						}
+					};
+					const result = await esbuild.build({
+						entryPoints: [`${tmp}/edge.js`],
+						outfile: `${outdir}/index.js`,
+						...esbuild_config
+					});
+					const instrumentation_result = await esbuild.build({
+						entryPoints: [`${builder.getServerDirectory()}/tracing.server.js`],
+						outfile: `${outdir}/tracing.server.js`,
+						...esbuild_config
 					});
 
-					if (result.warnings.length > 0) {
-						const formatted = await esbuild.formatMessages(result.warnings, {
-							kind: 'warning',
-							color: true
-						});
+					builder.trace({
+						entrypoint: `${outdir}/index.js`,
+						tracing: `${outdir}/tracing.server.js`,
+						tla: false
+					});
+
+					if (result.warnings.length > 0 || instrumentation_result.warnings.length > 0) {
+						const formatted = await esbuild.formatMessages(
+							[...result.warnings, ...instrumentation_result.warnings],
+							{
+								kind: 'warning',
+								color: true
+							}
+						);
 
 						console.error(formatted.join('\n'));
 					}
@@ -477,7 +500,8 @@ const plugin = function (defaults = {}) {
 				}
 
 				return true;
-			}
+			},
+			tracing: () => true
 		}
 	};
 };