diff --git a/detectors/node/resource-detector-deployment/package.json b/detectors/node/resource-detector-deployment/package.json index c229fd35..3679bfa7 100644 --- a/detectors/node/resource-detector-deployment/package.json +++ b/detectors/node/resource-detector-deployment/package.json @@ -46,7 +46,7 @@ "mocha": "^8.4.0", "opentelemetry-instrumentation-mocha": "0.0.1-rc.3", "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/detectors/node/resource-detector-git/package.json b/detectors/node/resource-detector-git/package.json index 0f59d042..b5664629 100644 --- a/detectors/node/resource-detector-git/package.json +++ b/detectors/node/resource-detector-git/package.json @@ -49,7 +49,7 @@ "opentelemetry-instrumentation-mocha": "0.0.1-rc.3", "sinon": "^11.1.1", "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/detectors/node/resource-detector-service/package.json b/detectors/node/resource-detector-service/package.json index 00b8f34f..cf091284 100644 --- a/detectors/node/resource-detector-service/package.json +++ b/detectors/node/resource-detector-service/package.json @@ -47,7 +47,7 @@ "mocha": "^8.4.0", "opentelemetry-instrumentation-mocha": "0.0.1-rc.3", "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/detectors/resource-detector-sync-api/package.json b/detectors/resource-detector-sync-api/package.json index c5296972..7a17c8ae 100644 --- a/detectors/resource-detector-sync-api/package.json +++ b/detectors/resource-detector-sync-api/package.json @@ -36,6 +36,6 @@ }, "devDependencies": { "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" } } diff --git a/package.json b/package.json index c0da6389..7e86ed43 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build:ci": "lerna run build", "postinstall": "lerna bootstrap", "prettier": "prettier --config .prettierrc.yml --write --ignore-unknown \"**/*\"", - "prettier:check": "npx prettier@2.3.0 --config .prettierrc.yml --check --ignore-unknown \"**/*\"", + "prettier:check": "npx prettier@2.3.2 --config .prettierrc.yml --check --ignore-unknown \"**/*\"", "version:update": "lerna run version:update", "version": "git add packages/**/version.ts", "publish:ci": "lerna publish --yes --allow-branch master --create-release github --conventionalCommits", @@ -18,7 +18,7 @@ }, "devDependencies": { "lerna": "^3.22.1", - "prettier": "2.3.0" + "prettier": "2.3.2" }, "workspaces": [ "packages/*", diff --git a/packages/instrumentation-amqplib/package.json b/packages/instrumentation-amqplib/package.json index 0ed1fd18..0a6a3455 100644 --- a/packages/instrumentation-amqplib/package.json +++ b/packages/instrumentation-amqplib/package.json @@ -59,7 +59,7 @@ "sinon": "^9.2.4", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-amqplib/src/amqplib.ts b/packages/instrumentation-amqplib/src/amqplib.ts index e6d6fea9..e7569bb2 100644 --- a/packages/instrumentation-amqplib/src/amqplib.ts +++ b/packages/instrumentation-amqplib/src/amqplib.ts @@ -25,13 +25,13 @@ import { import { VERSION } from './version'; export class AmqplibInstrumentation extends InstrumentationBase { - protected _config: AmqplibInstrumentationConfig; + protected override _config: AmqplibInstrumentationConfig; constructor(config: AmqplibInstrumentationConfig = {}) { super('opentelemetry-instrumentation-amqplib', VERSION, Object.assign({}, DEFAULT_CONFIG, config)); } - setConfig(config: AmqplibInstrumentationConfig = {}) { + override setConfig(config: AmqplibInstrumentationConfig = {}) { this._config = Object.assign({}, DEFAULT_CONFIG, config); } diff --git a/packages/instrumentation-aws-sdk/package.json b/packages/instrumentation-aws-sdk/package.json index bbcfc474..0b5d5bdd 100644 --- a/packages/instrumentation-aws-sdk/package.json +++ b/packages/instrumentation-aws-sdk/package.json @@ -58,7 +58,7 @@ "opentelemetry-instrumentation-testing-utils": "^0.22.0", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", - "typescript": "^4.0.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-aws-sdk/src/aws-sdk.ts b/packages/instrumentation-aws-sdk/src/aws-sdk.ts index fecb9943..3a07bbd8 100644 --- a/packages/instrumentation-aws-sdk/src/aws-sdk.ts +++ b/packages/instrumentation-aws-sdk/src/aws-sdk.ts @@ -42,7 +42,7 @@ const storedV3ClientConfig = Symbol('opentelemetry.aws-sdk.client.config'); export class AwsInstrumentation extends InstrumentationBase { static readonly component = 'aws-sdk'; - protected _config!: AwsSdkInstrumentationConfig; + protected override _config!: AwsSdkInstrumentationConfig; private REQUEST_SPAN_KEY = Symbol('opentelemetry.instrumentation.aws-sdk.span'); private servicesExtensions: ServicesExtensions = new ServicesExtensions(); @@ -50,7 +50,7 @@ export class AwsInstrumentation extends InstrumentationBase { super('opentelemetry-instrumentation-aws-sdk', VERSION, Object.assign({}, config)); } - setConfig(config: AwsSdkInstrumentationConfig = {}) { + override setConfig(config: AwsSdkInstrumentationConfig = {}) { this._config = Object.assign({}, config); } diff --git a/packages/instrumentation-elasticsearch/package.json b/packages/instrumentation-elasticsearch/package.json index 13aaeda9..f453451b 100644 --- a/packages/instrumentation-elasticsearch/package.json +++ b/packages/instrumentation-elasticsearch/package.json @@ -62,7 +62,7 @@ "sinon": "^9.2.4", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-elasticsearch/src/elasticsearch.ts b/packages/instrumentation-elasticsearch/src/elasticsearch.ts index c3bc89f6..54355d4e 100644 --- a/packages/instrumentation-elasticsearch/src/elasticsearch.ts +++ b/packages/instrumentation-elasticsearch/src/elasticsearch.ts @@ -24,7 +24,7 @@ import { ELASTICSEARCH_API_FILES } from './helpers'; export class ElasticsearchInstrumentation extends InstrumentationBase { static readonly component = '@elastic/elasticsearch'; - protected _config: ElasticsearchInstrumentationConfig; + protected override _config: ElasticsearchInstrumentationConfig; private _isEnabled = false; private moduleVersion: string; @@ -32,7 +32,7 @@ export class ElasticsearchInstrumentation extends InstrumentationBase { static readonly supportedVersions = ['^4.9.0']; - protected _config: ExpressInstrumentationConfig; + protected override _config: ExpressInstrumentationConfig; constructor(config: ExpressInstrumentationConfig = {}) { super('opentelemetry-instrumentation-express', VERSION, Object.assign({}, config)); } - setConfig(config: ExpressInstrumentationConfig = {}) { + override setConfig(config: ExpressInstrumentationConfig = {}) { this._config = Object.assign({}, config); } diff --git a/packages/instrumentation-kafkajs/package.json b/packages/instrumentation-kafkajs/package.json index f8aaf1fd..a8aa0d75 100644 --- a/packages/instrumentation-kafkajs/package.json +++ b/packages/instrumentation-kafkajs/package.json @@ -50,7 +50,7 @@ "opentelemetry-instrumentation-mocha": "0.0.1-rc.3", "opentelemetry-instrumentation-testing-utils": "^0.22.0", "ts-node": "^9.1.1", - "typescript": "^3.9.5" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-kafkajs/src/kafkajs.ts b/packages/instrumentation-kafkajs/src/kafkajs.ts index 84f09036..58d8907c 100644 --- a/packages/instrumentation-kafkajs/src/kafkajs.ts +++ b/packages/instrumentation-kafkajs/src/kafkajs.ts @@ -41,14 +41,14 @@ import { export class KafkaJsInstrumentation extends InstrumentationBase { static readonly component = 'kafkajs'; - protected _config!: KafkaJsInstrumentationConfig; + protected override _config!: KafkaJsInstrumentationConfig; private moduleVersion: string; constructor(config: KafkaJsInstrumentationConfig = {}) { super('opentelemetry-instrumentation-kafkajs', VERSION, Object.assign({}, config)); } - setConfig(config: KafkaJsInstrumentationConfig = {}) { + override setConfig(config: KafkaJsInstrumentationConfig = {}) { this._config = Object.assign({}, config); } diff --git a/packages/instrumentation-mongoose/package.json b/packages/instrumentation-mongoose/package.json index fa6ee65b..595cba2c 100644 --- a/packages/instrumentation-mongoose/package.json +++ b/packages/instrumentation-mongoose/package.json @@ -59,7 +59,7 @@ "opentelemetry-instrumentation-mocha": "0.0.1-rc.3", "opentelemetry-instrumentation-testing-utils": "^0.22.0", "ts-node": "^9.1.1", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-mongoose/src/mongoose.ts b/packages/instrumentation-mongoose/src/mongoose.ts index 56f42cea..4ed1d98d 100644 --- a/packages/instrumentation-mongoose/src/mongoose.ts +++ b/packages/instrumentation-mongoose/src/mongoose.ts @@ -36,7 +36,7 @@ export const _STORED_PARENT_SPAN: unique symbol = Symbol('stored-parent-span'); export class MongooseInstrumentation extends InstrumentationBase { static readonly component = 'mongoose'; - protected _config: MongooseInstrumentationConfig; + protected override _config: MongooseInstrumentationConfig; private moduleVersion: string; constructor(config: MongooseInstrumentationConfig = {}) { @@ -46,7 +46,7 @@ export class MongooseInstrumentation extends InstrumentationBase undefined; } - setConfig(config: MongooseInstrumentationConfig = {}) { + override setConfig(config: MongooseInstrumentationConfig = {}) { this._config = Object.assign({}, config); if (!config.dbStatementSerializer) this._config.dbStatementSerializer = () => undefined; } diff --git a/packages/instrumentation-neo4j/package.json b/packages/instrumentation-neo4j/package.json index 73e850ca..d15fab34 100644 --- a/packages/instrumentation-neo4j/package.json +++ b/packages/instrumentation-neo4j/package.json @@ -58,7 +58,7 @@ "opentelemetry-instrumentation-testing-utils": "^0.22.0", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-neo4j/src/neo4j.ts b/packages/instrumentation-neo4j/src/neo4j.ts index be3136be..767f6ede 100644 --- a/packages/instrumentation-neo4j/src/neo4j.ts +++ b/packages/instrumentation-neo4j/src/neo4j.ts @@ -15,13 +15,13 @@ import { getAttributesFromNeo4jSession } from './utils'; type Neo4J = typeof neo4j; export class Neo4jInstrumentation extends InstrumentationBase { - protected _config!: Neo4jInstrumentationConfig; + protected override _config!: Neo4jInstrumentationConfig; constructor(config: Neo4jInstrumentationConfig = {}) { super('opentelemetry-instrumentation-neo4j', VERSION, Object.assign({}, config)); } - setConfig(config: Neo4jInstrumentationConfig = {}) { + override setConfig(config: Neo4jInstrumentationConfig = {}) { this._config = config; } diff --git a/packages/instrumentation-sequelize/package.json b/packages/instrumentation-sequelize/package.json index 6908ed10..e66afff7 100644 --- a/packages/instrumentation-sequelize/package.json +++ b/packages/instrumentation-sequelize/package.json @@ -59,7 +59,7 @@ "sequelize": "^5.22.0", "sqlite3": "^5.0.2", "ts-node": "^9.1.1", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-sequelize/src/sequelize.ts b/packages/instrumentation-sequelize/src/sequelize.ts index 1a2a2065..53c4d5aa 100644 --- a/packages/instrumentation-sequelize/src/sequelize.ts +++ b/packages/instrumentation-sequelize/src/sequelize.ts @@ -16,14 +16,14 @@ import { export class SequelizeInstrumentation extends InstrumentationBase { static readonly component = 'sequelize'; - protected _config!: SequelizeInstrumentationConfig; + protected override _config!: SequelizeInstrumentationConfig; private moduleVersion: string; constructor(config: SequelizeInstrumentationConfig = {}) { super('opentelemetry-instrumentation-sequelize', VERSION, Object.assign({}, config)); } - setConfig(config: SequelizeInstrumentationConfig = {}) { + override setConfig(config: SequelizeInstrumentationConfig = {}) { this._config = Object.assign({}, config); } diff --git a/packages/instrumentation-socket.io/package.json b/packages/instrumentation-socket.io/package.json index 49676ca9..ca19c57f 100644 --- a/packages/instrumentation-socket.io/package.json +++ b/packages/instrumentation-socket.io/package.json @@ -59,7 +59,7 @@ "socket.io": "^4.1.2", "socket.io-client": "^4.1.1", "test-all-versions": "^5.0.1", - "typescript": "^4.2.4" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-socket.io/src/socket.io.ts b/packages/instrumentation-socket.io/src/socket.io.ts index e9dadbc1..ed347279 100644 --- a/packages/instrumentation-socket.io/src/socket.io.ts +++ b/packages/instrumentation-socket.io/src/socket.io.ts @@ -19,7 +19,7 @@ import isPromise from 'is-promise'; const reservedEvents = ['connect', 'connect_error', 'disconnect', 'disconnecting', 'newListener', 'removeListener']; export class SocketIoInstrumentation extends InstrumentationBase { - protected _config!: SocketIoInstrumentationConfig; + protected override _config!: SocketIoInstrumentationConfig; constructor(config: SocketIoInstrumentationConfig = {}) { super('opentelemetry-instrumentation-socket.io', VERSION, Object.assign({}, config)); diff --git a/packages/instrumentation-testing-utils/package.json b/packages/instrumentation-testing-utils/package.json index ebcfbd48..e0ffd975 100644 --- a/packages/instrumentation-testing-utils/package.json +++ b/packages/instrumentation-testing-utils/package.json @@ -37,6 +37,7 @@ "@opentelemetry/tracing": "^0.22.0" }, "devDependencies": { - "@opentelemetry/api": "^1.0.0" + "@opentelemetry/api": "^1.0.0", + "typescript": "4.3.4" } } diff --git a/packages/instrumentation-typeorm/package.json b/packages/instrumentation-typeorm/package.json index f6015794..50e6bd32 100644 --- a/packages/instrumentation-typeorm/package.json +++ b/packages/instrumentation-typeorm/package.json @@ -56,7 +56,7 @@ "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", "typeorm": "^0.2.26", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "mocha": { "extension": [ diff --git a/packages/instrumentation-typeorm/src/typeorm.ts b/packages/instrumentation-typeorm/src/typeorm.ts index db32c118..5aaa616e 100644 --- a/packages/instrumentation-typeorm/src/typeorm.ts +++ b/packages/instrumentation-typeorm/src/typeorm.ts @@ -29,7 +29,7 @@ const selectQueryBuilderExecuteMethods: SelectQueryBuilderMethods[] = [ ]; export class TypeormInstrumentation extends InstrumentationBase { - protected _config!: TypeormInstrumentationConfig; + protected override _config!: TypeormInstrumentationConfig; constructor(config: TypeormInstrumentationConfig = {}) { super('opentelemetry-instrumentation-typeorm', VERSION, Object.assign({}, config)); diff --git a/packages/propagation-utils/package.json b/packages/propagation-utils/package.json index 7f19e4f6..0f2b2dd2 100644 --- a/packages/propagation-utils/package.json +++ b/packages/propagation-utils/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/node": "^14.14.8", - "typescript": "^4.0.3" + "typescript": "4.3.4" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/tsconfig.base.json b/tsconfig.base.json index ea9b99f6..39ef2cff 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -12,6 +12,7 @@ "inlineSources": true, "types": ["node"], "allowSyntheticDefaultImports": true, - "esModuleInterop": true + "esModuleInterop": true, + "noImplicitOverride": true } }