Merge branch 'main' into typeorm-instrumentation

Author: seemk

.github/component_owners.yml

@@ -30,6 +30,8 @@ components:
     - pichlermarc
     - legendecas
     - blumamir
+  packages/baggage-log-record-processor:
+    - maryliag
   packages/baggage-span-processor:
     - mikegoldsmith
     - jamiedanielson

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,47 @@
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "31 18 * * 4" # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        with:
+          sarif_file: results.sarif

.release-please-manifest.json

@@ -7,9 +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.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",
@@ -21,7 +22,7 @@
   "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",
@@ -30,7 +31,7 @@
   "plugins/node/instrumentation-typeorm": "0.0.1",
   "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 +48,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",

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/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,7 +76,7 @@
     "@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",

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';
@@ -135,17 +135,6 @@ const InstrumentationMap = {
   '@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 +292,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);
-    });
-  });
 });