update span names to latest semconv

Author: seemk

plugins/node/instrumentation-typeorm/src/typeorm.ts

@@ -223,10 +223,13 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
           if (value === undefined) delete attributes[key];
         });
 
-        const span: Span = self.tracer.startSpan(`TypeORM ${opName}`, {
-          kind: SpanKind.CLIENT,
-          attributes,
-        });
+        const span: Span = self.tracer.startSpan(
+          buildSpanName(opName, attributes[ATTR_DB_COLLECTION_NAME]),
+          {
+            kind: SpanKind.CLIENT,
+            attributes,
+          }
+        );
 
         const contextWithSpan = trace.setSpan(context.active(), span);
 
@@ -281,7 +284,7 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
           }
         }
         const span: Span = self.tracer.startSpan(
-          `TypeORM ${operation} ${mainTableName}`,
+          buildSpanName(operation, attributes[ATTR_DB_COLLECTION_NAME]),
           {
             kind: SpanKind.CLIENT,
             attributes,
@@ -328,7 +331,7 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
           [ATTR_DB_QUERY_TEXT]: sql,
         };
 
-        const span: Span = self.tracer.startSpan(`TypeORM ${operation}`, {
+        const span: Span = self.tracer.startSpan(operation, {
           kind: SpanKind.CLIENT,
           attributes,
         });
@@ -426,3 +429,11 @@ const buildStatement = (func: Function, args: any[]) => {
   });
   return statement;
 };
+
+function buildSpanName(operation: string, target: string | undefined): string {
+  if (target !== undefined) {
+    return `${operation} ${target}`;
+  }
+
+  return operation;
+}

plugins/node/instrumentation-typeorm/test/Connection.test.ts

@@ -55,6 +55,7 @@ describe('Connection', () => {
       const typeOrmSpans = getTestSpans();
 
       assert.strictEqual(typeOrmSpans.length, 1);
+      assert.strictEqual(typeOrmSpans[0].name, 'raw query');
       assert.strictEqual(typeOrmSpans[0].status.code, SpanStatusCode.UNSET);
       const attributes = typeOrmSpans[0].attributes;
       assert.strictEqual(attributes[ATTR_DB_SYSTEM_NAME], options.type);

plugins/node/instrumentation-typeorm/test/EntityManager.test.ts

@@ -56,6 +56,7 @@ describe('EntityManager', () => {
       const typeOrmSpans = getTestSpans();
 
       assert.strictEqual(typeOrmSpans.length, 1);
+      assert.strictEqual(typeOrmSpans[0].name, 'save user');
       assert.strictEqual(typeOrmSpans[0].status.code, SpanStatusCode.UNSET);
       const attributes = typeOrmSpans[0].attributes;
       assert.strictEqual(attributes[ATTR_DB_COLLECTION_NAME], 'user');
@@ -79,6 +80,7 @@ describe('EntityManager', () => {
       const typeOrmSpans = getTestSpans();
 
       assert.strictEqual(typeOrmSpans.length, 1);
+      assert.strictEqual(typeOrmSpans[0].name, 'save user');
       assert.strictEqual(typeOrmSpans[0].status.code, SpanStatusCode.UNSET);
       const attributes = typeOrmSpans[0].attributes;
       assert.strictEqual(attributes[ATTR_DB_COLLECTION_NAME], 'user');
@@ -104,6 +106,7 @@ describe('EntityManager', () => {
       const typeOrmSpans = getTestSpans();
 
       assert.strictEqual(typeOrmSpans.length, 2);
+      assert.strictEqual(typeOrmSpans[1].name, 'remove user');
       assert.strictEqual(typeOrmSpans[1].status.code, SpanStatusCode.UNSET);
       const attributes = typeOrmSpans[1].attributes;
       assert.strictEqual(attributes[ATTR_DB_COLLECTION_NAME], 'user');
@@ -135,6 +138,7 @@ describe('EntityManager', () => {
       const typeOrmSpans = getTestSpans();
 
       assert.strictEqual(typeOrmSpans.length, 2);
+      assert.strictEqual(typeOrmSpans[1].name, 'update user');
       assert.strictEqual(typeOrmSpans[1].status.code, SpanStatusCode.UNSET);
       const attributes = typeOrmSpans[1].attributes;
       assert.strictEqual(attributes[ATTR_DB_COLLECTION_NAME], 'user');
@@ -158,6 +162,7 @@ describe('EntityManager', () => {
 
       const typeOrmSpans = getTestSpans();
       assert.strictEqual(typeOrmSpans.length, 1);
+      assert.strictEqual(typeOrmSpans[0].name, 'find');
       assert.strictEqual(typeOrmSpans[0].status.code, SpanStatusCode.ERROR);
       assert.strictEqual(
         typeOrmSpans[0].status.message,
@@ -194,6 +199,7 @@ describe('EntityManager', () => {
       const sqlite1Span = spans[0];
       const sqlite2Span = spans[1];
 
+      assert.strictEqual(sqlite1Span.name, 'save user');
       assert.strictEqual(
         sqlite1Span.attributes[ATTR_DB_SYSTEM_NAME],
         defaultOptions.type
@@ -211,6 +217,7 @@ describe('EntityManager', () => {
         'user'
       );
 
+      assert.strictEqual(sqlite2Span.name, 'remove user');
       assert.strictEqual(
         sqlite2Span.attributes[ATTR_DB_SYSTEM_NAME],
         options2.type

plugins/node/instrumentation-typeorm/test/QueryBuilder.test.ts

@@ -55,6 +55,7 @@ describe('QueryBuilder', () => {
     assert.strictEqual(users.length, 2);
     const typeOrmSpans = getTestSpans();
     assert.strictEqual(typeOrmSpans.length, 1);
+    assert.strictEqual(typeOrmSpans[0].name, 'select user');
     assert.strictEqual(typeOrmSpans[0].status.code, SpanStatusCode.UNSET);
     const attributes = typeOrmSpans[0].attributes;
     assert.strictEqual(attributes[ATTR_DB_SYSTEM_NAME], defaultOptions.type);

plugins/node/instrumentation-typeorm/test/Repository.test.ts

@@ -47,6 +47,7 @@ describe('Repository', () => {
     assert.strictEqual(spans.length, 1);
     const span = spans[0];
     const attributes = span.attributes;
+    assert.strictEqual(span.name, 'findAndCount user');
     assert.strictEqual(attributes[ATTR_DB_COLLECTION_NAME], 'user');
     await ds.destroy();
   });