feat(deno): redis diagnostics channel based integration for deno (#21087)

Refactor the redis-dc integration logic into core/src/integrations, and
create a Deno integration that uses the same patterns.

Instead of the @sentry/opentelemetry/tracing-channel, the Deno
integration just adds `_sentrySpan` onto the data in a
RedisTracingChannelFactory which is passed to the core utility.

Add deno-redis e2e test.

Author: isaacs

.github/workflows/build.yml

@@ -537,7 +537,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v2.0.4
         with:
-          deno-version: v2.1.5
+          deno-version: v2.7.14
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         with:
@@ -996,10 +996,12 @@ jobs:
           use-installer: true
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Deno
-        if: matrix.test-application == 'deno' || matrix.test-application == 'deno-streamed'
+        if:
+          matrix.test-application == 'deno' || matrix.test-application == 'deno-streamed' || matrix.test-application ==
+          'deno-redis'
         uses: denoland/setup-deno@v2.0.4
         with:
-          deno-version: v2.1.5
+          deno-version: v2.7.14
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         with:

dev-packages/e2e-tests/test-applications/deno-redis/deno.json

@@ -0,0 +1,7 @@
+{
+  "imports": {
+    "@sentry/deno": "npm:@sentry/deno",
+    "redis": "npm:redis@^5.12.0"
+  },
+  "nodeModulesDir": "manual"
+}

dev-packages/e2e-tests/test-applications/deno-redis/docker-compose.yml

@@ -0,0 +1,12 @@
+services:
+  redis:
+    image: redis:8
+    restart: always
+    container_name: e2e-tests-deno-redis
+    ports:
+      - '6379:6379'
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'ping']
+      interval: 1s
+      timeout: 3s
+      retries: 30

dev-packages/e2e-tests/test-applications/deno-redis/global-setup.mjs

@@ -0,0 +1,14 @@
+import { execSync } from 'child_process';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default async function globalSetup() {
+  // Start Redis via Docker Compose. `--wait` blocks until the healthcheck
+  // in docker-compose.yml passes, so the Deno app can connect immediately.
+  execSync('docker compose up -d --wait', {
+    cwd: __dirname,
+    stdio: 'inherit',
+  });
+}

dev-packages/e2e-tests/test-applications/deno-redis/global-teardown.mjs

@@ -0,0 +1,12 @@
+import { execSync } from 'child_process';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default async function globalTeardown() {
+  execSync('docker compose down --volumes', {
+    cwd: __dirname,
+    stdio: 'inherit',
+  });
+}

dev-packages/e2e-tests/test-applications/deno-redis/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "deno-redis",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "start": "docker compose up -d --wait && deno run --allow-net --allow-env --allow-read --allow-sys --allow-write src/app.ts",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@sentry/deno": "file:../../packed/sentry-deno-packed.tgz",
+    "redis": "^5.12.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.56.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}

dev-packages/e2e-tests/test-applications/deno-redis/playwright.config.mjs

@@ -0,0 +1,12 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+  port: 3030,
+});
+
+export default {
+  ...config,
+  globalSetup: './global-setup.mjs',
+  globalTeardown: './global-teardown.mjs',
+};

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -0,0 +1,61 @@
+import * as Sentry from '@sentry/deno';
+import { createClient } from 'redis';
+
+Sentry.init({
+  environment: 'qa',
+  dsn: Deno.env.get('E2E_TEST_DSN'),
+  debug: !!Deno.env.get('DEBUG'),
+  tunnel: 'http://localhost:3031/',
+  tracesSampleRate: 1,
+});
+
+// One shared client per process. node-redis publishes to the
+// `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
+// operation on this client; denoRedisIntegration is already subscribed to
+// those.
+const redis = createClient({
+  url: Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379',
+});
+function onRedisError(err: unknown) {
+  // eslint-disable-next-line no-console
+  console.error('redis client error', err);
+}
+redis.on('error', onRedisError);
+await redis.connect();
+
+const port = 3030;
+
+Deno.serve({ port, hostname: '0.0.0.0' }, async (req: Request) => {
+  const url = new URL(req.url);
+
+  // GET — exercises the command channel, success path.
+  if (url.pathname === '/redis-get') {
+    const key = url.searchParams.get('key') ?? 'cache:key';
+    const value = await redis.get(key);
+    return Response.json({ key, value });
+  }
+
+  // SET then GET — exercises two commands inside a single transaction so we
+  // can assert the parent has two db.redis children.
+  if (url.pathname === '/redis-set-get') {
+    const key = url.searchParams.get('key') ?? 'cache:key';
+    const value = url.searchParams.get('value') ?? 'hello';
+    await redis.set(key, value);
+    const echoed = await redis.get(key);
+    return Response.json({ key, value: echoed });
+  }
+
+  // MULTI — exercises the batch channel.
+  if (url.pathname === '/redis-multi') {
+    const result = await redis.multi().set('multi:a', '1').set('multi:b', '2').get('multi:a').exec();
+    return Response.json({ result });
+  }
+
+  if (url.pathname === '/redis-disconnect') {
+    redis.off('error', onRedisError);
+    redis.close();
+    return new Response('ok');
+  }
+
+  return new Response('Not found', { status: 404 });
+});

