Skip to content

Commit a544ed3

Browse files
david-lunadavid-luna
committed
Merge branch 'main' into remove-lerna
2 parents 947a253 + b520d04 commit a544ed3

File tree

157 files changed

+4765
-5005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+4765
-5005
lines changed

‎.github/component-label-map.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ pkg-status:unmaintained:
297297
- plugins/node/opentelemetry-instrumentation-knex/**
298298
- plugins/node/opentelemetry-instrumentation-koa/**
299299
- plugins/node/opentelemetry-instrumentation-memcached/**
300-
- plugins/node/opentelemetry-instrumentation-mongodb/**
301300
- plugins/node/opentelemetry-instrumentation-mysql/**
302-
- plugins/node/opentelemetry-instrumentation-mysql2/**
303301
- plugins/node/opentelemetry-instrumentation-nestjs-core/**
304302
- plugins/node/opentelemetry-instrumentation-restify/**
305303
- plugins/node/opentelemetry-instrumentation-router/**

‎.github/component_owners.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ components:
8787
plugins/node/opentelemetry-instrumentation-express:
8888
- JamieDanielson
8989
- pkanal
90+
- raphael-theriault-swi
9091
plugins/node/opentelemetry-instrumentation-fastify: []
9192
# Unmaintained
9293
plugins/node/opentelemetry-instrumentation-generic-pool: []
@@ -104,12 +105,12 @@ components:
104105
# Unmaintained
105106
plugins/node/opentelemetry-instrumentation-memcached: []
106107
# Unmaintained
107-
plugins/node/opentelemetry-instrumentation-mongodb: []
108-
# Unmaintained
108+
plugins/node/opentelemetry-instrumentation-mongodb:
109+
- onurtemizkan
109110
plugins/node/opentelemetry-instrumentation-mysql: []
110111
# Unmaintained
111-
plugins/node/opentelemetry-instrumentation-mysql2: []
112-
# Unmaintained
112+
plugins/node/opentelemetry-instrumentation-mysql2:
113+
- raphael-theriault-swi
113114
plugins/node/opentelemetry-instrumentation-nestjs-core: []
114115
# Unmaintained
115116
plugins/node/opentelemetry-instrumentation-net:

‎.github/workflows/fossa.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: FOSSA scanning
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
fossa:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
17+
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
with:
19+
api-key: ${{secrets.FOSSA_API_KEY}}
20+
team: OpenTelemetry

‎.github/workflows/unit-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
services:
4646
memcached:
47-
image: memcached:1.6.34-alpine
47+
image: memcached:1.6.37-alpine
4848
ports:
4949
- 11211:11211
5050
mongo:

‎.release-please-manifest.json‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.30.0",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.11.0",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.6.0",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.6.0",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.33.0",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.30.1",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.12.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.6.1",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.6.1",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.33.1",
77
"detectors/node/opentelemetry-resource-detector-github": "0.30.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.18.0",
9-
"metapackages/auto-configuration-propagators": "0.3.2",
10-
"metapackages/auto-instrumentations-node": "0.56.0",
11-
"metapackages/auto-instrumentations-web": "0.45.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.18.1",
9+
"metapackages/auto-configuration-propagators": "0.3.3",
10+
"metapackages/auto-instrumentations-node": "0.56.1",
11+
"metapackages/auto-instrumentations-web": "0.45.1",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.5",
14-
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
15-
"packages/opentelemetry-propagation-utils": "0.30.15",
14+
"packages/opentelemetry-id-generator-aws-xray": "1.2.3",
15+
"packages/opentelemetry-propagation-utils": "0.30.16",
1616
"packages/opentelemetry-redis-common": "0.36.2",
1717
"packages/opentelemetry-sql-common": "0.40.1",
18-
"packages/opentelemetry-test-utils": "0.45.0",
19-
"packages/winston-transport": "0.10.0",
20-
"plugins/node/instrumentation-amqplib": "0.46.0",
21-
"plugins/node/instrumentation-cucumber": "0.14.0",
22-
"plugins/node/instrumentation-dataloader": "0.16.0",
23-
"plugins/node/instrumentation-fs": "0.19.0",
24-
"plugins/node/instrumentation-kafkajs": "0.7.0",
25-
"plugins/node/instrumentation-lru-memoizer": "0.44.0",
26-
"plugins/node/instrumentation-mongoose": "0.46.0",
27-
"plugins/node/instrumentation-runtime-node": "0.12.1",
28-
"plugins/node/instrumentation-socket.io": "0.46.0",
29-
"plugins/node/instrumentation-tedious": "0.18.0",
30-
"plugins/node/instrumentation-undici": "0.10.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.2",
32-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
33-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
34-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
35-
"plugins/node/opentelemetry-instrumentation-connect": "0.43.0",
36-
"plugins/node/opentelemetry-instrumentation-dns": "0.43.0",
37-
"plugins/node/opentelemetry-instrumentation-express": "0.47.0",
38-
"plugins/node/opentelemetry-instrumentation-fastify": "0.44.1",
39-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
40-
"plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
41-
"plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",
42-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.47.0",
43-
"plugins/node/opentelemetry-instrumentation-knex": "0.44.0",
44-
"plugins/node/opentelemetry-instrumentation-koa": "0.47.0",
45-
"plugins/node/opentelemetry-instrumentation-memcached": "0.43.0",
46-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.51.0",
47-
"plugins/node/opentelemetry-instrumentation-mysql": "0.45.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.45.1",
49-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.0",
50-
"plugins/node/opentelemetry-instrumentation-net": "0.43.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.51.0",
52-
"plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
53-
"plugins/node/opentelemetry-instrumentation-redis": "0.46.0",
54-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.46.0",
55-
"plugins/node/opentelemetry-instrumentation-restify": "0.45.0",
56-
"plugins/node/opentelemetry-instrumentation-router": "0.44.0",
57-
"plugins/node/opentelemetry-instrumentation-winston": "0.44.0",
58-
"plugins/web/opentelemetry-instrumentation-document-load": "0.44.0",
59-
"plugins/web/opentelemetry-instrumentation-long-task": "0.44.0",
60-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.44.0",
61-
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
62-
"propagators/opentelemetry-propagator-instana": "0.3.2",
63-
"propagators/opentelemetry-propagator-ot-trace": "0.27.2",
64-
"propagators/propagator-aws-xray": "1.26.1",
65-
"propagators/propagator-aws-xray-lambda": "0.53.1"
18+
"packages/opentelemetry-test-utils": "0.45.1",
19+
"packages/winston-transport": "0.10.1",
20+
"plugins/node/instrumentation-amqplib": "0.46.1",
21+
"plugins/node/instrumentation-cucumber": "0.14.1",
22+
"plugins/node/instrumentation-dataloader": "0.16.1",
23+
"plugins/node/instrumentation-fs": "0.19.1",
24+
"plugins/node/instrumentation-kafkajs": "0.7.1",
25+
"plugins/node/instrumentation-lru-memoizer": "0.44.1",
26+
"plugins/node/instrumentation-mongoose": "0.46.1",
27+
"plugins/node/instrumentation-runtime-node": "0.12.2",
28+
"plugins/node/instrumentation-socket.io": "0.46.1",
29+
"plugins/node/instrumentation-tedious": "0.18.1",
30+
"plugins/node/instrumentation-undici": "0.10.1",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.3",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.1",
33+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.45.1",
34+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.45.1",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.43.1",
36+
"plugins/node/opentelemetry-instrumentation-dns": "0.43.1",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.47.1",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.44.2",
39+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.1",
40+
"plugins/node/opentelemetry-instrumentation-graphql": "0.47.1",
41+
"plugins/node/opentelemetry-instrumentation-hapi": "0.45.2",
42+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.47.1",
43+
"plugins/node/opentelemetry-instrumentation-knex": "0.44.1",
44+
"plugins/node/opentelemetry-instrumentation-koa": "0.47.1",
45+
"plugins/node/opentelemetry-instrumentation-memcached": "0.43.1",
46+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.52.0",
47+
"plugins/node/opentelemetry-instrumentation-mysql": "0.45.1",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.45.2",
49+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.1",
50+
"plugins/node/opentelemetry-instrumentation-net": "0.43.1",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.51.1",
52+
"plugins/node/opentelemetry-instrumentation-pino": "0.46.1",
53+
"plugins/node/opentelemetry-instrumentation-redis": "0.46.1",
54+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.46.1",
55+
"plugins/node/opentelemetry-instrumentation-restify": "0.45.1",
56+
"plugins/node/opentelemetry-instrumentation-router": "0.44.1",
57+
"plugins/node/opentelemetry-instrumentation-winston": "0.44.1",
58+
"plugins/web/opentelemetry-instrumentation-document-load": "0.44.1",
59+
"plugins/web/opentelemetry-instrumentation-long-task": "0.44.1",
60+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.44.1",
61+
"plugins/web/opentelemetry-plugin-react-load": "0.31.1",
62+
"propagators/opentelemetry-propagator-instana": "0.3.3",
63+
"propagators/opentelemetry-propagator-ot-trace": "0.27.3",
64+
"propagators/propagator-aws-xray": "1.26.2",
65+
"propagators/propagator-aws-xray-lambda": "0.53.2"
6666
}

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [0.30.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.30.0...resource-detector-alibaba-cloud-v0.30.1) (2025-02-19)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.45.0 to ^0.45.1
11+
312
## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.7...resource-detector-alibaba-cloud-v0.30.0) (2025-01-20)
413

514

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.30.0",
3+
"version": "0.30.1",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -42,10 +42,10 @@
4242
},
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0",
45-
"@opentelemetry/contrib-test-utils": "^0.45.0",
46-
"@types/mocha": "8.2.3",
45+
"@opentelemetry/contrib-test-utils": "^0.45.1",
46+
"@types/mocha": "10.0.10",
4747
"@types/node": "18.18.14",
48-
"@types/sinon": "10.0.20",
48+
"@types/sinon": "17.0.4",
4949
"nock": "13.3.3",
5050
"nyc": "15.1.0",
5151
"rimraf": "5.0.10",

‎detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## [1.12.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.11.0...resource-detector-aws-v1.12.0) (2025-02-19)
4+
5+
6+
### Features
7+
8+
* **detector-aws:** add more lambda semconv attributes ([#2589](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2589)) ([bef920a](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/bef920a6470d790e741a300b7b26fb5689f4070e))
9+
10+
11+
### Bug Fixes
12+
13+
* **deps:** update otel core experimental to ^0.57.1 ([#2687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2687)) ([5e20fe2](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5e20fe2f450a1be4ea100e8a6d196e33ccff0cda))
14+
* **detector-aws:** replace ecs deprecated semconv consts and hardcoded strings ([#2674](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2674)) ([0057f15](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/0057f15057f8bc330100f1124b426b05025873b9))
15+
16+
17+
### Dependencies
18+
19+
* The following workspace dependencies were updated
20+
* devDependencies
21+
* @opentelemetry/contrib-test-utils bumped from ^0.45.0 to ^0.45.1
22+
* @opentelemetry/instrumentation-fs bumped from ^0.19.0 to ^0.19.1
23+
324
## [1.11.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.10.0...resource-detector-aws-v1.11.0) (2025-01-20)
425

526

‎detectors/node/opentelemetry-resource-detector-aws/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.11.0",
3+
"version": "1.12.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -41,12 +41,12 @@
4141
},
4242
"devDependencies": {
4343
"@opentelemetry/api": "^1.0.0",
44-
"@opentelemetry/contrib-test-utils": "^0.45.0",
45-
"@opentelemetry/instrumentation-fs": "^0.19.0",
46-
"@opentelemetry/instrumentation-http": "^0.57.0",
47-
"@types/mocha": "8.2.3",
44+
"@opentelemetry/contrib-test-utils": "^0.45.1",
45+
"@opentelemetry/instrumentation-fs": "^0.19.1",
46+
"@opentelemetry/instrumentation-http": "^0.57.2",
47+
"@types/mocha": "10.0.10",
4848
"@types/node": "18.18.14",
49-
"@types/sinon": "10.0.20",
49+
"@types/sinon": "17.0.4",
5050
"nock": "13.3.3",
5151
"nyc": "15.1.0",
5252
"rimraf": "5.0.10",

‎detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import * as http from 'http';
4848
import * as util from 'util';
4949
import * as fs from 'fs';
5050
import * as os from 'os';
51-
import { getEnv } from '@opentelemetry/core';
5251

5352
const HTTP_TIMEOUT_IN_MS = 1000;
5453

@@ -77,8 +76,10 @@ export class AwsEcsDetectorSync implements DetectorSync {
7776
}
7877

7978
private async _getAttributes(): Promise<ResourceAttributes> {
80-
const env = getEnv();
81-
if (!env.ECS_CONTAINER_METADATA_URI_V4 && !env.ECS_CONTAINER_METADATA_URI) {
79+
if (
80+
!process.env.ECS_CONTAINER_METADATA_URI_V4 &&
81+
!process.env.ECS_CONTAINER_METADATA_URI
82+
) {
8283
diag.debug('AwsEcsDetector failed: Process is not on ECS');
8384
return {};
8485
}
@@ -89,7 +90,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
8990
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_ECS,
9091
}).merge(await AwsEcsDetectorSync._getContainerIdAndHostnameResource());
9192

92-
const metadataUrl = getEnv().ECS_CONTAINER_METADATA_URI_V4;
93+
const metadataUrl = process.env.ECS_CONTAINER_METADATA_URI_V4;
9394
if (metadataUrl) {
9495
const [containerMetadata, taskMetadata] = await Promise.all([
9596
AwsEcsDetectorSync._getUrlAsJson(metadataUrl),

0 commit comments

Comments
 (0)