Merge remote-tracking branch 'upstream/main' into zhaez/gen-ai-support

Author: ezhang6811

.github/component-label-map.yml

@@ -131,6 +131,11 @@ pkg:instrumentation-ioredis:
           - plugins/node/opentelemetry-instrumentation-ioredis/**
           - packages/opentelemetry-test-utils/**
           - packages/opentelemetry-redis-common/**
+pkg:instrumentation-kafkajs:
+  - changed-files:
+      - any-glob-to-any-file:
+          - plugins/node/instrumentation-kafkajs/**
+          - packages/opentelemetry-test-utils/**
 pkg:instrumentation-knex:
   - changed-files:
       - any-glob-to-any-file:

.github/component_owners.yml

@@ -18,6 +18,7 @@ components:
     - kirrg001
   incubator/opentelemetry-sampler-aws-xray:
     - jj22ee
+    - yiyuan-he
   metapackages/auto-configuration-propagators:
     - pichlermarc
   metapackages/auto-instrumentations-node:

.release-please-manifest.json

@@ -7,10 +7,10 @@
   "detectors/node/opentelemetry-resource-detector-github": "0.31.0",
   "detectors/node/opentelemetry-resource-detector-instana": "0.19.0",
   "metapackages/auto-configuration-propagators": "0.4.0",
-  "metapackages/auto-instrumentations-node": "0.57.0",
+  "metapackages/auto-instrumentations-node": "0.57.1",
   "metapackages/auto-instrumentations-web": "0.46.0",
   "packages/baggage-span-processor": "0.4.0",
-  "packages/baggage-log-record-processor": "0.0.1",
+  "packages/baggage-log-record-processor": "0.1.0",
   "packages/opentelemetry-host-metrics": "0.36.0",
   "packages/opentelemetry-id-generator-aws-xray": "2.0.0",
   "packages/opentelemetry-propagation-utils": "0.31.0",
@@ -22,15 +22,15 @@
   "plugins/node/instrumentation-cucumber": "0.15.0",
   "plugins/node/instrumentation-dataloader": "0.17.0",
   "plugins/node/instrumentation-fs": "0.20.0",
-  "plugins/node/instrumentation-kafkajs": "0.8.0",
+  "plugins/node/instrumentation-kafkajs": "0.9.0",
   "plugins/node/instrumentation-lru-memoizer": "0.45.0",
   "plugins/node/instrumentation-mongoose": "0.47.0",
   "plugins/node/instrumentation-runtime-node": "0.13.0",
   "plugins/node/instrumentation-socket.io": "0.47.0",
   "plugins/node/instrumentation-tedious": "0.19.0",
   "plugins/node/instrumentation-undici": "0.11.0",
   "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.51.0",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.51.0",
   "plugins/node/opentelemetry-instrumentation-bunyan": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
@@ -47,7 +47,7 @@
   "plugins/node/opentelemetry-instrumentation-mongodb": "0.53.0",
   "plugins/node/opentelemetry-instrumentation-mysql": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-net": "0.44.0",
   "plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
   "plugins/node/opentelemetry-instrumentation-pino": "0.47.0",

incubator/opentelemetry-sampler-aws-xray/README.md

@@ -2,7 +2,7 @@
 
 > This component is still in development and has not been released as an npm package.
 
-[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @jj22ee
+[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @jj22ee, @yiyuan-he
 
 This module provides the remote/centralized sampler for AWS X-Ray.
 

metapackages/auto-instrumentations-node/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.57.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.57.0...auto-instrumentations-node-v0.57.1) (2025-04-08)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-aws-sdk bumped from ^0.50.0 to ^0.51.0
+    * @opentelemetry/instrumentation-kafkajs bumped from ^0.8.0 to ^0.9.0
+    * @opentelemetry/instrumentation-nestjs-core bumped from ^0.45.0 to ^0.46.0
+
 ## [0.57.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.56.1...auto-instrumentations-node-v0.57.0) (2025-03-18)
 
 

metapackages/auto-instrumentations-node/README.md

@@ -197,6 +197,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
 - [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
 - [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify)
+- [@opentelemetry/instrumentation-runtime-node](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node)
 - [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io)
 - [@opentelemetry/instrumentation-undici](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici)
 - [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston)

metapackages/auto-instrumentations-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.57.0",
+  "version": "0.57.1",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -33,10 +33,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.4.1"
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/core": "^2.0.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/core": "^2.0.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",
     "@types/sinon": "17.0.4",
@@ -49,7 +51,7 @@
     "@opentelemetry/instrumentation": "^0.200.0",
     "@opentelemetry/instrumentation-amqplib": "^0.47.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.51.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.50.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.51.0",
     "@opentelemetry/instrumentation-bunyan": "^0.46.0",
     "@opentelemetry/instrumentation-cassandra-driver": "^0.46.0",
     "@opentelemetry/instrumentation-connect": "^0.44.0",
@@ -65,7 +67,7 @@
     "@opentelemetry/instrumentation-hapi": "^0.46.0",
     "@opentelemetry/instrumentation-http": "^0.200.0",
     "@opentelemetry/instrumentation-ioredis": "^0.48.0",
-    "@opentelemetry/instrumentation-kafkajs": "^0.8.0",
+    "@opentelemetry/instrumentation-kafkajs": "^0.9.0",
     "@opentelemetry/instrumentation-knex": "^0.45.0",
     "@opentelemetry/instrumentation-koa": "^0.48.0",
     "@opentelemetry/instrumentation-lru-memoizer": "^0.45.0",
@@ -74,14 +76,15 @@
     "@opentelemetry/instrumentation-mongoose": "^0.47.0",
     "@opentelemetry/instrumentation-mysql": "^0.46.0",
     "@opentelemetry/instrumentation-mysql2": "^0.46.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.45.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.46.0",
     "@opentelemetry/instrumentation-net": "^0.44.0",
     "@opentelemetry/instrumentation-pg": "^0.52.0",
     "@opentelemetry/instrumentation-pino": "^0.47.0",
     "@opentelemetry/instrumentation-redis": "^0.47.0",
     "@opentelemetry/instrumentation-redis-4": "^0.47.0",
     "@opentelemetry/instrumentation-restify": "^0.46.0",
     "@opentelemetry/instrumentation-router": "^0.45.0",
+    "@opentelemetry/instrumentation-runtime-node": "^0.13.0",
     "@opentelemetry/instrumentation-socket.io": "^0.47.0",
     "@opentelemetry/instrumentation-tedious": "^0.19.0",
     "@opentelemetry/instrumentation-undici": "^0.11.0",

metapackages/auto-instrumentations-node/src/register.ts

@@ -15,13 +15,18 @@
  */
 import * as opentelemetry from '@opentelemetry/sdk-node';
 import { diag, DiagConsoleLogger } from '@opentelemetry/api';
