Skip to content

Commit cbfaa03

Browse files
try this to prevent package issues
1 parent 7a91d03 commit cbfaa03

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

packages/kit/src/exports/hooks/sequence.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/** @import { Handle, RequestEvent, ResolveOptions } from '@sveltejs/kit' */
22
/** @import { MaybePromise } from 'types' */
33
import { with_event } from '../../runtime/app/server/event.js';
4+
import { get_event_state } from '../../runtime/server/event-state.js';
45
import { merge_tracing } from '../../runtime/utils.js';
5-
import { record_span } from '../../runtime/telemetry/record_span.js';
66

77
/**
88
* A helper function for sequencing multiple `handle` calls in a middleware-like manner.
@@ -91,7 +91,7 @@ export function sequence(...handlers) {
9191
function apply_handle(i, event, parent_options) {
9292
const handle = handlers[i];
9393

94-
return record_span({
94+
return get_event_state(event).tracing.record_span({
9595
name: 'sveltekit.handle.child',
9696
attributes: {
9797
'sveltekit.handle.child.index': i

packages/kit/src/runtime/server/event-state.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/** @import { RequestEvent } from '@sveltejs/kit' */
22
/** @import { MaybePromise, PrerenderOptions, ServerHooks, SSROptions, SSRState } from 'types' */
33

4+
import { record_span } from '../telemetry/record_span.js';
5+
46
export const EVENT_STATE = Symbol('remote');
57

68
/**
@@ -10,6 +12,9 @@ export const EVENT_STATE = Symbol('remote');
1012
* prerendering: PrerenderOptions | undefined
1113
* transport: ServerHooks['transport'];
1214
* handleValidationError: ServerHooks['handleValidationError'];
15+
* tracing: {
16+
* record_span: typeof record_span
17+
* }
1318
* form_instances?: Map<any, any>;
1419
* remote_data?: Record<string, MaybePromise<any>>;
1520
* refreshes?: Record<string, any>;
@@ -25,7 +30,13 @@ export function create_event_state(state, options) {
2530
return {
2631
prerendering: state.prerendering,
2732
transport: options.hooks.transport,
28-
handleValidationError: options.hooks.handleValidationError
33+
handleValidationError: options.hooks.handleValidationError,
34+
// this is necessary to avoid importing `record_span` in `sequence`, which
35+
// won't work because `record_span` depends on `otel`, which depends on
36+
// being bundled through Vite.
37+
tracing: {
38+
record_span
39+
}
2940
};
3041
}
3142

0 commit comments

Comments
 (0)