Skip to content

Commit 38ef208

Browse files
s1gr1ds1gr1d
committed
review comments
1 parent 9bdb19b commit 38ef208

File tree

3 files changed

+79
-18
lines changed

3 files changed

+79
-18
lines changed

‎dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-redis-4.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ async function initializeClient() {
1818
return createClient().connect();
1919
}
2020

21-
let client;
21+
let redisClient;
2222

2323
(async function () {
24-
client = await initializeClient();
24+
redisClient = await initializeClient();
2525
})();
2626

2727
async function run() {
@@ -32,19 +32,19 @@ async function run() {
3232
},
3333
async () => {
3434
try {
35-
await client.set('redis-test-key', 'test-value');
36-
await client.set('redis-cache:test-key', 'test-value');
35+
await redisClient.set('redis-test-key', 'test-value');
36+
await redisClient.set('redis-cache:test-key', 'test-value');
3737

38-
await client.set('redis-cache:test-key-set-EX', 'test-value', 'EX', 10);
39-
await client.setex('redis-cache:test-key-setex', 10, 'test-value');
38+
await redisClient.set('redis-cache:test-key-set-EX', 'test-value', 'EX', 10);
39+
await redisClient.setex('redis-cache:test-key-setex', 10, 'test-value');
4040

41-
await client.get('redis-test-key');
42-
await client.get('redis-cache:test-key');
43-
await client.get('redis-cache:unavailable-data');
41+
await redisClient.get('redis-test-key');
42+
await redisClient.get('redis-cache:test-key');
43+
await redisClient.get('redis-cache:unavailable-data');
4444

45-
await client.mget('redis-test-key', 'redis-cache:test-key', 'redis-cache:unavailable-data');
45+
await redisClient.mget('redis-test-key', 'redis-cache:test-key', 'redis-cache:unavailable-data');
4646
} finally {
47-
await client.disconnect();
47+
await redisClient.disconnect();
4848
}
4949
},
5050
);

‎packages/node/src/integrations/tracing/redis.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
getCacheOperation,
2121
shouldConsiderForCache,
2222
} from '../../utils/redisCache';
23+
import { truncate } from '@sentry/utils/src';
2324

