ref(server-utils)!: Replace deprecated net.* span attributes on db and messaging spans (#23422)

Author: msonnb

dev-packages/deno-integration-tests/suites/orchestrion-mongo/test.ts

@@ -60,7 +60,7 @@ Deno.test('mongodb instrumentation: orchestrion:mongodb:command channel produces
   assertEquals(mongoSpan!.data?.['db.namespace'], 'mydb');
   assertEquals(mongoSpan!.data?.['db.collection.name'], 'users');
   assertEquals(mongoSpan!.data?.['db.operation.name'], 'find');
-  assertEquals(mongoSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(mongoSpan!.data?.['net.peer.port'], 27017);
+  assertEquals(mongoSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(mongoSpan!.data?.['server.port'], 27017);
   assertEquals(mongoSpan!.data?.['sentry.origin'], 'auto.db.mongo');
 });

dev-packages/deno-integration-tests/suites/orchestrion-mongoose/test.ts

@@ -61,7 +61,7 @@ Deno.test('mongoose instrumentation: orchestrion:mongoose:model_save channel pro
   assertEquals(mongooseSpan!.data?.['db.collection.name'], 'blogposts');
   assertEquals(mongooseSpan!.data?.['db.operation.name'], 'save');
   assertEquals(mongooseSpan!.data?.['db.user'], 'root');
-  assertEquals(mongooseSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(mongooseSpan!.data?.['net.peer.port'], 27017);
+  assertEquals(mongooseSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(mongooseSpan!.data?.['server.port'], 27017);
   assertEquals(mongooseSpan!.data?.['sentry.origin'], 'auto.db.mongoose');
 });

dev-packages/deno-integration-tests/suites/orchestrion-mysql/test.ts

@@ -92,8 +92,8 @@ Deno.test('mysql instrumentation: orchestrion:mysql:query channel produces a nes
   assertEquals(mysqlSpan!.description, 'SELECT 1 AS solution');
   assertEquals(mysqlSpan!.data?.['db.system.name'], 'mysql');
   assertEquals(mysqlSpan!.data?.['db.query.text'], 'SELECT 1 AS solution');
-  assertEquals(mysqlSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(mysqlSpan!.data?.['net.peer.port'], 3306);
+  assertEquals(mysqlSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(mysqlSpan!.data?.['server.port'], 3306);
   assertEquals(mysqlSpan!.data?.['db.user'], 'root');
   assertEquals(mysqlSpan!.data?.['sentry.origin'], 'auto.db.mysql');
 });

dev-packages/deno-integration-tests/suites/orchestrion-mysql2/test.ts

@@ -55,7 +55,7 @@ Deno.test('mysql2 instrumentation: orchestrion:mysql2:query channel produces a n
   assertEquals(mysqlSpan!.data?.['db.query.text'], 'SELECT 1 AS solution');
   assertEquals(mysqlSpan!.data?.['db.namespace'], 'mydb');
   assertEquals(mysqlSpan!.data?.['db.user'], 'root');
-  assertEquals(mysqlSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(mysqlSpan!.data?.['net.peer.port'], 3306);
+  assertEquals(mysqlSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(mysqlSpan!.data?.['server.port'], 3306);
   assertEquals(mysqlSpan!.data?.['sentry.origin'], 'auto.db.mysql2');
 });

dev-packages/deno-integration-tests/suites/orchestrion-postgres/test.ts

@@ -92,8 +92,8 @@ Deno.test('pg instrumentation: orchestrion:pg:query channel produces a nested db
   assertEquals(pgSpan!.description, 'SELECT 1 AS solution');
   assertEquals(pgSpan!.data?.['db.system.name'], 'postgresql');
   assertEquals(pgSpan!.data?.['db.query.text'], 'SELECT 1 AS solution');
-  assertEquals(pgSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(pgSpan!.data?.['net.peer.port'], 5432);
+  assertEquals(pgSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(pgSpan!.data?.['server.port'], 5432);
   assertEquals(pgSpan!.data?.['db.user'], 'root');
   assertEquals(pgSpan!.data?.['sentry.origin'], 'auto.db.postgres');
 });

dev-packages/deno-integration-tests/suites/orchestrion-tedious/test.ts

@@ -58,7 +58,7 @@ Deno.test('tedious instrumentation: orchestrion:tedious:execSql channel produces
   assertEquals(tediousSpan!.data?.['db.namespace'], 'mydb');
   assertEquals(tediousSpan!.data?.['db.user'], 'sa');
   assertEquals(tediousSpan!.data?.['db.query.text'], 'SELECT 1');
-  assertEquals(tediousSpan!.data?.['net.peer.name'], '127.0.0.1');
-  assertEquals(tediousSpan!.data?.['net.peer.port'], 1433);
+  assertEquals(tediousSpan!.data?.['server.address'], '127.0.0.1');
+  assertEquals(tediousSpan!.data?.['server.port'], 1433);
   assertEquals(tediousSpan!.data?.['sentry.origin'], 'auto.db.tedious');
 });

dev-packages/e2e-tests/test-applications/astro-6-cf-workers/tests/db.test.ts

@@ -20,8 +20,8 @@ test('a real mysql query emits a db span with orchestrion-channel attributes', a
   expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
   expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
   expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
-  expect(firstQuery!.data?.['net.peer.name']).toBe('127.0.0.1');
-  expect(firstQuery!.data?.['net.peer.port']).toBe(3306);
+  expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
+  expect(firstQuery!.data?.['server.port']).toBe(3306);
   expect(firstQuery!.data?.['db.user']).toBe('root');
 });
 

dev-packages/e2e-tests/test-applications/astro-7/tests/db.test.ts

@@ -63,8 +63,8 @@ test('Instruments mysql automatically', async ({ baseURL }) => {
         'db.query.text': 'SELECT 1 + 1 AS solution',
         'db.user': 'root',
         'db.connection_string': expect.any(String),
-        'net.peer.name': expect.any(String),
-        'net.peer.port': 3306,
+        'server.address': expect.any(String),
+        'server.port': 3306,
       }),
     }),
   );
@@ -79,8 +79,8 @@ test('Instruments mysql automatically', async ({ baseURL }) => {
         'db.query.text': 'SELECT NOW()',
         'db.user': 'root',
         'db.connection_string': expect.any(String),
-        'net.peer.name': expect.any(String),
-        'net.peer.port': 3306,
+        'server.address': expect.any(String),
+        'server.port': 3306,
       }),
     }),
   );

dev-packages/e2e-tests/test-applications/bun-mysql/tests/mysql.test.ts

@@ -26,7 +26,7 @@ test('mysql queries emit a db span with orchestrion-channel attributes', async (
   expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
   expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
   expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
-  expect(firstQuery!.data?.['net.peer.port']).toBe(3306);
+  expect(firstQuery!.data?.['server.port']).toBe(3306);
   expect(firstQuery!.data?.['db.user']).toBe('root');
 });
 

dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

@@ -27,8 +27,8 @@ test('a real mysql query emits a db span with orchestrion-channel attributes', a
   expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
   expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
   expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
-  expect(firstQuery!.data?.['net.peer.name']).toBe('127.0.0.1');
-  expect(firstQuery!.data?.['net.peer.port']).toBe(3306);
+  expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
+  expect(firstQuery!.data?.['server.port']).toBe(3306);
   expect(firstQuery!.data?.['db.user']).toBe('root');
 });