Skip to content

Commit

Permalink
Merge branch 'main' into fix/tsconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeJayDev
DeJayDev authored May 28, 2024
2 parents 66d081e + 82b7526 commit bb60728
Show file tree
Hide file tree
Showing 26 changed files with 1,360 additions and 8,707 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
### :rocket: (Enhancement)

* feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan
* feat(context-zone*): support zone.js 0.12.x [#4376](https://github.com/open-telemetry/opentelemetry-js/pull/4736) @maldago

### :bug: (Bug Fix)

Expand Down
1 change: 0 additions & 1 deletion experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
Expand Down
5 changes: 2 additions & 3 deletions experimental/packages/exporter-logs-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
],
"sideEffects": false,
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/resources": "1.24.1",
"@types/mocha": "10.0.6",
Expand All @@ -83,7 +83,6 @@
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
5 changes: 2 additions & 3 deletions experimental/packages/exporter-logs-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,14 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/exporter-trace-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
Expand Down
5 changes: 2 additions & 3 deletions experimental/packages/exporter-trace-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand All @@ -74,7 +74,6 @@
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
5 changes: 2 additions & 3 deletions experimental/packages/exporter-trace-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,14 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-browser-detector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
Expand Down
5 changes: 2 additions & 3 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand All @@ -74,7 +74,6 @@
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/context-zone": "1.24.1",
"@opentelemetry/propagator-b3": "1.24.1",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/context-zone": "1.24.1",
"@opentelemetry/propagator-b3": "1.24.1",
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/sdk-metrics": "1.24.1",
"@types/mocha": "10.0.6",
Expand All @@ -95,7 +95,7 @@
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cpx2": "2.0.0",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
Expand Down
23 changes: 13 additions & 10 deletions ...ntal/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ describe('RequireInTheMiddleSingleton', () => {
const onRequireFsPromisesStub = makeOnRequiresStub('fs-promises');
const onRequireCodecovStub = makeOnRequiresStub('codecov');
const onRequireCodecovLibStub = makeOnRequiresStub('codecov-lib');
const onRequireCpxStub = makeOnRequiresStub('cpx');
const onRequireCpxLibStub = makeOnRequiresStub('cpx-lib');
const onRequireCpxStub = makeOnRequiresStub('cpx2');
const onRequireCpxLibStub = makeOnRequiresStub('cpx2-lib');

before(() => {
requireInTheMiddleSingleton.register('fs', onRequireFsStub);
Expand All @@ -53,9 +53,9 @@ describe('RequireInTheMiddleSingleton', () => {
'codecov/lib/codecov.js',
onRequireCodecovLibStub
);
requireInTheMiddleSingleton.register('cpx', onRequireCpxStub);
requireInTheMiddleSingleton.register('cpx2', onRequireCpxStub);
requireInTheMiddleSingleton.register(
'cpx/lib/copy-sync.js',
'cpx2/lib/copy-sync.js',
onRequireCpxLibStub
);
});
Expand Down Expand Up @@ -150,16 +150,19 @@ describe('RequireInTheMiddleSingleton', () => {
describe('non-core module with sub-path', () => {
describe('AND module name matches', () => {
const baseDir = path.resolve(
path.dirname(require.resolve('cpx')),
path.dirname(require.resolve('cpx2')),
'..'
);
const modulePath = path.join('cpx', 'lib', 'copy-sync.js');
const modulePath = path.join('cpx2', 'lib', 'copy-sync.js');
it('should call `onRequire`', () => {
const exports = require('cpx/lib/copy-sync');
assert.deepStrictEqual(exports.__ritmOnRequires, ['cpx', 'cpx-lib']);
const exports = require('cpx2/lib/copy-sync');
assert.deepStrictEqual(exports.__ritmOnRequires, [
'cpx2',
'cpx2-lib',
]);
sinon.assert.calledWithMatch(
onRequireCpxStub,
{ __ritmOnRequires: ['cpx', 'cpx-lib'] },
{ __ritmOnRequires: ['cpx2', 'cpx2-lib'] },
modulePath,
baseDir
);
Expand All @@ -175,7 +178,7 @@ describe('RequireInTheMiddleSingleton', () => {
modulePath,
baseDir
);
});
}).timeout(30000);
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"@opentelemetry/otlp-transformer": "0.51.1"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/otlp-grpc-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
"codecov": "3.8.3",
"cpx": "1.5.0",
"cross-var": "1.1.0",
"lerna": "6.6.2",
"mocha": "10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/propagator-aws-xray-lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@opentelemetry/api": ">=1.3.0 <1.9.0"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "1.8.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/sdk-logs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"@opentelemetry/api-logs": ">=0.39.1"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": ">=1.4.0 <1.9.0",
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/resources_1.9.0": "npm:@opentelemetry/[email protected]",
Expand Down
Loading

0 comments on commit bb60728

Please sign in to comment.