+import { getStringFromEnv, diagLogLevelFromString } from '@opentelemetry/core';
 import {
-  getLogLevelFromEnv,
   getNodeAutoInstrumentations,
   getResourceDetectorsFromEnv,
 } from './utils';
 
-diag.setLogger(new DiagConsoleLogger(), getLogLevelFromEnv());
+const logLevel = getStringFromEnv('OTEL_LOG_LEVEL');
+if (logLevel != null) {
+  diag.setLogger(new DiagConsoleLogger(), {
+    logLevel: diagLogLevelFromString(logLevel),
+  });
+}
 
 const sdk = new opentelemetry.NodeSDK({
   instrumentations: getNodeAutoInstrumentations(),

metapackages/auto-instrumentations-node/src/utils.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { diag, DiagLogLevel } from '@opentelemetry/api';
+import { diag } from '@opentelemetry/api';
 import { Instrumentation } from '@opentelemetry/instrumentation';
 
 import { AmqplibInstrumentation } from '@opentelemetry/instrumentation-amqplib';
@@ -52,6 +52,7 @@ import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/i
 import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
 import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
 import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
+import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runtime-node';
 import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
 import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious';
 import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
@@ -129,23 +130,13 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
   '@opentelemetry/instrumentation-restify': RestifyInstrumentation,
   '@opentelemetry/instrumentation-router': RouterInstrumentation,
+  '@opentelemetry/instrumentation-runtime-node': RuntimeNodeInstrumentation,
   '@opentelemetry/instrumentation-socket.io': SocketIoInstrumentation,
   '@opentelemetry/instrumentation-tedious': TediousInstrumentation,
   '@opentelemetry/instrumentation-undici': UndiciInstrumentation,
   '@opentelemetry/instrumentation-winston': WinstonInstrumentation,
 };
 
-// The support string -> DiagLogLevel mappings
-const logLevelMap: { [key: string]: DiagLogLevel } = {
-  ALL: DiagLogLevel.ALL,
-  VERBOSE: DiagLogLevel.VERBOSE,
-  DEBUG: DiagLogLevel.DEBUG,
-  INFO: DiagLogLevel.INFO,
-  WARN: DiagLogLevel.WARN,
-  ERROR: DiagLogLevel.ERROR,
-  NONE: DiagLogLevel.NONE,
-};
-
 const defaultExcludedInstrumentations = [
   '@opentelemetry/instrumentation-fs',
   '@opentelemetry/instrumentation-fastify',
@@ -303,16 +294,3 @@ export function getResourceDetectorsFromEnv(): Array<ResourceDetector> {
     return resourceDetector || [];
   });
 }
