update address and port

Author: maryliag

plugins/node/opentelemetry-instrumentation-pg/README.md

@@ -75,8 +75,8 @@ To select which semconv version(s) is emitted from this instrumentation, use the
 | (not included)          | `db.namespace`                                  | The name of the database, fully qualified within the server address and port.              |
 | `db.statement`          | `db.query.text`                                 | The database query being executed.                                                         |
 | `db.system`             | `db.system.name`                                | The database management system (DBMS) product as identified by the client instrumentation. |
-| `net.peer.port`         | `network.peer.port`                             | Peer port number of the network connection.                                                |
-| `net.peer.name`         | `network.peer.address`                          | Peer address of the database node where the operation was performed.                       |
+| `net.peer.port`         | `server.port`                                   | Remote port number.                                                                        |
+| `net.peer.name`         | `server.address`                                | Remote hostname or similar.                                                                |
 
 Metrics Exported:
 

plugins/node/opentelemetry-instrumentation-pg/src/utils.ts

@@ -30,8 +30,8 @@ import {
   ATTR_ERROR_TYPE,
   ATTR_DB_SYSTEM_NAME,
   ATTR_DB_NAMESPACE,
-  ATTR_NETWORK_PEER_ADDRESS,
-  ATTR_NETWORK_PEER_PORT,
+  ATTR_SERVER_ADDRESS,
+  ATTR_SERVER_PORT,
   ATTR_DB_QUERY_TEXT,
 } from '@opentelemetry/semantic-conventions';
 import {
@@ -175,8 +175,8 @@ export function getSemanticAttributesFromConnection(
       ...attributes,
       [ATTR_DB_SYSTEM_NAME]: DB_SYSTEM_VALUE_POSTGRESQL,
       [ATTR_DB_NAMESPACE]: params.namespace,
-      [ATTR_NETWORK_PEER_ADDRESS]: params.host,
-      [ATTR_NETWORK_PEER_PORT]: getPort(params.port),
+      [ATTR_SERVER_ADDRESS]: params.host,
+      [ATTR_SERVER_PORT]: getPort(params.port),
     };
   }
 
@@ -216,8 +216,8 @@ export function getSemanticAttributesFromPool(
       ...attributes,
       [ATTR_DB_SYSTEM_NAME]: DB_SYSTEM_VALUE_POSTGRESQL,
       [ATTR_DB_NAMESPACE]: params.namespace,
-      [ATTR_NETWORK_PEER_ADDRESS]: url?.hostname ?? params.host,
-      [ATTR_NETWORK_PEER_PORT]: Number(url?.port) || getPort(params.port),
+      [ATTR_SERVER_ADDRESS]: url?.hostname ?? params.host,
+      [ATTR_SERVER_PORT]: Number(url?.port) || getPort(params.port),
     };
   }
 

plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts

@@ -31,7 +31,7 @@ import { PgInstrumentationConfig } from '../src';
 import { AttributeNames } from '../src/enums/AttributeNames';
 import { PgClientExtended, PgPoolOptionsParams } from '../src/internal-types';
 import * as utils from '../src/utils';
-import { ATTR_NETWORK_PEER_PORT } from '@opentelemetry/semantic-conventions';
+import { ATTR_SERVER_PORT } from '@opentelemetry/semantic-conventions';
 
 const memoryExporter = new InMemorySpanExporter();
 
@@ -206,7 +206,7 @@ describe('utils.ts', () => {
             port: Infinity,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         undefined
       );
       assert.strictEqual(
@@ -215,7 +215,7 @@ describe('utils.ts', () => {
             port: -Infinity,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         undefined
       );
       assert.strictEqual(
@@ -224,7 +224,7 @@ describe('utils.ts', () => {
             port: NaN,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         undefined
       );
       assert.strictEqual(
@@ -233,7 +233,7 @@ describe('utils.ts', () => {
             port: 1.234,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         undefined
       );
     });
@@ -245,7 +245,7 @@ describe('utils.ts', () => {
             port: 1234,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         1234
       );
       assert.strictEqual(
@@ -254,7 +254,7 @@ describe('utils.ts', () => {
             port: Number.MAX_VALUE,
           },
           SemconvStability.STABLE
-        )[ATTR_NETWORK_PEER_PORT],
+        )[ATTR_SERVER_PORT],
         Number.MAX_VALUE
       );
     });