From 55967d7aae94cb95c17f46bfd64221c980eb07f0 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 9 Nov 2023 10:59:20 -0500 Subject: [PATCH] fix(tracing): Update prisma span to be `db.prisma` Prisma can be used for NoSQL dbs like mongo, so change the span op from `db.sql.prisma` to `db.prisma` --- .../suites/tracing-new/prisma-orm/test.ts | 6 +++--- .../suites/tracing/prisma-orm/test.ts | 6 +++--- packages/tracing-internal/src/node/integrations/prisma.ts | 2 +- packages/tracing/test/integrations/node/prisma.test.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/node-integration-tests/suites/tracing-new/prisma-orm/test.ts b/packages/node-integration-tests/suites/tracing-new/prisma-orm/test.ts index 040f3890fc11..cae5bbc2c46a 100644 --- a/packages/node-integration-tests/suites/tracing-new/prisma-orm/test.ts +++ b/packages/node-integration-tests/suites/tracing-new/prisma-orm/test.ts @@ -10,17 +10,17 @@ conditionalTest({ min: 12 })('Prisma ORM Integration', () => { spans: [ { description: 'User create', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'create', 'db.prisma.version': '3.12.0' }, }, { description: 'User findMany', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'findMany', 'db.prisma.version': '3.12.0' }, }, { description: 'User deleteMany', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'deleteMany', 'db.prisma.version': '3.12.0' }, }, ], diff --git a/packages/node-integration-tests/suites/tracing/prisma-orm/test.ts b/packages/node-integration-tests/suites/tracing/prisma-orm/test.ts index 040f3890fc11..cae5bbc2c46a 100644 --- a/packages/node-integration-tests/suites/tracing/prisma-orm/test.ts +++ b/packages/node-integration-tests/suites/tracing/prisma-orm/test.ts @@ -10,17 +10,17 @@ conditionalTest({ min: 12 })('Prisma ORM Integration', () => { spans: [ { description: 'User create', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'create', 'db.prisma.version': '3.12.0' }, }, { description: 'User findMany', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'findMany', 'db.prisma.version': '3.12.0' }, }, { description: 'User deleteMany', - op: 'db.sql.prisma', + op: 'db.prisma', data: { 'db.system': 'postgresql', 'db.operation': 'deleteMany', 'db.prisma.version': '3.12.0' }, }, ], diff --git a/packages/tracing-internal/src/node/integrations/prisma.ts b/packages/tracing-internal/src/node/integrations/prisma.ts index bf98be00e163..df43ec441391 100644 --- a/packages/tracing-internal/src/node/integrations/prisma.ts +++ b/packages/tracing-internal/src/node/integrations/prisma.ts @@ -101,7 +101,7 @@ export class Prisma implements Integration { return trace( { name: model ? `${model} ${action}` : action, - op: 'db.sql.prisma', + op: 'db.prisma', origin: 'auto.db.prisma', data: { ...clientData, 'db.operation': action }, }, diff --git a/packages/tracing/test/integrations/node/prisma.test.ts b/packages/tracing/test/integrations/node/prisma.test.ts index 4b2034f37a01..4debafd7de35 100644 --- a/packages/tracing/test/integrations/node/prisma.test.ts +++ b/packages/tracing/test/integrations/node/prisma.test.ts @@ -55,7 +55,7 @@ describe('setupOnce', function () { expect(mockTrace).toHaveBeenLastCalledWith( { name: 'user create', - op: 'db.sql.prisma', + op: 'db.prisma', origin: 'auto.db.prisma', data: { 'db.system': 'postgresql', 'db.prisma.version': '3.1.2', 'db.operation': 'create' }, },