From 75a4a24dfd9c5639c79dc898653e08d4be3381a8 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Sat, 5 Jun 2021 19:56:47 +0200 Subject: [PATCH 1/3] chore: enable typescript 4.3 option noImplicitOverride Enable typescript 4.3 feature noImplicitOverride to improve code quality. Adapt code to compile by adding override keyword or avoid overriding. Update some dev-dependencies and correct some lint warnings. Configure tsx files to use LF instead CRLF to stay in sync with ts files. --- .gitattributes | 1 + .../package.json | 2 +- .../auto-instrumentations-node/package.json | 2 +- .../auto-instrumentations-web/package.json | 2 +- package.json | 8 +-- .../opentelemetry-host-metrics/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-test-utils/package.json | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 6 +-- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../src/instrumentation.ts | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../src/instrumentation.ts | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 8 +-- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../src/instrumentation.ts | 5 +- .../package.json | 2 +- .../src/instrumentation.ts | 4 +- .../package.json | 2 +- .../test-react-components/AllLifecycles.tsx | 50 ++++++++++++------- .../MissingComponentDidMount.tsx | 47 ++++++++++------- .../MissingComponentDidUpdate.tsx | 47 ++++++++++------- .../MissingGetSnapshotBeforeUpdate.tsx | 42 ++++++++++------ .../test-react-components/MissingRender.tsx | 41 +++++++++------ .../MissingShouldComponentUpdate.tsx | 43 ++++++++++------ .../ShouldComponentUpdateFalse.tsx | 50 ++++++++++++------- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- tsconfig.base.json | 1 + 55 files changed, 266 insertions(+), 179 deletions(-) diff --git a/.gitattributes b/.gitattributes index 7d65e84970..1c37b85cd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ # JavaScript, TypeScript, c, and h source files *.js text eol=lf *.ts text eol=lf +*.tsx text eol=lf *.h text eol=lf diff=cpp *.c text eol=lf diff=cpp diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index d774a8a1e6..6b4f2ec0c5 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -57,7 +57,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/resources": "^0.22.0" diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index ec12b1ebad..90cbc0ce9e 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -41,7 +41,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 067f4f8727..03382660c0 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -53,7 +53,7 @@ "sinon": "10.0.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0", "webpack-cli": "4.7.2", "webpack-merge": "5.8.0" diff --git a/package.json b/package.json index d0c1482c38..cb65259341 100644 --- a/package.json +++ b/package.json @@ -42,9 +42,9 @@ "devDependencies": { "@commitlint/cli": "11.0.0", "@commitlint/config-conventional": "11.0.0", - "@typescript-eslint/eslint-plugin": "4.26.1", - "@typescript-eslint/parser": "4.26.1", - "eslint": "7.28.0", + "@typescript-eslint/eslint-plugin": "4.28.0", + "@typescript-eslint/parser": "4.28.0", + "eslint": "7.29.0", "eslint-config-airbnb-base": "14.2.1", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.23.4", @@ -52,7 +52,7 @@ "husky": "4.3.8", "lerna": "3.22.1", "lerna-changelog": "1.0.1", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "husky": { "hooks": { diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 0208f5ca86..fea47abf76 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -56,7 +56,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/api-metrics": "^0.22.0", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index f226a59d0d..07bc4e2eb6 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -75,7 +75,7 @@ "sinon": "10.0.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0" }, "dependencies": { diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index ee3a45d009..43ca3a3c1c 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -30,7 +30,7 @@ "@opentelemetry/api": "1.0.0", "@types/node": "14.17.3", "gts": "3.1.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/core": "0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 19986fd41b..2e56229413 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -55,7 +55,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts index 53bf84c90d..758644bcb6 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts @@ -71,11 +71,11 @@ export const traceContextEnvironmentKey = '_X_AMZN_TRACE_ID'; export class AwsLambdaInstrumentation extends InstrumentationBase { private _tracerProvider: TracerProvider | undefined; - constructor(protected _config: AwsLambdaInstrumentationConfig = {}) { + constructor(protected override _config: AwsLambdaInstrumentationConfig = {}) { super('@opentelemetry/instrumentation-aws-lambda', VERSION, _config); } - setConfig(config: AwsLambdaInstrumentationConfig = {}) { + override setConfig(config: AwsLambdaInstrumentationConfig = {}) { this._config = config; } @@ -218,7 +218,7 @@ export class AwsLambdaInstrumentation extends InstrumentationBase { }; } - setTracerProvider(tracerProvider: TracerProvider) { + override setTracerProvider(tracerProvider: TracerProvider) { super.setTracerProvider(tracerProvider); this._tracerProvider = tracerProvider; } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index bf2dcbf859..b18c5ff8af 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -60,7 +60,7 @@ "rimraf": "3.0.2", "sinon": "9.2.4", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts index b8db62560f..a673a364bd 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts @@ -67,11 +67,11 @@ export class BunyanInstrumentation extends InstrumentationBase< ]; } - getConfig(): BunyanInstrumentationConfig { + override getConfig(): BunyanInstrumentationConfig { return this._config; } - setConfig(config: BunyanInstrumentationConfig) { + override setConfig(config: BunyanInstrumentationConfig) { this._config = config; } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 1f2152af26..90ffc0863e 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -60,7 +60,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts index 477efd0ca4..d47cf7565b 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts @@ -37,7 +37,7 @@ import { VERSION } from './version'; * Dns instrumentation for Opentelemetry */ export class DnsInstrumentation extends InstrumentationBase { - constructor(protected _config: DnsInstrumentationConfig = {}) { + constructor(protected override _config: DnsInstrumentationConfig = {}) { super('@opentelemetry/instrumentation-dns', VERSION, _config); } diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index db369b7f34..653139f964 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -58,7 +58,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/core": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 98cc84ca91..1c8dd64218 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -59,7 +59,7 @@ "rimraf": "3.0.2", "semver": "7.3.5", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 46c839231a..9b1bd86fdb 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -57,7 +57,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts index a5819b1e87..c4f0bc69df 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts @@ -77,7 +77,7 @@ export class GraphQLInstrumentation extends InstrumentationBase { return this._config as GraphQLInstrumentationParsedConfig; } - setConfig(config: GraphQLInstrumentationConfig & InstrumentationConfig = {}) { + override setConfig(config: GraphQLInstrumentationConfig = {}) { this._config = Object.assign({}, DEFAULT_CONFIG, config); } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 7a9b6bcb90..3dbae3202f 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -58,7 +58,7 @@ "rimraf": "3.0.2", "semver": "7.3.5", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index bf19618908..0999f1a27c 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -62,7 +62,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 0403c07cf1..da50a0ab51 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -58,7 +58,7 @@ "rimraf": "3.0.2", "sqlite3": "5.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index c1657e5007..d075c4a04e 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -60,7 +60,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/core": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index f1e98fc1ee..1a31fbedc1 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -59,7 +59,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts index 5fa9f9c3c4..f23f9c6373 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts @@ -46,7 +46,7 @@ const supportedVersions = ['>=3.3 <4']; export class MongoDBInstrumentation extends InstrumentationBase< typeof mongodb > { - constructor(protected _config: MongoDBInstrumentationConfig = {}) { + constructor(protected override _config: MongoDBInstrumentationConfig = {}) { super('@opentelemetry/instrumentation-mongodb', VERSION, _config); } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 8fd39ebf98..42b42662df 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -57,7 +57,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts index 301b85e51d..82ea9770d4 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts @@ -36,8 +36,8 @@ export class MySQLInstrumentation extends InstrumentationBase< [SemanticAttributes.DB_SYSTEM]: MySQLInstrumentation.COMPONENT, }; - constructor(protected _config: MySQLInstrumentationConfig = {}) { - super('@opentelemetry/instrumentation-mysql', VERSION, _config); + constructor(config?: MySQLInstrumentationConfig) { + super('@opentelemetry/instrumentation-mysql', VERSION, config); } protected init() { diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 512cf625fd..f428220ad4 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -58,7 +58,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.2.4" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts index 3a5fcd5f04..16b659f994 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts @@ -41,8 +41,8 @@ export class MySQL2Instrumentation extends InstrumentationBase< [SemanticAttributes.DB_SYSTEM]: MySQL2Instrumentation.COMPONENT, }; - constructor(protected _config: MySQL2InstrumentationConfig = {}) { - super('@opentelemetry/instrumentation-mysql2', VERSION, _config); + constructor(config?: MySQL2InstrumentationConfig) { + super('@opentelemetry/instrumentation-mysql2', VERSION, config); } protected init() { diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 00c9c15f0a..63413be077 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -58,7 +58,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts index 9a71741296..8c4fa9abc3 100644 --- a/plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts @@ -33,7 +33,7 @@ import { Socket } from 'net'; import { TLSSocket } from 'tls'; export class NetInstrumentation extends InstrumentationBase { - constructor(protected _config: InstrumentationConfig = {}) { + constructor(_config?: InstrumentationConfig) { super('@opentelemetry/instrumentation-net', VERSION, _config); } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index c6c6ba9fab..cd22c6a321 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -66,7 +66,7 @@ "pg-pool": "3.3.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 56c04f8bea..a271e9bf10 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -62,7 +62,7 @@ "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts index ae264263b6..292c9b3fa5 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts @@ -82,20 +82,20 @@ export class PinoInstrumentation extends InstrumentationBase { ]; } - getConfig(): PinoInstrumentationConfig { + override getConfig(): PinoInstrumentationConfig { return this._config; } - setConfig(config: PinoInstrumentationConfig) { + override setConfig(config: PinoInstrumentationConfig) { this._config = config; } - enable() { + override enable() { super.enable(); this._isEnabled = true; } - disable() { + override disable() { super.disable(); this._isEnabled = false; } diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 868bbd5a23..4199975ebd 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -61,7 +61,7 @@ "redis": "3.1.2", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-redis/src/instrumentation.ts index 17e3adeec4..676a9a374b 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-redis/src/instrumentation.ts @@ -38,11 +38,11 @@ export class RedisInstrumentation extends InstrumentationBase< > { static readonly COMPONENT = 'redis'; - constructor(protected _config: RedisInstrumentationConfig = {}) { + constructor(protected override _config: RedisInstrumentationConfig = {}) { super('@opentelemetry/instrumentation-redis', VERSION, _config); } - setConfig(config: RedisInstrumentationConfig = {}) { + override setConfig(config: RedisInstrumentationConfig = {}) { this._config = Object.assign({}, DEFAULT_CONFIG, config); } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index d18af6849c..4fb35f7761 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -57,7 +57,7 @@ "restify": "4.3.4", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/core": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 77fd5a6739..8b736b93d4 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -57,7 +57,7 @@ "rimraf": "3.0.2", "router": "1.3.5", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 248ce8a143..bead9d7a06 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -59,7 +59,7 @@ "rimraf": "3.0.2", "sinon": "9.2.4", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "winston": "3.3.3", "winston2": "npm:winston@2.4.5" }, diff --git a/plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts index 8cd1ef5d74..16ef6b9a48 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts @@ -102,11 +102,11 @@ export class WinstonInstrumentation extends InstrumentationBase { ]; } - getConfig(): WinstonInstrumentationConfig { + override getConfig(): WinstonInstrumentationConfig { return this._config; } - setConfig(config: WinstonInstrumentationConfig) { + override setConfig(config: WinstonInstrumentationConfig) { this._config = config; } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index b1aad19c0b..890253bc6f 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -72,7 +72,7 @@ "sinon": "10.0.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0", "webpack-cli": "4.7.2", "webpack-merge": "5.8.0" diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts index 27712e63cc..376d7c689b 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts @@ -48,7 +48,6 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { readonly component: string = 'document-load'; readonly version: string = '1'; moduleName = this.component; - protected _config!: InstrumentationConfig; /** * @@ -235,7 +234,7 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { /** * implements enable function */ - enable() { + override enable() { // remove previously attached load to avoid adding the same event twice // in case of multiple enable calling. window.removeEventListener('load', this._onDocumentLoaded); @@ -245,7 +244,7 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { /** * implements disable function */ - disable() { + override disable() { window.removeEventListener('load', this._onDocumentLoaded); } } diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 8fc0ad97bf..a03d74c1df 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -74,7 +74,7 @@ "sinon": "10.0.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0", "webpack-cli": "4.7.2", "webpack-merge": "5.8.0", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts index 2f5663f36c..6e0cbb9283 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts @@ -530,7 +530,7 @@ export class UserInteractionInstrumentation extends InstrumentationBase /** * implements enable function */ - enable() { + override enable() { const ZoneWithPrototype = this.getZoneWithPrototype(); api.diag.debug( 'applying patch to', @@ -599,7 +599,7 @@ export class UserInteractionInstrumentation extends InstrumentationBase /** * implements unpatch function */ - disable() { + override disable() { const ZoneWithPrototype = this.getZoneWithPrototype(); api.diag.debug( 'removing patch from', diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 8de9b0c2ba..6056a5af51 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -76,7 +76,7 @@ "sinon": "10.0.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0", "webpack-cli": "4.7.2", "webpack-merge": "5.8.0" diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx index 141b8a22a2..41fa913c49 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx @@ -1,28 +1,40 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class AllLifecycles extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } + + override componentDidMount() {} - componentDidMount(){ - } + override componentDidUpdate(prevProps: any) {} - componentDidUpdate(prevProps: any){ - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return true; + } - shouldComponentUpdate(nextProps: any, nextState: any){ - return true; - } - - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx index a83121ed0c..43dfd05642 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx @@ -1,25 +1,38 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class MissingComponentDidMount extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } + + override componentDidUpdate(prevProps: any) {} - componentDidUpdate(prevProps: any){ - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return true; + } - shouldComponentUpdate(nextProps: any, nextState: any){ - return true; - } - - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx index 6c12ad7fab..e562de995f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx @@ -1,25 +1,38 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class MissingComponentDidUpdate extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } + + override componentDidMount() {} - componentDidMount(){ - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return true; + } - shouldComponentUpdate(nextProps: any, nextState: any){ - return true; - } - - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx index 27578a78f3..e435d49202 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx @@ -1,24 +1,36 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class MissingGetSnapshotBeforeUpdate extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } - componentDidMount(){ - } + override componentDidMount() {} - componentDidUpdate(prevProps: any){ - } + override componentDidUpdate(prevProps: any) {} - shouldComponentUpdate(nextProps: any, nextState: any){ - return true; - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return true; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx index c1935f0d7d..035037998f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx @@ -1,22 +1,35 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import { BaseOpenTelemetryComponent } from '../../src'; export default class MissingRender extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } - componentDidMount(){ - } + override componentDidMount() {} - componentDidUpdate(prevProps: any){ - } + override componentDidUpdate(prevProps: any) {} - shouldComponentUpdate(nextProps: any, nextState: any){ - return true; - } - - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return true; + } + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx index 92ac7c6511..da39013ea8 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx @@ -1,25 +1,36 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class MisingShouldComponentUpdate extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } - - componentDidMount(){ - } + constructor(props: Readonly) { + super(props); + } - componentDidUpdate(prevProps: any){ - } + override componentDidMount() {} - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override componentDidUpdate(prevProps: any) {} + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx index 10beac419b..cec53716e6 100644 --- a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx +++ b/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx @@ -1,28 +1,40 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import * as React from 'react'; import { BaseOpenTelemetryComponent } from '../../src'; export default class ShouldComponentUpdateFalse extends BaseOpenTelemetryComponent { - constructor(props: Readonly){ - super(props); - } + constructor(props: Readonly) { + super(props); + } + + override componentDidMount() {} - componentDidMount(){ - } + override componentDidUpdate(prevProps: any) {} - componentDidUpdate(prevProps: any){ - } + override shouldComponentUpdate(nextProps: any, nextState: any) { + return false; + } - shouldComponentUpdate(nextProps: any, nextState: any){ - return false; - } - - getSnapshotBeforeUpdate(prevProps: any, prevState: any){ - return null; - } + override getSnapshotBeforeUpdate(prevProps: any, prevState: any) { + return null; + } - render() { - return( -
- ); - } + override render() { + return
; + } } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index e8244c67f2..f580dd427b 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -67,7 +67,7 @@ "rimraf": "3.0.2", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0" }, "dependencies": { diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 980a6c24f3..a732a02c2a 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -56,6 +56,6 @@ "rimraf": "3.0.2", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" } } diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 09602f1567..6424a7e0c1 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -67,7 +67,7 @@ "nyc": "15.1.0", "ts-loader": "8.3.0", "ts-mocha": "8.0.0", - "typescript": "4.3.2", + "typescript": "4.3.4", "webpack": "4.46.0" } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 1b7e8c62dd..8046371bee 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,6 +8,7 @@ "module": "commonjs", "noEmitOnError": true, "noFallthroughCasesInSwitch": true, + "noImplicitOverride": true, "noImplicitReturns": true, "noUnusedLocals": true, "pretty": true, From 945ad02623860af90bfa71f91c67affdcb4433a0 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Wed, 30 Jun 2021 19:13:47 +0200 Subject: [PATCH 2/3] chore: update memcached --- .../node/opentelemetry-instrumentation-memcached/package.json | 2 +- .../src/instrumentation.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 57829ead89..67f9419ae1 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -61,7 +61,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.3.2" + "typescript": "4.3.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.22.0", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts index 4bc30e87df..7ffca113b9 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts @@ -43,7 +43,7 @@ export class Instrumentation extends InstrumentationBase { ); } - setConfig(config: InstrumentationConfig = {}) { + override setConfig(config: InstrumentationConfig = {}) { this._config = Object.assign({}, Instrumentation.DEFAULT_CONFIG, config); } From fe8bcbbb149757b58f9e381f88a153d76738a324 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Wed, 30 Jun 2021 20:10:08 +0200 Subject: [PATCH 3/3] chore: update after merge from main --- .../node/opentelemetry-instrumentation-cassandra/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 9033d1ffb6..24ec51713a 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -62,7 +62,7 @@ "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.3.2", + "typescript": "4.3.4", "cassandra-driver": "4.6.3" }, "dependencies": {