@sveltejs/kit 2.30.0 → 2.31.0

package/src/runtime/server/data/index.js

@@ -11,6 +11,7 @@ import { text_encoder } from '../../utils.js';
 
 /**
  * @param {import('@sveltejs/kit').RequestEvent} event
+ * @param {import('types').RequestState} event_state
  * @param {import('types').SSRRoute} route
  * @param {import('types').SSROptions} options
  * @param {import('@sveltejs/kit').SSRManifest} manifest
@@ -21,6 +22,7 @@ import { text_encoder } from '../../utils.js';
  */
 export async function render_data(
 	event,
+	event_state,
 	route,
 	options,
 	manifest,
@@ -60,6 +62,7 @@ export async function render_data(
 					// load this. for the child, return as is. for the final result, stream things
 					return load_server_data({
 						event: new_event,
+						event_state,
 						state,
 						node,
 						parent: async () => {
@@ -107,7 +110,7 @@ export async function render_data(
 
 					return /** @type {import('types').ServerErrorNode} */ ({
 						type: 'error',
-						error: await handle_error_and_jsonify(event, options, error),
+						error: await handle_error_and_jsonify(event, event_state, options, error),
 						status:
 							error instanceof HttpError || error instanceof SvelteKitError
 								? error.status
@@ -117,7 +120,7 @@ export async function render_data(
 			)
 		);
 
-		const { data, chunks } = get_data_json(event, options, nodes);
+		const { data, chunks } = get_data_json(event, event_state, options, nodes);
 
 		if (!chunks) {
 			// use a normal JSON response where possible, so we get `content-length`
@@ -152,7 +155,7 @@ export async function render_data(
 		if (error instanceof Redirect) {
 			return redirect_json_response(error);
 		} else {
-			return json_response(await handle_error_and_jsonify(event, options, error), 500);
+			return json_response(await handle_error_and_jsonify(event, event_state, options, error), 500);
 		}
 	}
 }
@@ -187,11 +190,12 @@ export function redirect_json_response(redirect) {
  * If the serialized data contains promises, `chunks` will be an
  * async iterable containing their resolutions
  * @param {import('@sveltejs/kit').RequestEvent} event
+ * @param {import('types').RequestState} event_state
  * @param {import('types').SSROptions} options
  * @param {Array<import('types').ServerDataSkippedNode | import('types').ServerDataNode | import('types').ServerErrorNode | null | undefined>} nodes
  *  @returns {{ data: string, chunks: AsyncIterable<string> | null }}
  */
-export function get_data_json(event, options, nodes) {
+export function get_data_json(event, event_state, options, nodes) {
 	let promise_id = 1;
 	let count = 0;
 
@@ -214,7 +218,7 @@ export function get_data_json(event, options, nodes) {
 					.catch(
 						/** @param {any} e */ async (e) => {
 							key = 'error';
-							return handle_error_and_jsonify(event, options, /** @type {any} */ (e));
+							return handle_error_and_jsonify(event, event_state, options, /** @type {any} */ (e));
 						}
 					)
 					.then(
@@ -226,6 +230,7 @@ export function get_data_json(event, options, nodes) {
 							} catch {
 								const error = await handle_error_and_jsonify(
 									event,
+									event_state,
 									options,
 									new Error(`Failed to serialize promise while rendering ${event.route.id}`)
 								);

package/src/runtime/server/endpoint.js

@@ -1,16 +1,17 @@
 import { Redirect } from '@sveltejs/kit/internal';
+import { with_request_store } from '@sveltejs/kit/internal/server';
 import { ENDPOINT_METHODS, PAGE_METHODS } from '../../constants.js';
 import { negotiate } from '../../utils/http.js';
-import { with_event } from '../app/server/event.js';
 import { method_not_allowed } from './utils.js';
 
 /**
  * @param {import('@sveltejs/kit').RequestEvent} event
+ * @param {import('types').RequestState} event_state
  * @param {import('types').SSREndpoint} mod
  * @param {import('types').SSRState} state
  * @returns {Promise<Response>}
  */
-export async function render_endpoint(event, mod, state) {
+export async function render_endpoint(event, event_state, mod, state) {
 	const method = /** @type {import('types').HttpMethod} */ (event.request.method);
 
 	let handler = mod[method] || mod.fallback;
@@ -41,7 +42,7 @@ export async function render_endpoint(event, mod, state) {
 	}
 
 	try {
-		const response = await with_event(event, () =>
+		const response = await with_request_store({ event, state: event_state }, () =>
 			handler(/** @type {import('@sveltejs/kit').RequestEvent<Record<string, any>>} */ (event))
 		);
 

package/src/runtime/server/page/actions.js

@@ -1,13 +1,16 @@
+/** @import { RequestEvent, ActionResult, Actions } from '@sveltejs/kit' */
+/** @import { SSROptions, SSRNode, ServerNode, ServerHooks } from 'types' */
 import * as devalue from 'devalue';
 import { DEV } from 'esm-env';
 import { json } from '@sveltejs/kit';
 import { HttpError, Redirect, ActionFailure, SvelteKitError } from '@sveltejs/kit/internal';
+import { with_request_store, merge_tracing } from '@sveltejs/kit/internal/server';
 import { get_status, normalize_error } from '../../../utils/error.js';
 import { is_form_content_type, negotiate } from '../../../utils/http.js';
 import { handle_error_and_jsonify } from '../utils.js';
-import { with_event } from '../../app/server/event.js';
+import { record_span } from '../../telemetry/record_span.js';
 
-/** @param {import('@sveltejs/kit').RequestEvent} event */
+/** @param {RequestEvent} event */
 export function is_action_json_request(event) {
 	const accept = negotiate(event.request.headers.get('accept') ?? '*/*', [
 		'application/json',
@@ -18,11 +21,12 @@ export function is_action_json_request(event) {
 }
 
 /**
- * @param {import('@sveltejs/kit').RequestEvent} event
- * @param {import('types').SSROptions} options
- * @param {import('types').SSRNode['server'] | undefined} server
+ * @param {RequestEvent} event
+ * @param {import('types').RequestState} event_state
+ * @param {SSROptions} options
+ * @param {SSRNode['server'] | undefined} server
  */
-export async function handle_action_json_request(event, options, server) {
+export async function handle_action_json_request(event, event_state, options, server) {
 	const actions = server?.actions;
 
 	if (!actions) {
@@ -35,7 +39,7 @@ export async function handle_action_json_request(event, options, server) {
 		return action_json(
 			{
 				type: 'error',
-				error: await handle_error_and_jsonify(event, options, no_actions_error)
+				error: await handle_error_and_jsonify(event, event_state, options, no_actions_error)
 			},
 			{
 				status: no_actions_error.status,
@@ -51,7 +55,7 @@ export async function handle_action_json_request(event, options, server) {
 	check_named_default_separate(actions);
 
 	try {
-		const data = await call_action(event, actions);
+		const data = await call_action(event, event_state, actions);
 
 		if (__SVELTEKIT_DEV__) {
 			validate_action_return(data);
@@ -92,7 +96,12 @@ export async function handle_action_json_request(event, options, server) {
 		return action_json(
 			{
 				type: 'error',
-				error: await handle_error_and_jsonify(event, options, check_incorrect_fail_use(err))
+				error: await handle_error_and_jsonify(
+					event,
+					event_state,
+					options,
+					check_incorrect_fail_use(err)
+				)
 			},
 			{
 				status: get_status(err)
@@ -111,7 +120,7 @@ export function check_incorrect_fail_use(error) {
 }
 
 /**
- * @param {import('@sveltejs/kit').Redirect} redirect
+ * @param {Redirect} redirect
  */
 export function action_json_redirect(redirect) {
 	return action_json({
@@ -122,7 +131,7 @@ export function action_json_redirect(redirect) {
 }
 
 /**
- * @param {import('@sveltejs/kit').ActionResult} data
+ * @param {ActionResult} data
  * @param {ResponseInit} [init]
  */
 function action_json(data, init) {
@@ -130,18 +139,19 @@ function action_json(data, init) {
 }
 
 /**
- * @param {import('@sveltejs/kit').RequestEvent} event
+ * @param {RequestEvent} event
  */
 export function is_action_request(event) {
 	return event.request.method === 'POST';
 }
 
 /**
- * @param {import('@sveltejs/kit').RequestEvent} event
- * @param {import('types').SSRNode['server'] | undefined} server
- * @returns {Promise<import('@sveltejs/kit').ActionResult>}
+ * @param {RequestEvent} event
+ * @param {import('types').RequestState} event_state
+ * @param {SSRNode['server'] | undefined} server
+ * @returns {Promise<ActionResult>}
  */
-export async function handle_action_request(event, server) {
+export async function handle_action_request(event, event_state, server) {
 	const actions = server?.actions;
 
 	if (!actions) {
@@ -164,7 +174,7 @@ export async function handle_action_request(event, server) {
 	check_named_default_separate(actions);
 
 	try {
-		const data = await call_action(event, actions);
+		const data = await call_action(event, event_state, actions);
 
 		if (__SVELTEKIT_DEV__) {
 			validate_action_return(data);
@@ -203,7 +213,7 @@ export async function handle_action_request(event, server) {
 }
 
 /**
- * @param {import('@sveltejs/kit').Actions} actions
+ * @param {Actions} actions
  */
 function check_named_default_separate(actions) {
 	if (actions.default && Object.keys(actions).length > 1) {
@@ -214,11 +224,12 @@ function check_named_default_separate(actions) {
 }
 
 /**
- * @param {import('@sveltejs/kit').RequestEvent} event
- * @param {NonNullable<import('types').ServerNode['actions']>} actions
+ * @param {RequestEvent} event
+ * @param {import('types').RequestState} event_state
+ * @param {NonNullable<ServerNode['actions']>} actions
  * @throws {Redirect | HttpError | SvelteKitError | Error}
  */
-async function call_action(event, actions) {
+async function call_action(event, event_state, actions) {
 	const url = new URL(event.request.url);
 
 	let name = 'default';
@@ -247,7 +258,27 @@ async function call_action(event, actions) {
 		);
 	}
 
-	return with_event(event, () => action(event));
+	return record_span({
+		name: 'sveltekit.form_action',
+		attributes: {
+			'sveltekit.form_action.name': name,
+			'http.route': event.route.id || 'unknown'
+		},
+		fn: async (current) => {
+			const traced_event = merge_tracing(event, current);
+			const result = await with_request_store({ event: traced_event, state: event_state }, () =>
+				action(traced_event)
+			);
+			if (result instanceof ActionFailure) {
+				current.setAttributes({
+					'sveltekit.form_action.result.type': 'failure',
+					'sveltekit.form_action.result.status': result.status
+				});
+			}
+
+			return result;
+		}
+	});
 }
 
 /** @param {any} data */
@@ -265,7 +296,7 @@ function validate_action_return(data) {
  * Try to `devalue.uneval` the data object, and if it fails, return a proper Error with context
  * @param {any} data
  * @param {string} route_id
- * @param {import('types').ServerHooks['transport']} transport
+ * @param {ServerHooks['transport']} transport
  */
 export function uneval_action_response(data, route_id, transport) {
 	const replacer = (/** @type {any} */ thing) => {
@@ -284,7 +315,7 @@ export function uneval_action_response(data, route_id, transport) {
  * Try to `devalue.stringify` the data object, and if it fails, return a proper Error with context
  * @param {any} data
  * @param {string} route_id
- * @param {import('types').ServerHooks['transport']} transport
+ * @param {ServerHooks['transport']} transport
  */
 function stringify_action_response(data, route_id, transport) {
 	const encoders = Object.fromEntries(

package/src/runtime/server/page/index.js

@@ -25,6 +25,7 @@ const MAX_DEPTH = 10;
 
 /**
  * @param {import('@sveltejs/kit').RequestEvent} event
+ * @param {import('types').RequestState} event_state
  * @param {import('types').PageNodeIndexes} page
  * @param {import('types').SSROptions} options
  * @param {import('@sveltejs/kit').SSRManifest} manifest
@@ -33,7 +34,16 @@ const MAX_DEPTH = 10;
  * @param {import('types').RequiredResolveOptions} resolve_opts
  * @returns {Promise<Response>}
  */
-export async function render_page(event, page, options, manifest, state, nodes, resolve_opts) {
+export async function render_page(
+	event,
+	event_state,
+	page,
+	options,
+	manifest,
+	state,
+	nodes,
+	resolve_opts
+) {
 	if (state.depth > MAX_DEPTH) {
 		// infinite request cycle detected
 		return text(`Not found: ${event.url.pathname}`, {
@@ -43,7 +53,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 
 	if (is_action_json_request(event)) {
 		const node = await manifest._.nodes[page.leaf]();
-		return handle_action_json_request(event, options, node?.server);
+		return handle_action_json_request(event, event_state, options, node?.server);
 	}
 
 	try {
@@ -57,11 +67,11 @@ export async function render_page(event, page, options, manifest, state, nodes,
 		if (is_action_request(event)) {
 			const remote_id = get_remote_action(event.url);
 			if (remote_id) {
-				action_result = await handle_remote_form_post(event, manifest, remote_id);
+				action_result = await handle_remote_form_post(event, event_state, manifest, remote_id);
 			} else {
 				// for action requests, first call handler in +page.server.js
 				// (this also determines status code)
-				action_result = await handle_action_request(event, leaf_node.server);
+				action_result = await handle_action_request(event, event_state, leaf_node.server);
 			}
 
 			if (action_result?.type === 'redirect') {
@@ -133,6 +143,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 				status,
 				error: null,
 				event,
+				event_state,
 				options,
 				manifest,
 				state,
@@ -163,6 +174,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 
 					return await load_server_data({
 						event,
+						event_state,
 						state,
 						node,
 						parent: async () => {
@@ -189,6 +201,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 				try {
 					return await load_data({
 						event,
+						event_state,
 						fetched,
 						node,
 						parent: async () => {
@@ -243,7 +256,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 					}
 
 					const status = get_status(err);
-					const error = await handle_error_and_jsonify(event, options, err);
+					const error = await handle_error_and_jsonify(event, event_state, options, err);
 
 					while (i--) {
 						if (page.errors[i]) {
@@ -258,6 +271,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 
 							return await render_response({
 								event,
+								event_state,
 								options,
 								manifest,
 								state,
@@ -293,6 +307,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 			// ndjson format
 			let { data, chunks } = get_data_json(
 				event,
+				event_state,
 				options,
 				branch.map((node) => node?.server_data)
 			);
@@ -311,6 +326,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 
 		return await render_response({
 			event,
+			event_state,
 			options,
 			manifest,
 			state,
@@ -330,6 +346,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 		// but the page failed to render, or that a prerendering error occurred
 		return await respond_with_error({
 			event,
+			event_state,
 			options,
 			manifest,
 			state,