2425
interface RedisOptions {
2526
cachePrefixes?: string[];
@@ -70,7 +71,7 @@ const cacheResponseHook: RedisResponseCustomAttributeFunction = (span: Span, red
7071

7172
const spanDescription = safeKey.join(', ');
7273

73-
span.updateName(spanDescription.length > 1024 ? `${spanDescription.substring(0, 1024)}...` : spanDescription);
74+
span.updateName(truncate(spanDescription, 1024));
7475
};
7576

7677
const instrumentIORedis = generateInstrumentOnce('IORedis', () => {

‎yarn.lock

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6386,6 +6386,15 @@
63866386
"@types/pg" "8.6.1"
63876387
"@types/pg-pool" "2.0.4"
63886388

6389+
"@opentelemetry/instrumentation-redis-4@0.40.0":
6390+
version "0.40.0"
6391+
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.40.0.tgz#4a1bc9bebfb869de8d982b1a1a5b550bdb68d15b"
6392+
integrity sha512-0ieQYJb6yl35kXA75LQUPhHtGjtQU9L85KlWa7d4ohBbk/iQKZ3X3CFl5jC5vNMq/GGPB3+w3IxNvALlHtrp7A==
6393+
dependencies:
6394+
"@opentelemetry/instrumentation" "^0.52.0"
6395+
"@opentelemetry/redis-common" "^0.36.2"
6396+
"@opentelemetry/semantic-conventions" "^1.22.0"
6397+
63896398
"@opentelemetry/instrumentation@0.52.0", "@opentelemetry/instrumentation@^0.52.0":
63906399
version "0.52.0"
63916400
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.52.0.tgz#f8b790bfb1c61c27e0ba846bc6d0e377da195d1e"
@@ -6614,6 +6623,40 @@
66146623
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
66156624
integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
66166625

6626+
"@redis/bloom@1.2.0":
6627+
version "1.2.0"
6628+
resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
6629+
integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==
6630+
6631+
"@redis/client@1.5.16":
6632+
version "1.5.16"
6633+
resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.16.tgz#1d5919077a06a4b935b0e4bef9e036eef1a10371"
6634+
integrity sha512-X1a3xQ5kEMvTib5fBrHKh6Y+pXbeKXqziYuxOUo1ojQNECg4M5Etd1qqyhMap+lFUOAh8S7UYevgJHOm4A+NOg==
6635+
dependencies:
6636+
cluster-key-slot "1.1.2"
6637+
generic-pool "3.9.0"
6638+
yallist "4.0.0"
6639+
6640+
"@redis/graph@1.1.1":
6641+
version "1.1.1"
6642+
resolved "https://registry.yarnpkg.com/@redis/graph/-/graph-1.1.1.tgz#8c10df2df7f7d02741866751764031a957a170ea"
6643+
integrity sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==
6644+
6645+
"@redis/json@1.0.6":
6646+
version "1.0.6"
6647+
resolved "https://registry.yarnpkg.com/@redis/json/-/json-1.0.6.tgz#b7a7725bbb907765d84c99d55eac3fcf772e180e"
6648+
integrity sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==
6649+
6650+
"@redis/search@1.1.6":
6651+
version "1.1.6"
6652+
resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.6.tgz#33bcdd791d9ed88ab6910243a355d85a7fedf756"
6653+
integrity sha512-mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw==
6654+
6655+
"@redis/time-series@1.0.5":
6656+
version "1.0.5"
6657+
resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.5.tgz#a6d70ef7a0e71e083ea09b967df0a0ed742bc6ad"
6658+
integrity sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==
6659+
66176660
"@remix-run/node@^1.4.3":
66186661
version "1.5.1"
66196662
resolved "https://registry.yarnpkg.com/@remix-run/node/-/node-1.5.1.tgz#1c367d4035baaef8f0ea66962a826456d62f0030"
@@ -12790,7 +12833,7 @@ clsx@^2.0.0:
1279012833
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
1279112834
integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
1279212835

12793-
cluster-key-slot@^1.1.0:
12836+
cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0:
1279412837
version "1.1.2"
1279512838
resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
1279612839
integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
@@ -17311,6 +17354,11 @@ generate-function@^2.3.1:
1731117354
dependencies:
1731217355
is-property "^1.0.2"
1731317356

17357+
generic-pool@3.9.0:
17358+
version "3.9.0"
17359+
resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"
17360+
integrity sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==
17361+
1731417362
gensync@^1.0.0-beta.2:
1731517363
version "1.0.0-beta.2"
1731617364
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -26304,6 +26352,18 @@ redeyed@~1.0.0:
2630426352
dependencies:
2630526353
esprima "~3.0.0"
2630626354

26355+
"redis-4@npm:redis@^4.6.14":
26356+
version "4.6.14"
26357+
resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.14.tgz#599e49b65816c56a6683f6b19dc374c8e786d091"
26358+
integrity sha512-GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw==
26359+
dependencies:
26360+
"@redis/bloom" "1.2.0"
26361+
"@redis/client" "1.5.16"
26362+
"@redis/graph" "1.1.1"
26363+
"@redis/json" "1.0.6"
26364+
"@redis/search" "1.1.6"
26365+
"@redis/time-series" "1.0.5"
26366+
2630726367
redis-errors@^1.0.0, redis-errors@^1.2.0:
2630826368
version "1.2.0"
2630926369
resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
@@ -31307,16 +31367,16 @@ yalc@^1.0.0-pre.53:
3130731367
npm-packlist "^2.1.5"
3130831368
yargs "^16.1.1"
3130931369

31370+
yallist@4.0.0, yallist@^4.0.0:
31371+
version "4.0.0"
31372+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
31373+
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
31374+
3131031375
yallist@^3.0.0, yallist@^3.0.2:
3131131376
version "3.1.1"
3131231377
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
3131331378
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
3131431379

31315-
yallist@^4.0.0:
31316-
version "4.0.0"
31317-
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
31318-
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
31319-
3132031380
yam@^1.0.0:
3132131381
version "1.0.0"
3132231382
resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"

0 commit comments

Comments
 (0)