Skip to content

Commit fcc2244

Browse files
committed
fixup! feat(deno): redis diagnostics channel based integration for deno (#21087)
1 parent a8d3cb7 commit fcc2244

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

packages/core/src/integrations/redis/redis-dc-subscriber.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const NOOP = (): void => {};
2727
export interface RedisCommandData {
2828
command: string;
2929
/** First arg is the command name itself in node-redis >= 5.12.0; consumers should slice it off. */
30-
args: Array<string | Buffer>;
30+
args: Array<string | Uint8Array>;
3131
database?: number;
3232
serverAddress?: string;
3333
serverPort?: number;
@@ -65,7 +65,7 @@ export interface RedisConnectData {
6565
export type RedisDiagnosticChannelResponseHook = (
6666
span: Span,
6767
cmdName: string,
68-
cmdArgs: Array<string | Buffer>,
68+
cmdArgs: Array<string | Uint8Array>,
6969
result: unknown,
7070
) => void;
7171

@@ -257,7 +257,7 @@ function setupConnectChannel(tracingChannel: RedisTracingChannelFactory): void {
257257
});
258258
}
259259

260-
function runResponseHook(span: Span, command: string, args: Array<string | Buffer>, result: unknown): void {
260+
function runResponseHook(span: Span, command: string, args: Array<string | Uint8Array>, result: unknown): void {
261261
const hook = currentResponseHook;
262262
if (!hook) return;
263263
try {
@@ -267,7 +267,7 @@ function runResponseHook(span: Span, command: string, args: Array<string | Buffe
267267
}
268268
}
269269

270-
function safeSerialize(command: string, args: Array<string | Buffer>): string | undefined {
270+
function safeSerialize(command: string, args: Array<string | Uint8Array>): string | undefined {
271271
try {
272272
return defaultDbStatementSerializer(command, args);
273273
} catch {

packages/core/src/integrations/redis/redis-statement-serializer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ const SERIALIZATION_SUBSETS: Array<{ regex: RegExp; args: number }> = [
3636
*/
3737
export function defaultDbStatementSerializer(
3838
cmdName: string,
39-
cmdArgs: Array<string | Buffer | number | unknown[]>,
39+
cmdArgs: Array<string | Uint8Array | number | unknown[]>,
4040
): string {
4141
if (!Array.isArray(cmdArgs) || cmdArgs.length === 0) return cmdName;
4242

4343
const budget = SERIALIZATION_SUBSETS.find(({ regex }) => regex.test(cmdName))?.args ?? 0;
44-
const argsToSerialize: Array<string | Buffer | number | unknown[]> =
44+
const argsToSerialize: Array<string | Uint8Array | number | unknown[]> =
4545
budget >= 0 ? cmdArgs.slice(0, budget) : cmdArgs.slice();
4646
if (cmdArgs.length > argsToSerialize.length) {
4747
argsToSerialize.push(`[${cmdArgs.length - budget} other arguments]`);

0 commit comments

Comments
 (0)