Skip to content

Commit d8b488b

Browse files
authored
chore: Simplify HTTP logs (#2530)
1 parent cb0ef6a commit d8b488b

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

packages/service-utils/src/cf-worker/index.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ function bufferToHex(buffer: ArrayBuffer) {
175175
}
176176

177177
export async function logHttpRequest({
178-
source,
179178
clientId,
180179
req,
181180
res,
182181
isAuthed,
183182
statusMessage,
184183
latencyMs,
185184
}: AuthInput & {
185+
// @deprecated
186186
source: string;
187187
res: Response;
188188
isAuthed?: boolean;
@@ -195,23 +195,23 @@ export async function logHttpRequest({
195195

196196
console.log(
197197
JSON.stringify({
198-
source,
198+
method: req.method,
199199
pathname: req.url,
200200
hasSecretKey: !!authorizationData.secretKey,
201201
hasClientId: !!authorizationData.clientId,
202202
hasJwt: !!authorizationData.jwt,
203203
clientId: authorizationData.clientId,
204-
isAuthed: !!isAuthed ?? null,
204+
isAuthed,
205205
status: res.status,
206-
sdkName: headers.get("x-sdk-name") ?? "unknown",
207-
sdkVersion: headers.get("x-sdk-version") ?? "unknown",
208-
platform: headers.get("x-sdk-platform") ?? "unknown",
209-
os: headers.get("x-sdk-os") ?? "unknown",
210-
latencyMs: latencyMs ?? null,
206+
sdkName: headers.get("x-sdk-name") ?? undefined,
207+
sdkVersion: headers.get("x-sdk-version") ?? undefined,
208+
platform: headers.get("x-sdk-platform") ?? undefined,
209+
os: headers.get("x-sdk-os") ?? undefined,
210+
latencyMs,
211211
}),
212212
);
213-
console.log(`statusMessage=${statusMessage ?? res.statusText}`);
214-
} catch (err) {
215-
console.error("Failed to log HTTP request:", err);
216-
}
213+
if (statusMessage) {
214+
console.log(`statusMessage=${statusMessage}`);
215+
}
216+
} catch (err) {}
217217
}

packages/service-utils/src/node/index.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ export function deriveClientIdFromSecretKeyHash(secretKeyHash: string) {
177177
}
178178

179179
export function logHttpRequest({
180-
source,
181180
clientId,
182181
req,
183182
res,
184183
isAuthed,
185184
statusMessage,
186185
latencyMs,
187186
}: AuthInput & {
187+
// @deprecated
188188
source: string;
189189
res: ServerResponse;
190190
isAuthed?: boolean;
@@ -195,27 +195,23 @@ export function logHttpRequest({
195195
const authorizationData = extractAuthorizationData({ req, clientId });
196196
const headers = req.headers;
197197

198-
const _statusMessage = statusMessage ?? res.statusMessage;
199198
console.log(
200199
JSON.stringify({
201-
source,
200+
method: req.method,
202201
pathname: req.url,
203202
hasSecretKey: !!authorizationData.secretKey,
204203
hasClientId: !!authorizationData.clientId,
205204
hasJwt: !!authorizationData.jwt,
206205
clientId: authorizationData.clientId,
207-
isAuthed: !!isAuthed ?? null,
206+
isAuthed,
208207
status: res.statusCode,
209-
statusMessage: _statusMessage,
210-
sdkName: headers["x-sdk-name"] ?? "unknown",
211-
sdkVersion: headers["x-sdk-version"] ?? "unknown",
212-
platform: headers["x-sdk-platform"] ?? "unknown",
213-
os: headers["x-sdk-os"] ?? "unknown",
214-
latencyMs: latencyMs ?? null,
208+
statusMessage,
209+
sdkName: headers["x-sdk-name"] ?? undefined,
210+
sdkVersion: headers["x-sdk-version"] ?? undefined,
211+
platform: headers["x-sdk-platform"] ?? undefined,
212+
os: headers["x-sdk-os"] ?? undefined,
213+
latencyMs,
215214
}),
216215
);
217-
console.log(`statusMessage=${_statusMessage}`);
218-
} catch (err) {
219-
console.error("Failed to log HTTP request:", err);
220-
}
216+
} catch (err) {}
221217
}

0 commit comments

Comments
 (0)