Skip to content

Commit e0a8dd5

Browse files
committed
fix(server): keep signed URL trace exclusions focused
1 parent de0861e commit e0a8dd5

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

‎apps/server/src/http.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,23 @@ describe("untraced requests", () => {
181181
HttpClientRequest.get(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png`),
182182
HttpClientRequest.get(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png?v=1`),
183183
HttpClientRequest.post(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/payload.signature`),
184+
HttpClientRequest.post(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/payload.signature?v=1`),
185+
HttpClientRequest.head(`${ASSET_ROUTE_PREFIX}/payload.signature/image.png`),
184186
]) {
185187
expect((yield* client.execute(request)).status).toBe(204);
186188
}
187189
expect(serverSpans).toEqual([]);
188190

189191
expect((yield* client.execute(HttpClientRequest.get("/api/environment"))).status).toBe(204);
190192
expect(serverSpans).toEqual(["GET"]);
193+
194+
for (const path of [
195+
`${ASSET_ROUTE_PREFIX}-other/file`,
196+
`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}-other/token`,
197+
]) {
198+
expect((yield* client.execute(HttpClientRequest.get(path))).status).toBe(404);
199+
}
200+
expect(serverSpans).toEqual(["GET", "GET", "GET"]);
191201
}).pipe(Effect.provide(NodeServices.layer)),
192202
);
193203
});

‎apps/server/src/http.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,20 +383,17 @@ export const layerOtlpTracesProxyRoute = HttpRouter.add(
383383
);
384384

385385
const UNTRACED_REQUEST_PATHS: ReadonlySet<string> = new Set([OTLP_TRACES_PROXY_PATH]);
386-
// These URLs carry a bearer token in the path, so they never reach a trace.
387-
const UNTRACED_REQUEST_PATH_PREFIXES = [
388-
`${WEBHOOK_ROUTE_PREFIX}/`,
389-
`${ASSET_ROUTE_PREFIX}/`,
390-
`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`,
391-
];
392386

393387
// HttpRouter.serve builds routes privately; provide the server-wide TracerDisabledWhen to the served layer.
394388
const layerUntracedRequests = Layer.succeed(HttpMiddleware.TracerDisabledWhen)((request) => {
395389
const queryIndex = request.url.indexOf("?");
396390
const path = queryIndex === -1 ? request.url : request.url.slice(0, queryIndex);
391+
// Signed URLs carry bearer tokens in the path, so they never reach a trace.
397392
return (
398393
UNTRACED_REQUEST_PATHS.has(path) ||
399-
UNTRACED_REQUEST_PATH_PREFIXES.some((prefix) => path.startsWith(prefix))
394+
path.startsWith(`${WEBHOOK_ROUTE_PREFIX}/`) ||
395+
path.startsWith(`${ASSET_ROUTE_PREFIX}/`) ||
396+
path.startsWith(`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/`)
400397
);
401398
});
402399

0 commit comments

Comments
 (0)