Merge branch 'main' of https://github.com/amychisholm03/node-newrelic into NR-362185/response-streaming

Author: amychisholm03

THIRD_PARTY_NOTICES.md

@@ -7,6 +7,13 @@
 const { boolean } = require('./formatters')
 const instrumentedLibraries = require('../instrumentations')()
 const pkgNames = Object.keys(instrumentedLibraries)
+const coreLibraries = require('../core-instrumentation')
+const corePkgs = Object.keys(coreLibraries)
+// Manually adding undici as it is registered separately in shimmer
+corePkgs.push('undici')
+// Manually adding domain as it is registered separately in shimmer
+corePkgs.push('domain')
+pkgNames.push(...corePkgs)
 
 /**
  * Builds the stanza for config.instrumentation.*

lib/config/build-instrumentation-config.js

@@ -1553,9 +1553,9 @@ defaultConfig.definition = () => ({
     }
   },
   /**
-   * Stanza that contains all keys to disable 3rd party package instrumentation(i.e. mongodb, pg, redis, etc)
-   * Note: Disabling a given 3rd party library may affect the instrumentation of 3rd party libraries used after
-   * the disabled library.
+   * Stanza that contains all keys to disable core & 3rd party package instrumentation(i.e. dns, http, mongodb, pg, redis, etc)
+   * **Note**: Disabling a given library may affect the instrumentation of libraries used after
+   * the disabled library. Use at your own risk.
    */
   instrumentation: pkgInstrumentation
 })

lib/config/default.js

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const InstrumentationDescriptor = require('./instrumentation-descriptor')
+
+module.exports = {
+  child_process: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'child_process.js'
+  },
+  crypto: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'crypto.js'
+  },
+  dns: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'dns.js'
+  },
+  fs: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'fs.js'
+  },
+  http: {
+    type: InstrumentationDescriptor.TYPE_TRANSACTION,
+    file: 'http.js'
+  },
+  https: {
+    type: InstrumentationDescriptor.TYPE_TRANSACTION,
+    file: 'http.js'
+  },
+  inspector: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'inspector.js'
+  },
+  net: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'net.js'
+  },
+  timers: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'timers.js'
+  },
+  zlib: {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    file: 'zlib.js'
+  }
+}

lib/core-instrumentation.js

