From d5517812b31d9206131bf1df4f8a3b5183ab07fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= Date: Tue, 1 Jun 2021 21:40:04 +0200 Subject: [PATCH] chore: update typescript to 4.3 and enable noImplicitOverride (#2241) Co-authored-by: Daniel Dyla --- backwards-compatability/node10/package.json | 2 +- backwards-compatability/node12/package.json | 2 +- backwards-compatability/node8/package.json | 2 +- .../package.json | 2 +- package.json | 10 +++---- .../opentelemetry-api-metrics/package.json | 2 +- .../test/api/api.test.ts | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../opentelemetry-context-zone/package.json | 2 +- packages/opentelemetry-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/CollectorExporterNodeBase.ts | 4 +-- .../package.json | 2 +- .../src/types.ts | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/fetch.ts | 4 +-- .../package.json | 2 +- .../src/grpc-js/index.ts | 4 +-- .../src/grpc/index.ts | 4 +-- .../package.json | 2 +- .../src/http.ts | 2 +- .../package.json | 2 +- .../src/xhr.ts | 4 +-- .../package.json | 2 +- .../src/platform/browser/instrumentation.ts | 4 +-- .../test/common/Instrumentation.test.ts | 6 ++-- .../test/common/autoLoader.test.ts | 4 +-- .../test/common/autoLoaderUtils.test.ts | 4 +-- packages/opentelemetry-metrics/package.json | 2 +- .../src/BaseObserverMetric.ts | 2 +- .../src/SumObserverMetric.ts | 2 +- packages/opentelemetry-node/package.json | 2 +- .../src/NodeTracerProvider.ts | 6 ++-- .../opentelemetry-propagator-b3/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-sdk-node/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../src/shim.ts | 30 +++++++++---------- packages/opentelemetry-tracing/package.json | 2 +- .../test/BasicTracerProvider.test.ts | 2 +- .../test/export/TestTracingSpanExporter.ts | 6 ++-- packages/opentelemetry-web/package.json | 2 +- .../src/WebTracerProvider.ts | 2 +- packages/template/package.json | 2 +- tsconfig.base.json | 1 + 54 files changed, 86 insertions(+), 85 deletions(-) diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json index e16056a20e..4e28f51035 100644 --- a/backwards-compatability/node10/package.json +++ b/backwards-compatability/node10/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@types/node": "10.17.59", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json index 38dab3f3e0..5d8f6304fc 100644 --- a/backwards-compatability/node12/package.json +++ b/backwards-compatability/node12/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@types/node": "12.20.11", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json index 870628238f..9b1d4e1af1 100644 --- a/backwards-compatability/node8/package.json +++ b/backwards-compatability/node8/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@types/node": "8.10.66", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 9370b68f8b..b99969d0f2 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@opentelemetry/api": "^0.20.0", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/package.json b/package.json index 93c78d1c34..1f11b0db1e 100644 --- a/package.json +++ b/package.json @@ -47,21 +47,21 @@ "devDependencies": { "@commitlint/cli": "12.1.1", "@commitlint/config-conventional": "12.1.1", - "@typescript-eslint/eslint-plugin": "4.22.0", - "@typescript-eslint/parser": "4.22.0", + "@typescript-eslint/eslint-plugin": "4.25.0", + "@typescript-eslint/parser": "4.25.0", "beautify-benchmark": "0.2.4", "benchmark": "2.1.4", - "eslint": "7.25.0", + "eslint": "7.27.0", "eslint-config-airbnb-base": "14.2.1", "eslint-plugin-header": "3.1.1", - "eslint-plugin-import": "2.22.1", + "eslint-plugin-import": "2.23.3", "eslint-plugin-node": "11.1.0", "gh-pages": "3.1.0", "husky": "4.3.8", "lerna": "3.22.1", "lerna-changelog": "1.0.1", "markdownlint-cli": "0.27.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "update-ts-references": "2.3.0" }, "husky": { diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json index 79e9d1c7c0..e4e05255ac 100644 --- a/packages/opentelemetry-api-metrics/package.json +++ b/packages/opentelemetry-api-metrics/package.json @@ -72,7 +72,7 @@ "nyc": "15.1.0", "ts-loader": "8.2.0", "ts-mocha": "8.0.0", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0" } } diff --git a/packages/opentelemetry-api-metrics/test/api/api.test.ts b/packages/opentelemetry-api-metrics/test/api/api.test.ts index 674e9aebd4..e9a837230e 100644 --- a/packages/opentelemetry-api-metrics/test/api/api.test.ts +++ b/packages/opentelemetry-api-metrics/test/api/api.test.ts @@ -38,7 +38,7 @@ describe('API', () => { }); class TestMeterProvider extends NoopMeterProvider { - getMeter() { + override getMeter() { return dummyMeter; } } diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 6578681517..1513c49ce7 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -50,7 +50,7 @@ "rimraf": "3.0.2", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index ec2cac8498..4f026dd2e9 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -68,7 +68,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "zone.js": "0.11.4" diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index de4f2493e6..acd4ffe2fd 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -61,7 +61,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 203df4e833..fa168f9ba7 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -76,7 +76,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0" }, "peerDependencies": { diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json index 2c05c1d97b..6b4be1752c 100644 --- a/packages/opentelemetry-exporter-collector-grpc/package.json +++ b/packages/opentelemetry-exporter-collector-grpc/package.json @@ -60,7 +60,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json index 276557a17d..725bad7e55 100644 --- a/packages/opentelemetry-exporter-collector-proto/package.json +++ b/packages/opentelemetry-exporter-collector-proto/package.json @@ -60,7 +60,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts index 3a8bc2dfa6..7fbb4f6057 100644 --- a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts +++ b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts @@ -57,7 +57,7 @@ export abstract class CollectorExporterNodeBase< this._sendingPromises.push(promise); } - onInit(config: CollectorExporterNodeConfigBase): void { + override onInit(config: CollectorExporterNodeConfigBase): void { this._isShutdown = false; // defer to next tick and lazy load to avoid loading protobufjs too early // and making this impossible to be instrumented @@ -68,7 +68,7 @@ export abstract class CollectorExporterNodeBase< }); } - send( + override send( objects: ExportItem[], onSuccess: () => void, onError: (error: collectorTypes.CollectorExporterError) => void diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json index a71b641742..6b259563b4 100644 --- a/packages/opentelemetry-exporter-collector/package.json +++ b/packages/opentelemetry-exporter-collector/package.json @@ -76,7 +76,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-exporter-collector/src/types.ts b/packages/opentelemetry-exporter-collector/src/types.ts index d1de81259e..e8ae3ff65e 100644 --- a/packages/opentelemetry-exporter-collector/src/types.ts +++ b/packages/opentelemetry-exporter-collector/src/types.ts @@ -315,7 +315,7 @@ export namespace opentelemetryProto { */ export class CollectorExporterError extends Error { readonly code?: number; - readonly name: string = 'CollectorExporterError'; + override readonly name: string = 'CollectorExporterError'; readonly data?: string; constructor(message?: string, code?: number, data?: string) { diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 53314e2353..e9014e70a6 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -53,7 +53,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json index cb3157afca..7fcc3d0aa3 100644 --- a/packages/opentelemetry-exporter-prometheus/package.json +++ b/packages/opentelemetry-exporter-prometheus/package.json @@ -50,7 +50,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 03d06876ad..2b409e9e90 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -74,7 +74,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json index 5e9bb8d8dd..23659ed8a8 100644 --- a/packages/opentelemetry-instrumentation-fetch/package.json +++ b/packages/opentelemetry-instrumentation-fetch/package.json @@ -72,7 +72,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index ef12407ff9..42b45b2d8e 100644 --- a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -458,7 +458,7 @@ export class FetchInstrumentation extends InstrumentationBase< /** * implements enable function */ - enable() { + override enable() { if (isWrapped(window.fetch)) { this._unwrap(window, 'fetch'); api.diag.debug('removing previous patch for constructor'); @@ -469,7 +469,7 @@ export class FetchInstrumentation extends InstrumentationBase< /** * implements unpatch function */ - disable() { + override disable() { this._unwrap(window, 'fetch'); this._usedResources = new WeakSet(); } diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json index 34f9e5d4cd..f12cb09f1e 100644 --- a/packages/opentelemetry-instrumentation-grpc/package.json +++ b/packages/opentelemetry-instrumentation-grpc/package.json @@ -63,7 +63,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts index 9db0311667..753ac06b7b 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts @@ -57,14 +57,14 @@ import { AttributeNames } from '../enums/AttributeNames'; export class GrpcJsInstrumentation extends InstrumentationBase { constructor( - protected _config: GrpcInstrumentationConfig & InstrumentationConfig = {}, + protected override _config: GrpcInstrumentationConfig & InstrumentationConfig = {}, name: string, version: string ) { super(name, version, _config); } - public setConfig( + public override setConfig( config: GrpcInstrumentationConfig & InstrumentationConfig = {} ) { this._config = Object.assign({}, config); diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts b/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts index 84deb7b228..ade2ea3aab 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts @@ -56,14 +56,14 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< typeof grpcTypes > { constructor( - protected _config: GrpcInstrumentationConfig & InstrumentationConfig = {}, + protected override _config: GrpcInstrumentationConfig & InstrumentationConfig = {}, name: string, version: string ) { super(name, version, _config); } - public setConfig( + public override setConfig( config: GrpcInstrumentationConfig & InstrumentationConfig = {} ) { this._config = Object.assign({}, config); diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json index 34f3b22af0..84b9954f3e 100644 --- a/packages/opentelemetry-instrumentation-http/package.json +++ b/packages/opentelemetry-instrumentation-http/package.json @@ -65,7 +65,7 @@ "superagent": "6.1.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-instrumentation-http/src/http.ts b/packages/opentelemetry-instrumentation-http/src/http.ts index 25c22e7fbf..b3a2db9931 100644 --- a/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/packages/opentelemetry-instrumentation-http/src/http.ts @@ -73,7 +73,7 @@ export class HttpInstrumentation extends InstrumentationBase { return this._config; } - setConfig(config: HttpInstrumentationConfig & InstrumentationConfig = {}) { + override setConfig(config: HttpInstrumentationConfig & InstrumentationConfig = {}) { this._config = Object.assign({}, config); } diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json index 5f3a336278..dc1b140a37 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -71,7 +71,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 0cca5535c6..25ff68ec18 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -510,7 +510,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase { it('should enable instrumentation by default', () => { let called = false; class TestInstrumentation2 extends TestInstrumentation { - enable() { + override enable() { called = true; } } diff --git a/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts b/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts index 4d9aa12e75..181eb12c0e 100644 --- a/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts +++ b/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts @@ -29,8 +29,8 @@ class FooInstrumentation extends InstrumentationBase { init() { return []; } - enable() {} - disable() {} + override enable() {} + override disable() {} } describe('autoLoader', () => { diff --git a/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts b/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts index ae2de44502..2477225004 100644 --- a/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts +++ b/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts @@ -27,9 +27,9 @@ class FooInstrumentation extends InstrumentationBase { return []; } - enable() {} + override enable() {} - disable() {} + override disable() {} } // const fooInstrumentation = new FooInstrumentation(); diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json index eb4da1f628..609b62c750 100644 --- a/packages/opentelemetry-metrics/package.json +++ b/packages/opentelemetry-metrics/package.json @@ -56,7 +56,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-metrics/src/BaseObserverMetric.ts b/packages/opentelemetry-metrics/src/BaseObserverMetric.ts index 30ae3af1e8..a3098f119c 100644 --- a/packages/opentelemetry-metrics/src/BaseObserverMetric.ts +++ b/packages/opentelemetry-metrics/src/BaseObserverMetric.ts @@ -55,7 +55,7 @@ export abstract class BaseObserverMetric ); } - async getMetricRecord(): Promise { + override async getMetricRecord(): Promise { const observerResult = new ObserverResult(); await this._callback(observerResult); diff --git a/packages/opentelemetry-metrics/src/SumObserverMetric.ts b/packages/opentelemetry-metrics/src/SumObserverMetric.ts index 2f4c723ec9..7244bc88d4 100644 --- a/packages/opentelemetry-metrics/src/SumObserverMetric.ts +++ b/packages/opentelemetry-metrics/src/SumObserverMetric.ts @@ -45,7 +45,7 @@ export class SumObserverMetric ); } - protected _processResults(observerResult: ObserverResult) { + protected override _processResults(observerResult: ObserverResult) { observerResult.values.forEach((value, labels) => { const instrument = this.bind(labels); // SumObserver is monotonic which means it should only accept values diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json index 7d7be4daf4..187699480f 100644 --- a/packages/opentelemetry-node/package.json +++ b/packages/opentelemetry-node/package.json @@ -57,7 +57,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-node/src/NodeTracerProvider.ts b/packages/opentelemetry-node/src/NodeTracerProvider.ts index e2f5f5fba0..326200a296 100644 --- a/packages/opentelemetry-node/src/NodeTracerProvider.ts +++ b/packages/opentelemetry-node/src/NodeTracerProvider.ts @@ -36,7 +36,7 @@ import { JaegerPropagator } from '@opentelemetry/propagator-jaeger'; * @param config Configuration object for SDK registration */ export class NodeTracerProvider extends BasicTracerProvider { - protected static readonly _registeredPropagators = new Map< + protected static override readonly _registeredPropagators = new Map< string, PROPAGATOR_FACTORY >([ @@ -56,7 +56,7 @@ export class NodeTracerProvider extends BasicTracerProvider { super(config); } - register(config: SDKRegistrationConfig = {}) { + override register(config: SDKRegistrationConfig = {}) { if (config.contextManager === undefined) { const ContextManager = semver.gte(process.version, '14.8.0') ? AsyncLocalStorageContextManager @@ -68,7 +68,7 @@ export class NodeTracerProvider extends BasicTracerProvider { super.register(config); } - protected _getPropagator(name: string): TextMapPropagator | undefined { + protected override _getPropagator(name: string): TextMapPropagator | undefined { return ( super._getPropagator(name) || NodeTracerProvider._registeredPropagators.get(name)?.() diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 3218776db9..ee37dd9b5a 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -59,6 +59,6 @@ "rimraf": "3.0.2", "ts-loader": "8.2.0", "ts-mocha": "8.0.0", - "typescript": "4.2.4" + "typescript": "4.3.2" } } diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index b944425dd8..4ee8beae3b 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -67,7 +67,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0" }, "peerDependencies": { diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json index 1a774da5eb..0072c00cc2 100644 --- a/packages/opentelemetry-resource-detector-aws/package.json +++ b/packages/opentelemetry-resource-detector-aws/package.json @@ -51,7 +51,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json index 57486e7130..4bb08dee6c 100644 --- a/packages/opentelemetry-resource-detector-gcp/package.json +++ b/packages/opentelemetry-resource-detector-gcp/package.json @@ -51,7 +51,7 @@ "rimraf": "3.0.2", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index c566fa2a28..54dc765e51 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -60,7 +60,7 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-sdk-node/package.json b/packages/opentelemetry-sdk-node/package.json index 2840d17503..93c0a8e3c0 100644 --- a/packages/opentelemetry-sdk-node/package.json +++ b/packages/opentelemetry-sdk-node/package.json @@ -70,6 +70,6 @@ "sinon": "10.0.0", "ts-loader": "8.2.0", "ts-mocha": "8.0.0", - "typescript": "4.2.4" + "typescript": "4.3.2" } } diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 9394b07656..6d6fc4892f 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -54,6 +54,6 @@ "sinon": "10.0.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4" + "typescript": "4.3.2" } } diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 24e94538aa..c39054cefe 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -52,7 +52,7 @@ "ts-node": "9.1.1", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "peerDependencies": { "@opentelemetry/api": "^0.20.0" diff --git a/packages/opentelemetry-shim-opentracing/src/shim.ts b/packages/opentelemetry-shim-opentracing/src/shim.ts index 18632de9d3..0659409ad9 100644 --- a/packages/opentelemetry-shim-opentracing/src/shim.ts +++ b/packages/opentelemetry-shim-opentracing/src/shim.ts @@ -95,14 +95,14 @@ export class SpanContextShim extends opentracing.SpanContext { /** * Returns the trace ID as a string. */ - toTraceId(): string { + override toTraceId(): string { return this._spanContext.traceId; } /** * Returns the span ID as a string. */ - toSpanId(): string { + override toSpanId(): string { return this._spanContext.spanId; } @@ -130,7 +130,7 @@ export class TracerShim extends opentracing.Tracer { this._propagators = propagators; } - startSpan( + override startSpan( name: string, options: opentracing.SpanOptions = {} ): opentracing.Span { @@ -155,7 +155,7 @@ export class TracerShim extends opentracing.Tracer { return new SpanShim(this, span, baggage); } - _inject( + override _inject( spanContext: opentracing.SpanContext, format: string, carrier: unknown @@ -182,7 +182,7 @@ export class TracerShim extends opentracing.Tracer { } } - _extract(format: string, carrier: unknown): opentracing.SpanContext | null { + override _extract(format: string, carrier: unknown): opentracing.SpanContext | null { if (format === opentracing.FORMAT_BINARY) { api.diag.warn('OpentracingShim.extract() does not support FORMAT_BINARY'); // @todo: Implement binary format @@ -243,14 +243,14 @@ export class SpanShim extends opentracing.Span { * * @returns a {@link SpanContextShim} containing the underlying context. */ - context(): opentracing.SpanContext { + override context(): opentracing.SpanContext { return this._contextShim; } /** * Returns the {@link opentracing.Tracer} that created the span. */ - tracer(): opentracing.Tracer { + override tracer(): opentracing.Tracer { return this._tracerShim; } @@ -259,7 +259,7 @@ export class SpanShim extends opentracing.Span { * * @param name the Span name. */ - setOperationName(name: string): this { + override setOperationName(name: string): this { this._span.updateName(name); return this; } @@ -270,7 +270,7 @@ export class SpanShim extends opentracing.Span { * * @param finishTime An optional timestamp to explicitly set the span's end time. */ - finish(finishTime?: number): void { + override finish(finishTime?: number): void { this._span.end(finishTime); } @@ -279,7 +279,7 @@ export class SpanShim extends opentracing.Span { * @param eventName name of the event. * @param payload an arbitrary object to be attached to the event. */ - logEvent(eventName: string, payload?: SpanAttributes): void { + override logEvent(eventName: string, payload?: SpanAttributes): void { this._span.addEvent(eventName, payload); } @@ -287,7 +287,7 @@ export class SpanShim extends opentracing.Span { * Logs a set of key value pairs. Since OpenTelemetry only supports events, * the KV pairs are used as attributes on an event named "log". */ - log(keyValuePairs: SpanAttributes, _timestamp?: number): this { + override log(keyValuePairs: SpanAttributes, _timestamp?: number): this { // @todo: Handle timestamp this._span.addEvent('log', keyValuePairs); return this; @@ -297,7 +297,7 @@ export class SpanShim extends opentracing.Span { * Adds a set of tags to the span. * @param keyValueMap set of KV pairs representing tags */ - addTags(keyValueMap: SpanAttributes): this { + override addTags(keyValueMap: SpanAttributes): this { this._span.setAttributes(keyValueMap); return this; } @@ -308,7 +308,7 @@ export class SpanShim extends opentracing.Span { * @param key key for the tag * @param value value for the tag */ - setTag(key: string, value: SpanAttributeValue): this { + override setTag(key: string, value: SpanAttributeValue): this { if ( key === opentracing.Tags.ERROR && (value === true || value === 'true') @@ -321,11 +321,11 @@ export class SpanShim extends opentracing.Span { return this; } - getBaggageItem(key: string): string | undefined { + override getBaggageItem(key: string): string | undefined { return this._contextShim.getBaggageItem(key); } - setBaggageItem(key: string, value: string): this { + override setBaggageItem(key: string, value: string): this { this._contextShim.setBaggageItem(key, value); return this; } diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json index f417007a6f..73dad83f60 100644 --- a/packages/opentelemetry-tracing/package.json +++ b/packages/opentelemetry-tracing/package.json @@ -74,7 +74,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0" }, "peerDependencies": { diff --git a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts b/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts index 906fb79e9d..43432fcb05 100644 --- a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts @@ -225,7 +225,7 @@ describe('BasicTracerProvider', () => { describe('exporter', () => { class CustomTracerProvider extends BasicTracerProvider { - protected _getSpanExporter(name: string): SpanExporter | undefined { + protected override _getSpanExporter(name: string): SpanExporter | undefined { return name === 'memory' ? new InMemorySpanExporter() : BasicTracerProvider._registeredExporters.get(name)?.(); diff --git a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts b/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts index 499faf91eb..758f38a26d 100644 --- a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts +++ b/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts @@ -58,7 +58,7 @@ export class TestTracingSpanExporter extends InMemorySpanExporter { ); } - export( + override export( spans: ReadableSpan[], resultCallback: (result: ExportResult) => void ): void { @@ -71,13 +71,13 @@ export class TestTracingSpanExporter extends InMemorySpanExporter { super.export(spans, resultCallback); } - shutdown(): Promise { + override shutdown(): Promise { return super.shutdown().then(() => { this._exporterCreatedSpans = []; }); } - reset() { + override reset() { super.reset(); this._exporterCreatedSpans = []; } diff --git a/packages/opentelemetry-web/package.json b/packages/opentelemetry-web/package.json index 3025afae7a..50b7f862d8 100644 --- a/packages/opentelemetry-web/package.json +++ b/packages/opentelemetry-web/package.json @@ -72,7 +72,7 @@ "ts-loader": "8.2.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.2.4", + "typescript": "4.3.2", "webpack": "4.46.0", "webpack-cli": "4.6.0", "webpack-merge": "5.7.3" diff --git a/packages/opentelemetry-web/src/WebTracerProvider.ts b/packages/opentelemetry-web/src/WebTracerProvider.ts index 0212f132af..15065502cb 100644 --- a/packages/opentelemetry-web/src/WebTracerProvider.ts +++ b/packages/opentelemetry-web/src/WebTracerProvider.ts @@ -55,7 +55,7 @@ export class WebTracerProvider extends BasicTracerProvider { * * @param config Configuration object for SDK registration */ - register(config: SDKRegistrationConfig = {}) { + override register(config: SDKRegistrationConfig = {}) { if (config.contextManager === undefined) { config.contextManager = new StackContextManager(); } diff --git a/packages/template/package.json b/packages/template/package.json index 4c4901cff6..4b334dc907 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -66,7 +66,7 @@ ], "devDependencies": { "@types/node": "14.14.43", - "typescript": "4.2.4" + "typescript": "4.3.2" }, "Add these to devDependencies for testing": { "@types/mocha": "8.2.0", diff --git a/tsconfig.base.json b/tsconfig.base.json index 83c860a168..b2d1a3bd96 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -11,6 +11,7 @@ "noFallthroughCasesInSwitch": true, "noImplicitReturns": true, "noUnusedLocals": true, + "noImplicitOverride": true, "pretty": true, "sourceMap": true, "strict": true,