Skip to content

Commit 81ccd08

Browse files
JamieDanielsonJamieDanielson
authored
Merge branch 'main' into feat-multiple-routes-regex
2 parents e4abf27 + 34796e2 commit 81ccd08

File tree

239 files changed

+5518
-1467
lines changed

Some content is hidden

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

239 files changed

+5518
-1467
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ pkg:instrumentation-tedious:
225225
- any-glob-to-any-file:
226226
- plugins/node/instrumentation-tedious/**
227227
- packages/opentelemetry-test-utils/**
228+
pkg:instrumentation-undici:
229+
- changed-files:
230+
- any-glob-to-any-file:
231+
- plugins/node/instrumentation-undici/**
228232
pkg:instrumentation-user-interaction:
229233
- changed-files:
230234
- any-glob-to-any-file:

‎.github/component_owners.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ components:
111111
plugins/node/opentelemetry-instrumentation-runtime-node:
112112
- d4nyll
113113
plugins/node/opentelemetry-instrumentation-pg:
114+
- maryliag
114115
- rauno56
115116
plugins/node/opentelemetry-instrumentation-pino:
116117
- seemk
@@ -122,6 +123,9 @@ components:
122123
- rauno56
123124
plugins/node/opentelemetry-instrumentation-router:
124125
- rauno56
126+
plugins/node/opentelemetry-instrumentation-undici:
127+
- david-luna
128+
- trentm
125129
plugins/node/opentelemetry-instrumentation-winston:
126130
- seemk
127131
plugins/web/opentelemetry-instrumentation-document-load:

‎.release-please-manifest.json‎

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,63 @@
1-
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.7","detectors/node/opentelemetry-resource-detector-aws":"1.4.0","detectors/node/opentelemetry-resource-detector-azure":"0.2.5","detectors/node/opentelemetry-resource-detector-container":"0.3.7","detectors/node/opentelemetry-resource-detector-gcp":"0.29.7","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.7.0","metapackages/auto-instrumentations-node":"0.43.0","metapackages/auto-instrumentations-web":"0.37.0","packages/opentelemetry-host-metrics":"0.35.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.7","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.37.0","packages/winston-transport": "0.1.0","plugins/node/instrumentation-amqplib":"0.35.0","plugins/node/instrumentation-cucumber":"0.4.0","plugins/node/instrumentation-dataloader":"0.7.0","plugins/node/instrumentation-fs":"0.10.0","plugins/node/instrumentation-lru-memoizer":"0.35.0","plugins/node/instrumentation-mongoose":"0.36.0","plugins/node/instrumentation-runtime-node":"0.2.1","plugins/node/instrumentation-socket.io":"0.37.0","plugins/node/instrumentation-tedious":"0.8.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.39.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.39.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.36.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.36.0","plugins/node/opentelemetry-instrumentation-connect":"0.34.0","plugins/node/opentelemetry-instrumentation-dns":"0.34.0","plugins/node/opentelemetry-instrumentation-express":"0.36.1","plugins/node/opentelemetry-instrumentation-fastify":"0.34.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.34.0","plugins/node/opentelemetry-instrumentation-graphql":"0.38.1","plugins/node/opentelemetry-instrumentation-hapi":"0.35.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.38.0","plugins/node/opentelemetry-instrumentation-knex":"0.34.0","plugins/node/opentelemetry-instrumentation-koa":"0.38.0","plugins/node/opentelemetry-instrumentation-memcached":"0.34.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.41.0","plugins/node/opentelemetry-instrumentation-mysql":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.36.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.35.0","plugins/node/opentelemetry-instrumentation-net":"0.34.0","plugins/node/opentelemetry-instrumentation-pg":"0.39.1","plugins/node/opentelemetry-instrumentation-pino":"0.36.0","plugins/node/opentelemetry-instrumentation-redis":"0.37.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.37.0","plugins/node/opentelemetry-instrumentation-restify":"0.36.0","plugins/node/opentelemetry-instrumentation-router":"0.35.0","plugins/node/opentelemetry-instrumentation-winston":"0.35.0","plugins/web/opentelemetry-instrumentation-document-load":"0.36.0","plugins/web/opentelemetry-instrumentation-long-task":"0.36.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.36.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
1+
{
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.8",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.4.1",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.2.6",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.3.8",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.8",
7+
"detectors/node/opentelemetry-resource-detector-github": "0.28.1",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.8.0",
9+
"metapackages/auto-instrumentations-node": "0.44.0",
10+
"metapackages/auto-instrumentations-web": "0.38.0",
11+
"packages/opentelemetry-host-metrics": "0.35.0",
12+
"packages/opentelemetry-id-generator-aws-xray": "1.2.1",
13+
"packages/opentelemetry-propagation-utils": "0.30.8",
14+
"packages/opentelemetry-redis-common": "0.36.1",
15+
"packages/opentelemetry-sql-common": "0.40.0",
16+
"packages/opentelemetry-test-utils": "0.38.0",
17+
"packages/winston-transport": "0.2.0",
18+
"plugins/node/instrumentation-amqplib": "0.36.0",
19+
"plugins/node/instrumentation-cucumber": "0.5.0",
20+
"plugins/node/instrumentation-dataloader": "0.8.0",
21+
"plugins/node/instrumentation-fs": "0.11.0",
22+
"plugins/node/instrumentation-lru-memoizer": "0.36.0",
23+
"plugins/node/instrumentation-mongoose": "0.37.0",
24+
"plugins/node/instrumentation-runtime-node": "0.3.0",
25+
"plugins/node/instrumentation-socket.io": "0.38.0",
26+
"plugins/node/instrumentation-tedious": "0.9.0",
27+
"plugins/node/instrumentation-undici": "0.1.0",
28+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.40.0",
29+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.40.0",
30+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.37.0",
31+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.37.0",
32+
"plugins/node/opentelemetry-instrumentation-connect": "0.35.0",
33+
"plugins/node/opentelemetry-instrumentation-dns": "0.35.0",
34+
"plugins/node/opentelemetry-instrumentation-express": "0.37.0",
35+
"plugins/node/opentelemetry-instrumentation-fastify": "0.35.0",
36+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.35.0",
37+
"plugins/node/opentelemetry-instrumentation-graphql": "0.39.0",
38+
"plugins/node/opentelemetry-instrumentation-hapi": "0.36.0",
39+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.39.0",
40+
"plugins/node/opentelemetry-instrumentation-knex": "0.35.0",
41+
"plugins/node/opentelemetry-instrumentation-koa": "0.39.0",
42+
"plugins/node/opentelemetry-instrumentation-memcached": "0.35.0",
43+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.42.0",
44+
"plugins/node/opentelemetry-instrumentation-mysql": "0.37.0",
45+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.37.0",
46+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.36.0",
47+
"plugins/node/opentelemetry-instrumentation-net": "0.35.0",
48+
"plugins/node/opentelemetry-instrumentation-pg": "0.40.0",
49+
"plugins/node/opentelemetry-instrumentation-pino": "0.37.0",
50+
"plugins/node/opentelemetry-instrumentation-redis": "0.38.0",
51+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.38.0",
52+
"plugins/node/opentelemetry-instrumentation-restify": "0.37.0",
53+
"plugins/node/opentelemetry-instrumentation-router": "0.36.0",
54+
"plugins/node/opentelemetry-instrumentation-winston": "0.36.0",
55+
"plugins/web/opentelemetry-instrumentation-document-load": "0.37.0",
56+
"plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
57+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.0",
58+
"plugins/web/opentelemetry-plugin-react-load": "0.30.0",
59+
"propagators/opentelemetry-propagator-aws-xray": "1.3.1",
60+
"propagators/opentelemetry-propagator-grpc-census-binary": "0.27.1",
61+
"propagators/opentelemetry-propagator-instana": "0.3.1",
62+
"propagators/opentelemetry-propagator-ot-trace": "0.27.1"
63+
}

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [2022] OpenTelemetry Authors
189+
Copyright [yyyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎archive/opentelemetry-browser-extension-autoinjection/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [2022] OpenTelemetry Authors
189+
Copyright [yyyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@
7272
* devDependencies
7373
* @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
7474

75+
## [0.28.8](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.7...resource-detector-alibaba-cloud-v0.28.8) (2024-04-03)
76+
77+
78+
### Dependencies
79+
80+
* The following workspace dependencies were updated
81+
* devDependencies
82+
* @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
83+
7584
## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)
7685

7786

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [2021] OpenTelemetry Authors
189+
Copyright [yyyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.28.7",
3+
"version": "0.28.8",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@opentelemetry/api": "^1.0.0",
43-
"@opentelemetry/contrib-test-utils": "^0.37.0",
43+
"@opentelemetry/contrib-test-utils": "^0.38.0",
4444
"@types/mocha": "8.2.3",
4545
"@types/node": "18.6.5",
4646
"@types/sinon": "10.0.18",
@@ -57,7 +57,7 @@
5757
},
5858
"dependencies": {
5959
"@opentelemetry/resources": "^1.0.0",
60-
"@opentelemetry/semantic-conventions": "^1.0.0"
60+
"@opentelemetry/semantic-conventions": "^1.22.0"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
6363
}

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,16 @@ import {
2020
ResourceDetectionConfig,
2121
} from '@opentelemetry/resources';
2222
import {
23-
CloudPlatformValues,
24-
CloudProviderValues,
25-
SemanticResourceAttributes,
23+
CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS,
24+
CLOUDPROVIDERVALUES_ALIBABA_CLOUD,
25+
SEMRESATTRS_CLOUD_ACCOUNT_ID,
26+
SEMRESATTRS_CLOUD_AVAILABILITY_ZONE,
27+
SEMRESATTRS_CLOUD_PLATFORM,
28+
SEMRESATTRS_CLOUD_PROVIDER,
29+
SEMRESATTRS_CLOUD_REGION,
30+
SEMRESATTRS_HOST_ID,
31+
SEMRESATTRS_HOST_NAME,
32+
SEMRESATTRS_HOST_TYPE,
2633
} from '@opentelemetry/semantic-conventions';
2734
import * as http from 'http';
2835

@@ -61,16 +68,14 @@ class AlibabaCloudEcsDetector implements Detector {
6168
const hostname = await this._fetchHost();
6269

6370
return new Resource({
64-
[SemanticResourceAttributes.CLOUD_PROVIDER]:
65-
CloudProviderValues.ALIBABA_CLOUD,
66-
[SemanticResourceAttributes.CLOUD_PLATFORM]:
67-
CloudPlatformValues.ALIBABA_CLOUD_ECS,
68-
[SemanticResourceAttributes.CLOUD_ACCOUNT_ID]: accountId,
69-
[SemanticResourceAttributes.CLOUD_REGION]: region,
70-
[SemanticResourceAttributes.CLOUD_AVAILABILITY_ZONE]: availabilityZone,
71-
[SemanticResourceAttributes.HOST_ID]: instanceId,
72-
[SemanticResourceAttributes.HOST_TYPE]: instanceType,
73-
[SemanticResourceAttributes.HOST_NAME]: hostname,
71+
[SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_ALIBABA_CLOUD,
72+
[SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS,
73+
[SEMRESATTRS_CLOUD_ACCOUNT_ID]: accountId,
74+
[SEMRESATTRS_CLOUD_REGION]: region,
75+
[SEMRESATTRS_CLOUD_AVAILABILITY_ZONE]: availabilityZone,
76+
[SEMRESATTRS_HOST_ID]: instanceId,
77+
[SEMRESATTRS_HOST_TYPE]: instanceType,
78+
[SEMRESATTRS_HOST_NAME]: hostname,
7479
});
7580
}
7681

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import * as nock from 'nock';
1818
import * as assert from 'assert';
1919
import { Resource } from '@opentelemetry/resources';
20-
import { CloudProviderValues } from '@opentelemetry/semantic-conventions';
20+
import { CLOUDPROVIDERVALUES_ALIBABA_CLOUD } from '@opentelemetry/semantic-conventions';
2121
import { alibabaCloudEcsDetector } from '../../src';
2222
import {
2323
assertCloudResource,
@@ -70,7 +70,7 @@ describe('alibabaCloudEcsDetector', () => {
7070
assert.ok(resource);
7171

7272
assertCloudResource(resource, {
73-
provider: CloudProviderValues.ALIBABA_CLOUD,
73+
provider: CLOUDPROVIDERVALUES_ALIBABA_CLOUD,
7474
accountId: 'my-owner-account-id',
7575
region: 'my-region-id',
7676
zone: 'my-zone-id',

0 commit comments

Comments
 (0)