Merge branch 'main' into tm-dep-check-with-knip

Author: trentm

.github/component-label-map.yml

@@ -274,6 +274,14 @@ pkg:sql-common:
   - changed-files:
       - any-glob-to-any-file:
           - packages/opentelemetry-sql-common/**
+pkg:propagator-aws-xray:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray/**
+pkg:propagator-aws-xray-lambda:
+  - changed-files:
+      - any-glob-to-any-file:
+          - propagators/propagator-aws-xray-lambda/**
 pkg-status:unmaintained:
   - changed-files:
       - any-glob-to-any-file:
@@ -296,3 +304,5 @@ pkg-status:unmaintained:
           - plugins/node/opentelemetry-instrumentation-restify/**
           - plugins/node/opentelemetry-instrumentation-router/**
           - propagators/opentelemetry-propagator-ot-trace/**
+          - propagators/propagator-aws-xray/**
+          - propagators/propagator-aws-xray-lambda/**

.github/component_owners.yml

@@ -145,6 +145,10 @@ components:
     - kirrg001
   propagators/opentelemetry-propagator-ot-trace: []
     # Unmaintained
+  propagators/propagator-aws-xray: [ ]
+  # Unmaintained
+  propagators/propagator-aws-xray-lambda: [ ]
+  # Unmaintained
 
 ignored-authors:
   - renovate-bot

.github/workflows/lint.yml

@@ -19,5 +19,3 @@ jobs:
       - name: Lint
         run: |
           npm run lint
-          npm run lint:markdown
-          npm run lint:readme

.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",
@@ -60,5 +60,7 @@
   "plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.31.0",
   "propagators/opentelemetry-propagator-instana": "0.3.2",
-  "propagators/opentelemetry-propagator-ot-trace": "0.27.2"
+  "propagators/opentelemetry-propagator-ot-trace": "0.27.2",
+  "propagators/propagator-aws-xray": "1.26.0",
+  "propagators/propagator-aws-xray-lambda": "0.53.0"
 }

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",

detectors/node/opentelemetry-resource-detector-container/src/detectors/ContainerDetector.ts

@@ -35,7 +35,7 @@ export class ContainerDetector implements DetectorSync {
   readonly DEFAULT_CGROUP_V2_PATH = '/proc/self/mountinfo';
   readonly UTF8_UNICODE = 'utf8';
   readonly HOSTNAME = 'hostname';
-  readonly MARKING_PREFIX = 'containers';
+  readonly MARKING_PREFIX = ['containers', 'overlay-containers'];
   readonly CRIO = 'crio-';
   readonly CRI_CONTAINERD = 'cri-containerd-';
   readonly DOCKER = 'docker-';
@@ -105,7 +105,7 @@ export class ContainerDetector implements DetectorSync {
     const strArray = str?.split('/') ?? [];
     for (let i = 0; i < strArray.length - 1; i++) {
       if (
-        strArray[i] === this.MARKING_PREFIX &&
+        this.MARKING_PREFIX.includes(strArray[i]) &&
         strArray[i + 1]?.length === this.CONTAINER_ID_LENGTH
       ) {
         return strArray[i + 1];

detectors/node/opentelemetry-resource-detector-container/src/detectors/utils.ts

@@ -18,7 +18,7 @@ export const DEFAULT_CGROUP_V1_PATH = '/proc/self/cgroup';
 export const DEFAULT_CGROUP_V2_PATH = '/proc/self/mountinfo';
 export const UTF8_UNICODE = 'utf8';
 export const HOSTNAME = 'hostname';
-export const MARKING_PREFIX = 'containers';
+export const MARKING_PREFIX = ['containers', 'overlay-containers'];
 export const CRIO = 'crio-';
 export const CRI_CONTAINERD = 'cri-containerd-';
 export const DOCKER = 'docker-';

detectors/node/opentelemetry-resource-detector-container/test/ContainerDetector.test.ts

@@ -32,6 +32,8 @@ describe('ContainerDetector', () => {
   const correctCgroupV2Data = `containers/tmhdefghijklmnopqrstuvwxyzafgrefghiugkmnopqrstuvwxyzabcdefghijkl/hostname
     fhkjdshgfhsdfjhdsfkjhfkdshkjhfd/host
     sahfhfjkhjhfhjdhfjkdhfkjdhfjkhhdsjfhdfhjdhfkj/somethingelse`;
+  const correctCgroupV2PodmanData =
+    '4245 4237 0:94 /containers/overlay-containers/4e9dc37d00ebd2daea029d84bb37764ce12d746a6f3a33c5969cee15c4fc4418/userdata/hostname /etc/hostname rw - tmpfs tmpfs rw';
 
   const wrongCgroupV2Data =
     'bcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm/wrongkeyword';
@@ -85,6 +87,22 @@ describe('ContainerDetector', () => {
       });
     });
 
+    it('should return a resource with container ID with a valid container ID present for v2 (Podman)', async () => {
+      readStub = sinon.stub(ContainerDetector, 'readFileAsync' as any);
+
+      readStub.onFirstCall().resolves('');
+      readStub.onSecondCall().resolves(correctCgroupV2PodmanData);
+
+      const resource = containerDetector.detect();
+      await resource.waitForAsyncAttributes?.();
+      sinon.assert.calledTwice(readStub);
+
+      assert.ok(resource);
+      assertContainerResource(resource, {
+        id: '4e9dc37d00ebd2daea029d84bb37764ce12d746a6f3a33c5969cee15c4fc4418',
+      });
+    });
+
     it('should return a empty resource with failed hostname check for v2', async () => {
       readStub = sinon.stub(ContainerDetector, 'readFileAsync' as any);
 

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)