Merge branch 'main' into sqs-batch-receive

Author: seemk

.release-please-manifest.json

@@ -2,12 +2,12 @@
   "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
   "detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
   "detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
-  "detectors/node/opentelemetry-resource-detector-container": "0.4.3",
+  "detectors/node/opentelemetry-resource-detector-container": "0.4.4",
   "detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
   "detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.50.2",
+  "metapackages/auto-instrumentations-node": "0.51.0",
   "metapackages/auto-instrumentations-web": "0.41.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.4",
@@ -48,7 +48,7 @@
   "plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
   "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
   "plugins/node/opentelemetry-instrumentation-net": "0.39.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.45.1",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
   "plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
   "plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",

detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.4.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.3...resource-detector-container-v0.4.4) (2024-10-16)
+
+
+### Bug Fixes
+
+* **detector-container:** properly detect container ID when using Podman ([#2448](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2448)) ([ad560df](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ad560dfc5f662d418a74b0b197b3f48e4ae002d0))
+
 ## [0.4.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.2...resource-detector-container-v0.4.3) (2024-10-10)
 
 

detectors/node/opentelemetry-resource-detector-container/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-container",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Opentelemetry resource detector to get container resource attributes",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

metapackages/auto-instrumentations-node/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.51.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.50.2...auto-instrumentations-node-v0.51.0) (2024-10-16)
+
+
+### ⚠ BREAKING CHANGES
+
+* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fs by default ([#2467](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2467))
+
+### Features
+
+* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fs by default ([#2467](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2467)) ([a558044](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a55804415d39c751a3f5f58c00cf27747821302f))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-pg bumped from ^0.45.1 to ^0.46.0
+    * @opentelemetry/resource-detector-container bumped from ^0.4.3 to ^0.4.4
+
 ## [0.50.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.50.1...auto-instrumentations-node-v0.50.2) (2024-10-10)
 
 

metapackages/auto-instrumentations-node/README.md

@@ -77,8 +77,8 @@ For example, to enable only the `env`, `host` detectors:
 export OTEL_NODE_RESOURCE_DETECTORS="env,host"
 ```
 
-By default, all [Supported Instrumentations](#supported-instrumentations) are enabled.
-You can use the environment variable `OTEL_NODE_ENABLED_INSTRUMENTATIONS` to enable only certain instrumentations,
+By default, all [Supported Instrumentations](#supported-instrumentations) are enabled, unless they are annotated with "default disabled".
+You can use the environment variable `OTEL_NODE_ENABLED_INSTRUMENTATIONS` to enable only certain instrumentations, including "default disabled" ones
 OR the environment variable `OTEL_NODE_DISABLED_INSTRUMENTATIONS` to disable only certain instrumentations,
 by providing a comma-separated list of the instrumentation package names without the `@opentelemetry/instrumentation-` prefix.
 
@@ -91,10 +91,10 @@ instrumentations:
 export OTEL_NODE_ENABLED_INSTRUMENTATIONS="http,nestjs-core"
 ```
 
-To disable only [@opentelemetry/instrumentation-fs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs):
+To disable only [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-net):
 
 ```shell
-export OTEL_NODE_DISABLED_INSTRUMENTATIONS="fs"
+export OTEL_NODE_DISABLED_INSTRUMENTATIONS="net"
 ```
 
 If both environment variables are set, `OTEL_NODE_ENABLED_INSTRUMENTATIONS` is applied first, and then `OTEL_NODE_DISABLED_INSTRUMENTATIONS` is applied to that list.
@@ -170,6 +170,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns)
 - [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express)
 - [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify)
+- [@opentelemetry/instrumentation-fs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs) (default disabled)
 - [@opentelemetry/instrumentation-generic-pool](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool)
 - [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql)
 - [@opentelemetry/instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc)

metapackages/auto-instrumentations-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.50.2",
+  "version": "0.51.0",
   "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",
@@ -79,7 +79,7 @@
     "@opentelemetry/instrumentation-mysql2": "^0.41.0",
     "@opentelemetry/instrumentation-nestjs-core": "^0.40.0",
     "@opentelemetry/instrumentation-net": "^0.39.0",
-    "@opentelemetry/instrumentation-pg": "^0.45.1",
+    "@opentelemetry/instrumentation-pg": "^0.46.0",
     "@opentelemetry/instrumentation-pino": "^0.42.0",
     "@opentelemetry/instrumentation-redis": "^0.42.0",
     "@opentelemetry/instrumentation-redis-4": "^0.42.1",
@@ -92,7 +92,7 @@
     "@opentelemetry/resource-detector-alibaba-cloud": "^0.29.3",
     "@opentelemetry/resource-detector-aws": "^1.6.2",
     "@opentelemetry/resource-detector-azure": "^0.2.11",
-    "@opentelemetry/resource-detector-container": "^0.4.3",
+    "@opentelemetry/resource-detector-container": "^0.4.4",
     "@opentelemetry/resource-detector-gcp": "^0.29.12",
     "@opentelemetry/resources": "^1.24.0",
     "@opentelemetry/sdk-node": "^0.53.0"

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

@@ -136,6 +136,8 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-winston': WinstonInstrumentation,
 };
 
+const defaultExcludedInstrumentations = ['@opentelemetry/instrumentation-fs'];
+
 // Config types inferred automatically from the first argument of the constructor
 type ConfigArg<T> = T extends new (...args: infer U) => unknown ? U[0] : never;
 export type InstrumentationConfigMap = {
@@ -208,10 +210,14 @@ function getInstrumentationsFromEnv(envVar: string): string[] {
 
 /**
  * Returns the list of instrumentations that are enabled based on the environment variable.
+ * If the environment variable is unset, returns all instrumentation that are enabled by default.
  */
 function getEnabledInstrumentationsFromEnv() {
   if (!process.env.OTEL_NODE_ENABLED_INSTRUMENTATIONS) {
-    return Object.keys(InstrumentationMap);
+    // all keys in the InstrumentationMap except for everything that is not enabled by default.
+    return Object.keys(InstrumentationMap).filter(
+      key => !defaultExcludedInstrumentations.includes(key)
+    );
   }
 
   const instrumentationsFromEnv = getInstrumentationsFromEnv(

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

@@ -23,12 +23,15 @@ import { getResourceDetectorsFromEnv } from '../src/utils';
 
 describe('utils', () => {
   describe('getNodeAutoInstrumentations', () => {
-    it('should include all installed instrumentations', () => {
+    it('should include all default instrumentations', () => {
       const instrumentations = getNodeAutoInstrumentations();
       const installedInstrumentations = Object.keys(
         require('../package.json').dependencies
       ).filter(depName => {
-        return depName.startsWith('@opentelemetry/instrumentation-');
+        return (
+          depName.startsWith('@opentelemetry/instrumentation-') &&
+          depName !== '@opentelemetry/instrumentation-fs'
+        );
       });
 
       assert.deepStrictEqual(
@@ -89,6 +92,20 @@ describe('utils', () => {
       }
     });
 
+    it('should allow enabling non-default instrumentations via OTEL_NODE_ENABLED_INSTRUMENTATIONS environment variable', () => {
+      process.env.OTEL_NODE_ENABLED_INSTRUMENTATIONS = 'fs'; // separator with and without whitespaces should be allowed
+      try {
+        const instrumentations = getNodeAutoInstrumentations();
+
+        assert.deepStrictEqual(
+          new Set(instrumentations.map(i => i.instrumentationName)),
+          new Set(['@opentelemetry/instrumentation-fs'])
+        );
+      } finally {
+        delete process.env.OTEL_NODE_ENABLED_INSTRUMENTATIONS;
+      }
+    });
+
     it('should include all instrumentations except those disabled via OTEL_NODE_DISABLED_INSTRUMENTATIONS environment variable', () => {
       process.env.OTEL_NODE_DISABLED_INSTRUMENTATIONS =
         'fs,aws-sdk, aws-lambda'; // separator with and without whitespaces should be allowed