Skip to content

Commit 4e3f0c2

Browse files
kobi-cokobi-co
authored
chore: fix contrib build (open-telemetry#1374)
* chore(mongodb): fix build after v5 release * chore: pin @types/bson version in monorepo root for lerna hoisting * chore: pin @types/bson version in monorepo root for lerna hoisting * chore: pin @types/bson version in mongodb * chore: patch winston module (logform breaking), ts 4.5.5 fixes * chore: change typescript to 4.4.4 * chore: change typescript to 4.4.4
1 parent ff109b7 commit 4e3f0c2

File tree

90 files changed

+119
-116
lines changed

Some content is hidden

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

90 files changed

+119
-116
lines changed

‎archive/opentelemetry-browser-extension-autoinjection/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"sinon-chrome": "3.0.1",
5858
"ts-loader": "9.2.5",
5959
"ts-mocha": "10.0.0",
60-
"typescript": "4.3.5",
60+
"typescript": "4.4.4",
6161
"webpack": "4.46.0",
6262
"webpack-cli": "4.7.2",
6363
"webpack-merge": "5.8.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"rimraf": "3.0.2",
5555
"sinon": "14.0.0",
5656
"ts-mocha": "10.0.0",
57-
"typescript": "4.3.5"
57+
"typescript": "4.4.4"
5858
},
5959
"peerDependencies": {
6060
"@opentelemetry/api": "^1.0.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"rimraf": "3.0.2",
5454
"sinon": "14.0.0",
5555
"ts-mocha": "10.0.0",
56-
"typescript": "4.3.5"
56+
"typescript": "4.4.4"
5757
},
5858
"peerDependencies": {
5959
"@opentelemetry/api": "^1.0.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export class AwsBeanstalkDetector implements Detector {
8080
[SemanticResourceAttributes.SERVICE_INSTANCE_ID]:
8181
parsedData.deployment_id,
8282
});
83-
} catch (e) {
83+
} catch (e: any) {
8484
diag.debug(`AwsBeanstalkDetector failed: ${e.message}`);
8585
return Resource.empty();
8686
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export class AwsEksDetector implements Detector {
180180
return str.substring(str.length - this.CONTAINER_ID_LENGTH);
181181
}
182182
}
183-
} catch (e) {
183+
} catch (e: any) {
184184
diag.warn(`AwsEksDetector failed to read container ID: ${e.message}`);
185185
}
186186
return undefined;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"rimraf": "3.0.2",
4949
"sinon": "14.0.0",
5050
"ts-mocha": "10.0.0",
51-
"typescript": "4.3.5"
51+
"typescript": "4.4.4"
5252
},
5353
"peerDependencies": {
5454
"@opentelemetry/api": "^1.0.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"nyc": "15.1.0",
5353
"rimraf": "3.0.2",
5454
"ts-mocha": "10.0.0",
55-
"typescript": "4.3.5"
55+
"typescript": "4.4.4"
5656
},
5757
"peerDependencies": {
5858
"@opentelemetry/api": "^1.0.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"rimraf": "3.0.2",
5656
"sinon": "14.0.0",
5757
"ts-mocha": "10.0.0",
58-
"typescript": "4.3.5"
58+
"typescript": "4.4.4"
5959
},
6060
"dependencies": {
6161
"@opentelemetry/resources": "^1.0.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"nyc": "15.1.0",
5252
"rimraf": "3.0.2",
5353
"ts-mocha": "10.0.0",
54-
"typescript": "4.3.5"
54+
"typescript": "4.4.4"
5555
},
5656
"dependencies": {
5757
"@opentelemetry/resources": "^1.0.0",

‎detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ describe('[UNIT] instanaAgentDetector', () => {
138138
try {
139139
await instanaAgentDetector.detect();
140140
assert.ok(false, 'Expected to throw');
141-
} catch (err) {
141+
} catch (err: any) {
142142
assert.equal(err.code, 'ECONNREFUSED');
143143
}
144144
});

‎metapackages/auto-instrumentations-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"rimraf": "3.0.2",
4444
"sinon": "14.0.0",
4545
"ts-mocha": "10.0.0",
46-
"typescript": "4.3.5"
46+
"typescript": "4.4.4"
4747
},
4848
"dependencies": {
4949
"@opentelemetry/instrumentation": "^0.35.1",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export function getNodeAutoInstrumentations(
119119
>) {
120120
const Instance = InstrumentationMap[name];
121121
// Defaults are defined by the instrumentation itself
122-
const userConfig = inputConfigs[name] ?? {};
122+
const userConfig: any = inputConfigs[name] ?? {};
123123

124124
if (userConfig.enabled === false) {
125125
diag.debug(`Disabling instrumentation for ${name}`);
@@ -129,7 +129,7 @@ export function getNodeAutoInstrumentations(
129129
try {
130130
diag.debug(`Loading instrumentation for ${name}`);
131131
instrumentations.push(new Instance(userConfig));
132-
} catch (e) {
132+
} catch (e: any) {
133133
diag.error(e);
134134
}
135135
}

‎metapackages/auto-instrumentations-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"sinon": "14.0.0",
5555
"ts-loader": "8.3.0",
5656
"ts-mocha": "10.0.0",
57-
"typescript": "4.3.5",
57+
"typescript": "4.4.4",
5858
"webpack": "4.46.0",
5959
"webpack-cli": "4.7.2",
6060
"webpack-merge": "5.8.0"

‎metapackages/auto-instrumentations-web/src/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function getWebAutoInstrumentations(
6565
try {
6666
diag.debug(`Loading instrumentation for ${name}`);
6767
instrumentations.push(new Instance(userConfig));
68-
} catch (e) {
68+
} catch (e: any) {
6969
diag.error(e);
7070
}
7171
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"husky": "7.0.4",
5757
"lerna": "5.5.2",
5858
"lerna-changelog": "2.2.0",
59-
"typescript": "4.3.5"
59+
"typescript": "4.4.4"
6060
},
6161
"changelog": {
6262
"labels": {

‎packages/opentelemetry-host-metrics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"rimraf": "3.0.2",
5757
"sinon": "14.0.0",
5858
"ts-mocha": "10.0.0",
59-
"typescript": "4.3.5"
59+
"typescript": "4.4.4"
6060
},
6161
"dependencies": {
6262
"@opentelemetry/sdk-metrics": "^1.8.0",

‎packages/opentelemetry-id-generator-aws-xray/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"sinon": "14.0.0",
7474
"ts-loader": "8.3.0",
7575
"ts-mocha": "10.0.0",
76-
"typescript": "4.3.5",
76+
"typescript": "4.4.4",
7777
"webpack": "4.46.0"
7878
},
7979
"dependencies": {

‎packages/opentelemetry-propagation-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
"nyc": "15.1.0",
5656
"sinon": "13.0.1",
5757
"ts-mocha": "10.0.0",
58-
"typescript": "4.3.5"
58+
"typescript": "4.4.4"
5959
}
6060
}

‎packages/opentelemetry-redis-common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
"mocha": "7.2.0",
4646
"nyc": "15.1.0",
4747
"ts-mocha": "10.0.0",
48-
"typescript": "4.3.5"
48+
"typescript": "4.4.4"
4949
}
5050
}

‎packages/opentelemetry-test-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@opentelemetry/api": "^1.3.0",
4545
"@types/node": "18.11.7",
4646
"gts": "3.1.0",
47-
"typescript": "4.3.5"
47+
"typescript": "4.4.4"
4848
},
4949
"dependencies": {
5050
"@opentelemetry/core": "^1.0.0",

‎plugins/node/instrumentation-amqplib/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"gts": "3.1.0",
6868
"sinon": "14.0.0",
6969
"test-all-versions": "5.0.1",
70-
"typescript": "4.3.5"
70+
"typescript": "4.4.4"
7171
},
7272
"engines": {
7373
"node": ">=14"

‎plugins/node/instrumentation-dataloader/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"rimraf": "3.0.2",
6060
"test-all-versions": "5.0.1",
6161
"ts-mocha": "10.0.0",
62-
"typescript": "4.3.5"
62+
"typescript": "4.4.4"
6363
},
6464
"dependencies": {
6565
"@opentelemetry/instrumentation": "^0.35.1"

‎plugins/node/instrumentation-fs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"rimraf": "3.0.2",
5757
"sinon": "14.0.0",
5858
"ts-mocha": "10.0.0",
59-
"typescript": "4.3.5"
59+
"typescript": "4.4.4"
6060
},
6161
"dependencies": {
6262
"@opentelemetry/core": "^1.8.0",

‎plugins/node/instrumentation-fs/src/instrumentation.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
160160
);
161161
instrumentation._runEndHook(functionName, { args: args, span });
162162
return res;
163-
} catch (error) {
163+
} catch (error: any) {
164164
span.recordException(error);
165165
span.setStatus({
166166
message: error.message,
@@ -234,7 +234,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
234234
this,
235235
...args
236236
);
237-
} catch (error) {
237+
} catch (error: any) {
238238
span.recordException(error);
239239
span.setStatus({
240240
message: error.message,
@@ -307,7 +307,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
307307
this,
308308
...args
309309
);
310-
} catch (error) {
310+
} catch (error: any) {
311311
span.recordException(error);
312312
span.setStatus({
313313
message: error.message,
@@ -377,7 +377,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
377377
);
378378
instrumentation._runEndHook(functionName, { args: args, span });
379379
return res;
380-
} catch (error) {
380+
} catch (error: any) {
381381
span.recordException(error);
382382
span.setStatus({
383383
message: error.message,

‎plugins/node/instrumentation-fs/test/hooks.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ describe('fs instrumentation: hooks', () => {
107107
it('should not shadow the error from original call when hooks throw', () => {
108108
try {
109109
fs.accessSync('./test/fixtures/readtest-404', fs.constants.R_OK);
110-
} catch (e) {
110+
} catch (e: any) {
111111
assertNotHookError(e);
112112
}
113113

‎plugins/node/instrumentation-lru-memoizer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"rimraf": "3.0.2",
5656
"test-all-versions": "5.0.1",
5757
"ts-mocha": "10.0.0",
58-
"typescript": "4.3.5"
58+
"typescript": "4.4.4"
5959
},
6060
"dependencies": {
6161
"@opentelemetry/instrumentation": "^0.35.1"

‎plugins/node/instrumentation-mongoose/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"rimraf": "3.0.2",
5959
"test-all-versions": "5.0.1",
6060
"ts-mocha": "10.0.0",
61-
"typescript": "4.3.5"
61+
"typescript": "4.4.4"
6262
},
6363
"dependencies": {
6464
"@opentelemetry/core": "^1.8.0",

‎plugins/node/instrumentation-mongoose/test/mongoose.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('mongoose instrumentation', () => {
4444
useCreateIndex: true,
4545
dbName: DB_NAME,
4646
} as any); // TODO: amir - document older mongoose support
47-
} catch (err) {
47+
} catch (err: any) {
4848
// connect signature changed from mongo v5 to v6.
4949
// the following check tries both signatures, so test-all-versions
5050
// can run against both versions.

‎plugins/node/instrumentation-socket.io/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"socket.io-client": "^4.1.3",
5757
"test-all-versions": "5.0.1",
5858
"ts-mocha": "10.0.0",
59-
"typescript": "4.3.5"
59+
"typescript": "4.4.4"
6060
},
6161
"dependencies": {
6262
"@opentelemetry/instrumentation": "^0.35.1",

‎plugins/node/instrumentation-tedious/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"tedious": "14.1.0",
6161
"test-all-versions": "5.0.1",
6262
"ts-mocha": "10.0.0",
63-
"typescript": "4.3.5"
63+
"typescript": "4.4.4"
6464
},
6565
"dependencies": {
6666
"@opentelemetry/instrumentation": "^0.35.1",

‎plugins/node/opentelemetry-instrumentation-aws-lambda/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"nyc": "15.1.0",
5757
"rimraf": "3.0.2",
5858
"ts-mocha": "10.0.0",
59-
"typescript": "4.3.5"
59+
"typescript": "4.4.4"
6060
},
6161
"dependencies": {
6262
"@opentelemetry/instrumentation": "^0.35.1",

‎plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ describe('lambda handler', () => {
214214
let err: Error;
215215
try {
216216
await lambdaRequire('lambda-test/async').error('arg', ctx);
217-
} catch (e) {
217+
} catch (e: any) {
218218
err = e;
219219
}
220220
assert.strictEqual(err!.message, 'handler error');
@@ -231,7 +231,7 @@ describe('lambda handler', () => {
231231
let err: string;
232232
try {
233233
await lambdaRequire('lambda-test/async').stringerror('arg', ctx);
234-
} catch (e) {
234+
} catch (e: any) {
235235
err = e;
236236
}
237237
assert.strictEqual(err!, 'handler error');
@@ -301,7 +301,7 @@ describe('lambda handler', () => {
301301
ctx,
302302
(err: Error, res: any) => {}
303303
);
304-
} catch (e) {
304+
} catch (e: any) {
305305
err = e;
306306
}
307307
assert.strictEqual(err!.message, 'handler error');
@@ -330,7 +330,7 @@ describe('lambda handler', () => {
330330
}
331331
);
332332
});
333-
} catch (e) {
333+
} catch (e: any) {
334334
err = e;
335335
}
336336
assert.strictEqual(err!.message, 'handler error');
@@ -351,7 +351,7 @@ describe('lambda handler', () => {
351351
ctx,
352352
(err: Error, res: any) => {}
353353
);
354-
} catch (e) {
354+
} catch (e: any) {
355355
err = e;
356356
}
357357
assert.strictEqual(err!, 'handler error');
@@ -423,7 +423,7 @@ describe('lambda handler', () => {
423423
}
424424
);
425425
});
426-
} catch (e) {
426+
} catch (e: any) {
427427
err = e;
428428
}
429429
assert.strictEqual(err!, 'handler error');
@@ -806,7 +806,7 @@ describe('lambda handler', () => {
806806
let err: Error;
807807
try {
808808
await lambdaRequire('lambda-test/async').error('arg', ctx);
809-
} catch (e) {
809+
} catch (e: any) {
810810
err = e;
811811
}
812812
const [span] = memoryExporter.getFinishedSpans();
@@ -833,7 +833,7 @@ describe('lambda handler', () => {
833833
let err: Error;
834834
try {
835835
lambdaRequire('lambda-test/sync').error('arg', ctx, () => {});
836-
} catch (e) {
836+
} catch (e: any) {
837837
err = e;
838838
}
839839
const [span] = memoryExporter.getFinishedSpans();

‎plugins/node/opentelemetry-instrumentation-bunyan/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"sinon": "14.0.0",
6363
"test-all-versions": "5.0.1",
6464
"ts-mocha": "10.0.0",
65-
"typescript": "4.3.5"
65+
"typescript": "4.4.4"
6666
},
6767
"dependencies": {
6868
"@opentelemetry/instrumentation": "^0.35.1",

0 commit comments

Comments
 (0)