@@ -134,7 +134,7 @@ export const layer = Api.make(
134134 const relayApiZone = yield * RelayApiZone ;
135135 const managedEndpointZone = yield * ManagedEndpointZone ;
136136 const randomApnsDeliveryJobSigningSecret = yield * ApnsDeliveryJobSigningSecret ;
137- const observability = yield * RelayObservability ;
137+ yield * RelayObservability ;
138138
139139 //
140140 // 2. Create bindings
@@ -159,10 +159,6 @@ export const layer = Api.make(
159159 const apnsDeliveryQueueSender = yield * Cloudflare . Queues . WriteQueue ( apnsDeliveryQueue ) ;
160160 const fcmDeliveryQueueSender = yield * Cloudflare . Queues . WriteQueue ( fcmDeliveryQueue ) ;
161161
162- const axiomDatasetName = yield * observability . traces . name ;
163- const axiomIngestToken = yield * observability . workerIngestToken . token ;
164- const axiomTracesEndpoint = yield * observability . traces . otelTracesEndpoint ;
165-
166162 const clerkSecretKey = yield * Config . Redacted ( "CLERK_SECRET_KEY" ) ;
167163 const clerkPublishableKey = yield * Config . String ( "CLERK_PUBLISHABLE_KEY" ) ;
168164 const clerkJwtAudience = yield * Config . String ( "CLERK_JWT_AUDIENCE" ) ;
@@ -231,14 +227,6 @@ export const layer = Api.make(
231227 } ) ;
232228 } ) ;
233229
234- const layerRelayTrace = Layer . unwrap (
235- Effect . all ( {
236- tracesDatasetName : axiomDatasetName ,
237- tracesEndpoint : axiomTracesEndpoint ,
238- ingestToken : axiomIngestToken ,
239- } ) . pipe ( Effect . map ( Observability . layer ) ) ,
240- ) ;
241-
242230 // Each managed endpoint's held webhook requests live in its own Durable Object.
243231 const inboxCall =
244232 < A > ( operation : HookInbox . HookInboxError [ "operation" ] , endpointKey : string ) =>
@@ -442,8 +430,8 @@ export const layer = Api.make(
442430 { concurrency : 2 , discard : true } ,
443431 ) . pipe (
444432 Effect . withSpan ( "relay.cron.prune_expired_state" ) ,
445- // Export cron spans to Axiom like HTTP spans; the scope flushes them before the run ends.
446- Effect . provide ( Layer . merge ( layerRuntime , layerRelayTrace ) ) ,
433+ Observability . withSchemaErrorSpanAttributes ,
434+ Effect . provide ( layerRuntime ) ,
447435 ) ,
448436 ) ;
449437
@@ -462,7 +450,11 @@ export const layer = Api.make(
462450 HttpRouter . toHttpEffect ,
463451 Effect . provideService ( HttpRouter . RouterConfig , RELAY_HTTP_ROUTER_CONFIG ) ,
464452 withoutCapturedParentSpan ,
465- Effect . flatMap ( ( httpEffect ) => traceRelayHttpRequestWith ( httpEffect , layerRelayTrace ) ) ,
453+ Effect . map ( ( httpEffect ) =>
454+ traceRelayHttpRequestWith ( httpEffect , Layer . empty ) . pipe (
455+ Observability . withSchemaErrorSpanAttributes ,
456+ ) ,
457+ ) ,
466458 ) ;
467459
468460 return { fetch } ;
@@ -477,20 +469,17 @@ export const layer = Api.make(
477469 Layer . provideMerge ( Cloudflare . DNS . ReadWriteDnsHttp ) ,
478470 Layer . provideMerge ( Cloudflare . Workers . RateLimitBinding ) ,
479471 Layer . provideMerge ( HookInboxObject . layer ) ,
480- // The worker runtime opens its own HTTP span around ours. For webhook
481- // paths it would record the raw URL, token included, and adopt the
482- // sender's traceparent, so only our redacted span covers those.
483- // Registered as telemetry: request-time context is assembled per
484- // event, and only these layers are built into it.
472+ // The worker runtime opens its own HTTP span around ours. Ours carries
473+ // the route, header redaction and webhook URL redaction, and drops a
474+ // webhook sender's traceparent, so the runtime's span is off for every
475+ // request rather than duplicating it. Registered as telemetry:
476+ // request-time context is assembled per event, and only these layers
477+ // are built into it.
485478 Layer . provideMerge (
486- Alchemy . Telemetry . layer (
487- Layer . succeed ( HttpMiddleware . TracerDisabledWhen ) ( ( request ) =>
488- HookForwarder . isRelayHookPath ( request . url ) ,
489- ) ,
490- ) ,
479+ Alchemy . Telemetry . layer ( Layer . succeed ( HttpMiddleware . TracerDisabledWhen ) ( ( ) => true ) ) ,
491480 ) ,
492- // Exports spans from events the HTTP tracer does not wrap, notably
493- // HookInboxObject calls and alarms, to the same Axiom dataset .
481+ // The Worker's only trace exporter: every event (fetch, queue, cron,
482+ // HookInboxObject calls and alarms) exports through it to Axiom .
494483 Layer . provideMerge (
495484 Layer . unwrap (
496485 Effect . map ( RelayObservability , ( observability ) =>
0 commit comments