Skip to content

Commit 81b9f93

Browse files
committed
fix(server): redact connection tickets from every failed span
1 parent cb4113e commit 81b9f93

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

‎packages/shared/src/observability.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ describe("observability", () => {
404404
Effect.withSpan("GET", { kind: "server" }),
405405
Effect.provideService(Tracer.Tracer, tracer),
406406
);
407-
yield* Effect.die(new Error(`ResponseError (503 GET ${url})`)).pipe(
408-
Effect.withSpan("GET", { kind: "server" }),
407+
yield* Effect.die(new Error(`RequestParseError (GET ${url})`)).pipe(
408+
Effect.withSpan("DeviceHubProxy.proxyWebSocket"),
409409
Effect.provideService(Tracer.Tracer, tracer),
410410
Effect.exit,
411411
);

‎packages/shared/src/observability.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ export const makeTraceSink = Effect.fn("makeTraceSink")(function* (options: Trac
547547
} satisfies TraceSink;
548548
});
549549

550-
// Effect's HTTP server errors put the request URL in their message.
550+
// Effect's HTTP errors, including failed upgrades, put the request URL in their message.
551551
function redactExitCredentials(exit: Exit.Exit<unknown, unknown>): Exit.Exit<unknown, unknown> {
552552
if (ExitRuntime.isSuccess(exit) || Cause.hasInterruptsOnly(exit.cause)) {
553553
return exit;
@@ -606,10 +606,7 @@ class LocalFileSpan implements Tracer.Span {
606606
endTime,
607607
exit: traceExit,
608608
};
609-
this.delegate.end(
610-
endTime,
611-
this.kind === "server" ? redactExitCredentials(traceExit) : traceExit,
612-
);
609+
this.delegate.end(endTime, redactExitCredentials(traceExit));
613610

614611
if (this.sampled) {
615612
this.push(spanToTraceRecord(this));

0 commit comments

Comments
 (0)