Skip to content

Commit 7b8fc17

Browse files
committed
Better debug logging filtering
1 parent 7bc2ded commit 7b8fc17

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

apps/webapp/app/v3/tracer.server.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,12 @@ function getTracer() {
130130
});
131131

132132
if (env.INTERNAL_OTEL_TRACE_EXPORTER_URL) {
133-
const headers = env.INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS
134-
? (JSON.parse(env.INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS) as Record<string, string>)
135-
: undefined;
133+
const headers = parseInternalTraceHeaders() ?? {};
136134

137135
const exporter = new OTLPTraceExporter({
138136
url: env.INTERNAL_OTEL_TRACE_EXPORTER_URL,
139137
timeoutMillis: 15_000,
140-
headers: headers,
138+
headers,
141139
});
142140

143141
provider.addSpanProcessor(
@@ -206,3 +204,13 @@ export function attributesFromAuthenticatedEnv(env: AuthenticatedEnvironment): A
206204
[SemanticEnvResources.USER_ID]: env.orgMember?.userId,
207205
};
208206
}
207+
208+
function parseInternalTraceHeaders(): Record<string, string> | undefined {
209+
try {
210+
return env.INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS
211+
? (JSON.parse(env.INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS) as Record<string, string>)
212+
: undefined;
213+
} catch {
214+
return;
215+
}
216+
}

packages/core/src/logger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ export class Logger {
109109
currentSpan && currentSpan.isRecording() ? currentSpan?.spanContext().spanId : undefined,
110110
};
111111

112-
// If the span is not recording, and it's a debug log, don't log it
112+
// If the span is not recording, and it's a debug log, mark it so we can filter it out when we forward it
113113
if (currentSpan && !currentSpan.isRecording() && level === "debug") {
114-
return;
114+
structuredLog.skipForwarding = true;
115115
}
116116

117117
loggerFunction(JSON.stringify(structuredLog, this.#jsonReplacer));

0 commit comments

Comments
 (0)