@@ -0,0 +1,260 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+// Attribute values are found at:
+// https://opentelemetry.io/docs/specs/semconv/attributes-registry/
+// Attribute constant names are found at:
+// https://github.com/open-telemetry/opentelemetry-js/tree/e744798957ac6d980673262a61634f066d9f66a3/semantic-conventions/src
+
+/**
+ * Provides a hash of constant attribute names to attribute values as defined
+ * by the OTEL semantic conventions. The values and names are still very much
+ * in flux (2025-02). As a result, it is easier for us to copy the ones we need
+ * here.
+ *
+ * 1. Everything should be listed in alphabetical order.
+ * 2. If an attribute can have multiple names, but all have a common value,
+ * only list one constant for us to standardize on internally. Make notes of
+ * the other possible upstream names within the jsdoc for the attribute. If they
+ * have different values, include multiple attributes with documentation
+ * referencing which should be favored.
+ *
+ * @see https://opentelemetry.io/docs/specs/semconv/
+ *
+ * @type {object}
+ */
+module.exports = {
+  /**
+   * Name of the database (schema) being accessed.
+   */
+  ATTR_DB_NAME: 'db.name',
+
+  /**
+   * The name of the database operation being performed.
+   *
+   * @example select
+   * @example findAndModify
+   */
+  ATTR_DB_OPERATION: 'db.operation',
+
+  /**
+   * The table name that is targeted in the operation.
+   */
+  ATTR_DB_SQL_TABLE: 'db.sql.table',
+
+  /**
+   * The database statement being executed.
+   *
+   * @example select * from foo
+   */
+  ATTR_DB_STATEMENT: 'db.statement',
+
+  /**
+   * Name of the remote database technology being accessed.
+   *
+   * @example mysql
+   * @see https://opentelemetry.io/docs/specs/semconv/database/sql/
+   */
+  ATTR_DB_SYSTEM: 'db.system',
+
+  /**
+   * The full resource URL.
+   *
+   * @example https://example.com/foo?bar=baz
+   */
+  ATTR_FULL_URL: 'url.full',
+
+  /**
+   * Value of the HTTP `host` header.
+   *
+   * {@link ATTR_HTTP_REQUEST_METHOD} is newer and should be used instead.
+   */
+  ATTR_HTTP_HOST: 'http.host',
+
+  /**
+   * The HTTP request method, e.g. `GET` or `POST`.
+   */
+  ATTR_HTTP_METHOD: 'http.method',
+
+  /**
+   * HTTP method used for the request, e.g. `GET` or `POST`.
+   */
+  ATTR_HTTP_REQUEST_METHOD: 'http.request.method',
+
+  /**
+   * Framework representation for a route, may include parameter tokens.
+   *
+   * @example /orders/:order_id
+   */
+  ATTR_HTTP_ROUTE: 'http.route',
+
+  /**
+   * The full resource URL.
+   *
+   * {@link ATTR_FULL_URL} is newer and should be used instead.
+   *
+   * @example https://example.com/foo?bar=baz
+   */
+  ATTR_HTTP_URL: 'http.url',
+
+  /**
+   * The message destination name.
+   *
+   * {@link ATTR_MESSAGING_DESTINATION_NAME} is newer and should be used.
+   */
+  ATTR_MESSAGING_DESTINATION: 'messaging.destination',
+
+  /**
+   * The kind of message destination (don't really know, this is what the
+   * otel code calls it).
+   */
+  ATTR_MESSAGING_DESTINATION_KIND: 'messaging.destination_kind',
+
+  /**
+   * The target queue name for the message to be delivered to.
+   *
+   * @example MyQueue
+   * @example MyTopic
+   */
+  ATTR_MESSAGING_DESTINATION_NAME: 'messaging.destination.name',
+
+  /**
+   * Target messaging system name.
+   *
+   * @example kafka
+   * @see https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/
+   */
+  ATTR_MESSAGING_SYSTEM: 'messaging.system',
+
+  /**
+   * The collection being accessed.
+   */
+  ATTR_MONGODB_COLLECTION: 'db.mongodb.collection',
+
+  /**
+   * Remote host name.
+   */
+  ATTR_NET_PEER_NAME: 'net.peer.name',
+
+  /**
+   * Remote port number.
+   */
+  ATTR_NET_PEER_PORT: 'net.peer.port',
+
+  /**
+   * The name of the remote method being invoked.
+   */
+  ATTR_RPC_METHOD: 'rpc.method',
+
+  /**
+   * The logical name of the service being called.
+   *
+   * @example myservice.EchoService
+   */
+  ATTR_RPC_SERVICE: 'rpc.service',
+
+  /**
+   * Defines the RPC technology being instrumented. Will be a string name
+   * for a known RPC system.
+   *
+   * @example grpc
+   * @see https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/
+   */
+  ATTR_RPC_SYSTEM: 'rpc.system',
+
+  /**
+   * Server domain name, IP address, or Unix domain socket.
+   *
+   * @example example.com
+   * @example 10.1.2.80
+   * @example /tmp/my.sock
+   */
+  ATTR_SERVER_ADDRESS: 'server.address',
+
+  /**
+   * Logical name of the local service being instrumented.
+   */
+  ATTR_SERVICE_NAME: 'service.name',
+
+  /**
+   * URL path component, e.g. `/foo` in `http://example.com/foo`. This is
+   * the fully realized path. See {@link ATTR_HTTP_ROUTE} for the framework
+   * representation.
+   */
+  ATTR_URL_PATH: 'url.path',
+
+  /**
+   * The scheme value for the URL.
+   *
+   * @example https
+   */
+  ATTR_URL_SCHEME: 'url.scheme',
+
+  /* !!! Miscellaneous !!! */
+  /**
+   * Database system names.
+   *
+   * @example mysql
+   */
+  DB_SYSTEM_VALUES: {
+    ADABAS: 'adabas',
+    CACHE: 'cache',
+    CASSANDRA: 'cassandra',
+    CLOUDSCAPE: 'cloudscape',
+    COCKROACHDB: 'cockroachdb',
+    COLDFUSION: 'coldfusion',
+    COSMOSDB: 'cosmosdb',
+    COUCHBASE: 'couchbase',
+    COUCHDB: 'couchdb',
+    DB2: 'DB2',
+    DERBY: 'derby',
+    DYNAMODB: 'dynamodb',
+    EDB: 'edb',
+    ELASTICSEARCH: 'elasticsearch',
+    FILEMAKER: 'filemaker',
+    FIREBIRD: 'firebird',
+    FIRSTSQL: 'firstsql',
+    GEODE: 'geode',
+    H2: 'h2',
+    HANADB: 'handadb',
+    HBASE: 'hbase',
+    HIVE: 'hive',
+    HSQLDB: 'hsqldb',
+    INFORMIX: 'informix',
+    INGRESS: 'ingres',
+    INSTANTDB: 'instantdb',
+    INTERBASE: 'interbase',
+    MARIADB: 'mariadb',
+    MAXDB: 'maxdb',
+    MEMCACHED: 'memcached',
+    MONGODB: 'mongodb',
+    MSSQL: 'mssql',
+    MYSQL: 'mysql',
+    NEO4J: 'neo4j',
+    NETEZZA: 'netezza',
+    ORACLE: 'oracle',
+    OTHER_SQL: 'other_sql',
+    PERVASIVE: 'pervasive',
+    POINTBASE: 'pointbase',
+    POSTGRESQL: 'postgresql',
+    PROGRESS: 'progress',
+    REDIS: 'redis',
+    REDSHIFT: 'redshift',
+    SQLITE: 'sqlite',
+    SYBASE: 'sybase',
+    TERADATA: 'teradata',
+    VERTICA: 'vertica',
+  },
+
+  /**
+   * Kinds of messaging system destinations.
+   */
+  MESSAGING_SYSTEM_KIND_VALUES: {
+    QUEUE: 'queue',
+    TOPIC: 'topic'
+  }
+}