dev-packages/e2e-tests/test-applications/deno-redis/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'deno-redis',
+});

dev-packages/e2e-tests/test-applications/deno-redis/tests/redis.test.ts

@@ -0,0 +1,74 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('GET command emits an http.server transaction containing a db.redis child span', async ({ baseURL }) => {
+  // Each incoming request gets a Sentry http.server transaction (via the
+  // default denoServeIntegration); the redis command runs inside it, so the
+  // child span attaches to that transaction.
+  const transactionPromise = waitForTransaction('deno-redis', event => {
+    return (
+      event?.contexts?.trace?.op === 'http.server' &&
+      (event.request?.url ?? '').includes('/redis-get') &&
+      (event.spans?.some(span => span.op === 'db.redis') ?? false)
+    );
+  });
+
+  const res = await fetch(`${baseURL}/redis-get?key=cache:user:42`);
+  expect(res.status).toBe(200);
+  await res.json();
+
+  const transaction = await transactionPromise;
+  const redisSpan = transaction.spans!.find(span => span.op === 'db.redis');
+  expect(redisSpan).toBeDefined();
+  expect(redisSpan!.description).toBe('redis-GET');
+  expect(redisSpan!.data?.['db.system']).toBe('redis');
+  // Statement omits the value; for GET the only allowed arg is the key.
+  expect(redisSpan!.data?.['db.statement']).toBe('GET cache:user:42');
+  expect(redisSpan!.data?.['net.peer.port']).toBe(6379);
+});
+
+test('SET then GET emit two db.redis child spans on the same transaction', async ({ baseURL }) => {
+  const transactionPromise = waitForTransaction('deno-redis', event => {
+    return (
+      event?.contexts?.trace?.op === 'http.server' &&
+      (event.request?.url ?? '').includes('/redis-set-get') &&
+      (event.spans?.filter(span => span.op === 'db.redis').length ?? 0) >= 2
+    );
+  });
+
+  const res = await fetch(`${baseURL}/redis-set-get?key=cache:greeting&value=hello`);
+  expect(res.status).toBe(200);
+  await res.json();
+
+  const transaction = await transactionPromise;
+  const redisSpans = transaction.spans!.filter(span => span.op === 'db.redis');
+  expect(redisSpans.length).toBeGreaterThanOrEqual(2);
+  const ops = redisSpans.map(s => s.description);
+  expect(ops).toContain('redis-SET');
+  expect(ops).toContain('redis-GET');
+});
+
+test('MULTI batch emits a PIPELINE/MULTI batch span', async ({ baseURL }) => {
+  const transactionPromise = waitForTransaction('deno-redis', event => {
+    return (
+      event?.contexts?.trace?.op === 'http.server' &&
+      (event.request?.url ?? '').includes('/redis-multi') &&
+      (event.spans?.some(span => span.description === 'MULTI' || span.description === 'PIPELINE') ?? false)
+    );
+  });
+
+  const res = await fetch(`${baseURL}/redis-multi`);
+  expect(res.status).toBe(200);
+  await res.json();
+
+  const transaction = await transactionPromise;
+  const batchSpan = transaction.spans!.find(span => span.description === 'MULTI' || span.description === 'PIPELINE');
+  expect(batchSpan).toBeDefined();
+  expect(batchSpan!.op).toBe('db.redis');
+  expect(batchSpan!.data?.['db.system']).toBe('redis');
+});
+
+test('shut down redis client', async ({ baseURL }) => {
+  const res = await fetch(`${baseURL}/redis-disconnect`);
+  expect(await res.text()).toBe('ok');
+});