-
-export function getLogLevelFromEnv(): DiagLogLevel {
-  const rawLogLevel = process.env.OTEL_LOG_LEVEL;
-
-  // NOTE: as per specification we should actually only register if something is set, but our previous implementation
-  // always registered a logger, even when nothing was set. Falling back to 'INFO' here to keep the same behavior as
-  // with previous implementations.
-  // Also: no point in warning - no logger is registered yet
-  return (
-    logLevelMap[rawLogLevel?.trim().toUpperCase() ?? 'INFO'] ??
-    DiagLogLevel.INFO
-  );
-}

metapackages/auto-instrumentations-node/test/utils.test.ts

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { diag, DiagLogLevel } from '@opentelemetry/api';
+import { diag } from '@opentelemetry/api';
 import { HttpInstrumentationConfig } from '@opentelemetry/instrumentation-http';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { getNodeAutoInstrumentations } from '../src';
-import { getLogLevelFromEnv, getResourceDetectorsFromEnv } from '../src/utils';
+import { getResourceDetectorsFromEnv } from '../src/utils';
 
 describe('utils', () => {
   describe('getNodeAutoInstrumentations', () => {
@@ -223,44 +223,4 @@ describe('utils', () => {
       delete process.env.OTEL_NODE_RESOURCE_DETECTORS;
     });
   });
-
-  describe('getLogLevelFromEnv', function () {
-    afterEach(function () {
-      delete process.env.OTEL_LOG_LEVEL;
-    });
-
-    it('should select log level based on env var', function () {
-      process.env.OTEL_LOG_LEVEL = 'NONE';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.NONE);
-      process.env.OTEL_LOG_LEVEL = 'VERBOSE';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.VERBOSE);
-      process.env.OTEL_LOG_LEVEL = 'DEBUG';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.DEBUG);
-      process.env.OTEL_LOG_LEVEL = 'INFO';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.INFO);
-      process.env.OTEL_LOG_LEVEL = 'WARN';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.WARN);
-      process.env.OTEL_LOG_LEVEL = 'ERROR';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.ERROR);
-      process.env.OTEL_LOG_LEVEL = 'ALL';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.ALL);
-    });
-
-    it('should ignore casing', function () {
-      process.env.OTEL_LOG_LEVEL = 'warn';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.WARN);
-      process.env.OTEL_LOG_LEVEL = 'WaRN';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.WARN);
-    });
-
-    it('should fall back to INFO on bogus input', function () {
-      process.env.OTEL_LOG_LEVEL = 'bogus';
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.INFO);
-    });
-
-    it('should use INFO when unset', function () {
-      delete process.env.OTEL_LOG_LEVEL;
-      assert.strictEqual(getLogLevelFromEnv(), DiagLogLevel.INFO);
-    });
-  });
 });