lib/otel/constants.js

@@ -16,18 +16,18 @@ const Transaction = require('../../transaction/')
 const { DESTINATIONS, TYPES } = Transaction
 
 const {
-  SEMATTRS_MESSAGING_SYSTEM,
-  SEMATTRS_MESSAGING_DESTINATION,
-  SEMATTRS_MESSAGING_DESTINATION_KIND
-} = require('@opentelemetry/semantic-conventions')
+  ATTR_MESSAGING_DESTINATION,
+  ATTR_MESSAGING_DESTINATION_KIND,
+  ATTR_MESSAGING_SYSTEM
+} = require('../constants')
 
 function createConsumerSegment(agent, otelSpan) {
   const transaction = new Transaction(agent)
   transaction.type = TYPES.BG
 
-  const system = otelSpan.attributes[SEMATTRS_MESSAGING_SYSTEM] ?? 'unknown'
-  const destination = otelSpan.attributes[SEMATTRS_MESSAGING_DESTINATION] ?? 'unknown'
-  const destKind = otelSpan.attributes[SEMATTRS_MESSAGING_DESTINATION_KIND] ?? 'unknown'
+  const system = otelSpan.attributes[ATTR_MESSAGING_SYSTEM] ?? 'unknown'
+  const destination = otelSpan.attributes[ATTR_MESSAGING_DESTINATION] ?? 'unknown'
+  const destKind = otelSpan.attributes[ATTR_MESSAGING_DESTINATION_KIND] ?? 'unknown'
   const segmentName = `OtherTransaction/Message/${system}/${destKind}/Named/${destination}`
 
   const txAttrs = transaction.trace.attributes