Skip to content

chore: fix contrib build #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 7, 2023
Merged

chore: fix contrib build #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2eb787
chore(mongodb): fix build after v5 release
kobi-co Feb 6, 2023
cb362b0
chore: pin @types/bson version in monorepo root for lerna hoisting
kobi-co Feb 6, 2023
5ee18ab
chore: pin @types/bson version in monorepo root for lerna hoisting
kobi-co Feb 6, 2023
6293719
chore: pin @types/bson version in mongodb
kobi-co Feb 6, 2023
9459979
chore: patch winston module (logform breaking), ts 4.5.5 fixes
kobi-co Feb 7, 2023
e19021d
chore: change typescript to 4.4.4
kobi-co Feb 7, 2023
5e2e586
chore: change typescript to 4.4.4
kobi-co Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archive/opentelemetry-browser-extension-autoinjection/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"sinon-chrome": "3.0.1",
"ts-loader": "9.2.5",
"ts-mocha": "10.0.0",
"typescript": "4.3.5",
"typescript": "4.4.4",
"webpack": "4.46.0",
"webpack-cli": "4.7.2",
"webpack-merge": "5.8.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class AwsBeanstalkDetector implements Detector {
[SemanticResourceAttributes.SERVICE_INSTANCE_ID]:
parsedData.deployment_id,
});
} catch (e) {
} catch (e: any) {
diag.debug(`AwsBeanstalkDetector failed: ${e.message}`);
return Resource.empty();
}
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class AwsEksDetector implements Detector {
return str.substring(str.length - this.CONTAINER_ID_LENGTH);
}
}
} catch (e) {
} catch (e: any) {
diag.warn(`AwsEksDetector failed to read container ID: ${e.message}`);
}
return undefined;
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-container/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-gcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-instana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion ...rs/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('[UNIT] instanaAgentDetector', () => {
try {
await instanaAgentDetector.detect();
assert.ok(false, 'Expected to throw');
} catch (err) {
} catch (err: any) {
assert.equal(err.code, 'ECONNREFUSED');
}
});
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1",
Expand Down
4 changes: 2 additions & 2 deletions metapackages/auto-instrumentations-node/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function getNodeAutoInstrumentations(
>) {
const Instance = InstrumentationMap[name];
// Defaults are defined by the instrumentation itself
const userConfig = inputConfigs[name] ?? {};
const userConfig: any = inputConfigs[name] ?? {};

if (userConfig.enabled === false) {
diag.debug(`Disabling instrumentation for ${name}`);
Expand All @@ -129,7 +129,7 @@ export function getNodeAutoInstrumentations(
try {
diag.debug(`Loading instrumentation for ${name}`);
instrumentations.push(new Instance(userConfig));
} catch (e) {
} catch (e: any) {
diag.error(e);
}
}
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"sinon": "14.0.0",
"ts-loader": "8.3.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5",
"typescript": "4.4.4",
"webpack": "4.46.0",
"webpack-cli": "4.7.2",
"webpack-merge": "5.8.0"
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function getWebAutoInstrumentations(
try {
diag.debug(`Loading instrumentation for ${name}`);
instrumentations.push(new Instance(userConfig));
} catch (e) {
} catch (e: any) {
diag.error(e);
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"husky": "7.0.4",
"lerna": "5.5.2",
"lerna-changelog": "2.2.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"changelog": {
"labels": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/sdk-metrics": "^1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"sinon": "14.0.0",
"ts-loader": "8.3.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5",
"typescript": "4.4.4",
"webpack": "4.46.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagation-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"nyc": "15.1.0",
"sinon": "13.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-redis-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@opentelemetry/api": "^1.3.0",
"@types/node": "18.11.7",
"gts": "3.1.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-amqplib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"gts": "3.1.0",
"sinon": "14.0.0",
"test-all-versions": "5.0.1",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"engines": {
"node": ">=14"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-dataloader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"rimraf": "3.0.2",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-fs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"rimraf": "3.0.2",
"sinon": "14.0.0",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/instrumentation-fs/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
);
instrumentation._runEndHook(functionName, { args: args, span });
return res;
} catch (error) {
} catch (error: any) {
span.recordException(error);
span.setStatus({
message: error.message,
Expand Down Expand Up @@ -234,7 +234,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
this,
...args
);
} catch (error) {
} catch (error: any) {
span.recordException(error);
span.setStatus({
message: error.message,
Expand Down Expand Up @@ -307,7 +307,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
this,
...args
);
} catch (error) {
} catch (error: any) {
span.recordException(error);
span.setStatus({
message: error.message,
Expand Down Expand Up @@ -377,7 +377,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
);
instrumentation._runEndHook(functionName, { args: args, span });
return res;
} catch (error) {
} catch (error: any) {
span.recordException(error);
span.setStatus({
message: error.message,
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-fs/test/hooks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('fs instrumentation: hooks', () => {
it('should not shadow the error from original call when hooks throw', () => {
try {
fs.accessSync('./test/fixtures/readtest-404', fs.constants.R_OK);
} catch (e) {
} catch (e: any) {
assertNotHookError(e);
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-lru-memoizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"rimraf": "3.0.2",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-mongoose/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"rimraf": "3.0.2",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-mongoose/test/mongoose.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('mongoose instrumentation', () => {
useCreateIndex: true,
dbName: DB_NAME,
} as any); // TODO: amir - document older mongoose support
} catch (err) {
} catch (err: any) {
// connect signature changed from mongo v5 to v6.
// the following check tries both signatures, so test-all-versions
// can run against both versions.
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-socket.io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"socket.io-client": "^4.1.3",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-tedious/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"tedious": "14.1.0",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1",
Expand Down
16 changes: 8 additions & 8 deletions ...ns/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ describe('lambda handler', () => {
let err: Error;
try {
await lambdaRequire('lambda-test/async').error('arg', ctx);
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!.message, 'handler error');
Expand All @@ -231,7 +231,7 @@ describe('lambda handler', () => {
let err: string;
try {
await lambdaRequire('lambda-test/async').stringerror('arg', ctx);
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!, 'handler error');
Expand Down Expand Up @@ -301,7 +301,7 @@ describe('lambda handler', () => {
ctx,
(err: Error, res: any) => {}
);
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!.message, 'handler error');
Expand Down Expand Up @@ -330,7 +330,7 @@ describe('lambda handler', () => {
}
);
});
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!.message, 'handler error');
Expand All @@ -351,7 +351,7 @@ describe('lambda handler', () => {
ctx,
(err: Error, res: any) => {}
);
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!, 'handler error');
Expand Down Expand Up @@ -423,7 +423,7 @@ describe('lambda handler', () => {
}
);
});
} catch (e) {
} catch (e: any) {
err = e;
}
assert.strictEqual(err!, 'handler error');
Expand Down Expand Up @@ -806,7 +806,7 @@ describe('lambda handler', () => {
let err: Error;
try {
await lambdaRequire('lambda-test/async').error('arg', ctx);
} catch (e) {
} catch (e: any) {
err = e;
}
const [span] = memoryExporter.getFinishedSpans();
Expand All @@ -833,7 +833,7 @@ describe('lambda handler', () => {
let err: Error;
try {
lambdaRequire('lambda-test/sync').error('arg', ctx, () => {});
} catch (e) {
} catch (e: any) {
err = e;
}
const [span] = memoryExporter.getFinishedSpans();
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"sinon": "14.0.0",
"test-all-versions": "5.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.3.5"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.35.1",
Expand Down
Loading