Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

chore: enable typescript 4.3 option noImplicitOverride #143

Merged
merged 2 commits into from Jun 30, 2021
Merged

chore: enable typescript 4.3 option noImplicitOverride #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
420e32a
chore: enable typescript 4.3 option noImplicitOverride
Jun 30, 2021
fb314ab
chore: upgrade prettier to support typescript override
Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion detectors/node/resource-detector-deployment/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/resource-detector-git/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/resource-detector-service/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion detectors/resource-detector-sync-api/package.json
View file
Open in desktop
Expand Up @@ -36,6 +36,6 @@
},
"devDependencies": {
"ts-node": "^9.1.1",
"typescript": "^4.0.5"
"typescript": "4.3.4"
}
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -10,15 +10,15 @@
"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",
"publish:ci:prerelease": "lerna publish --yes --no-git-tag-version --no-push --no-changelog --dist-tag alpha"
},
"devDependencies": {
"lerna": "^3.22.1",
"prettier": "2.3.0"
"prettier": "2.3.2"
},
"workspaces": [
"packages/*",
Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-amqplib/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-amqplib/src/amqplib.ts
View file
Open in desktop
Expand Up @@ -25,13 +25,13 @@ import {
import { VERSION } from './version';

export class AmqplibInstrumentation extends InstrumentationBase<typeof amqp> {
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);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-aws-sdk/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-aws-sdk/src/aws-sdk.ts
View file
Open in desktop
Expand Up @@ -42,15 +42,15 @@ const storedV3ClientConfig = Symbol('opentelemetry.aws-sdk.client.config');

export class AwsInstrumentation extends InstrumentationBase<typeof AWS> {
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();

constructor(config: AwsSdkInstrumentationConfig = {}) {
super('opentelemetry-instrumentation-aws-sdk', VERSION, Object.assign({}, config));
}

setConfig(config: AwsSdkInstrumentationConfig = {}) {
override setConfig(config: AwsSdkInstrumentationConfig = {}) {
this._config = Object.assign({}, config);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-elasticsearch/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-elasticsearch/src/elasticsearch.ts
View file
Open in desktop
Expand Up @@ -24,15 +24,15 @@ import { ELASTICSEARCH_API_FILES } from './helpers';
export class ElasticsearchInstrumentation extends InstrumentationBase<typeof elasticsearch> {
static readonly component = '@elastic/elasticsearch';

protected _config: ElasticsearchInstrumentationConfig;
protected override _config: ElasticsearchInstrumentationConfig;
private _isEnabled = false;
private moduleVersion: string;

constructor(config: ElasticsearchInstrumentationConfig = {}) {
super('opentelemetry-instrumentation-elasticsearch', VERSION, Object.assign({}, config));
}

setConfig(config: ElasticsearchInstrumentationConfig = {}) {
override setConfig(config: ElasticsearchInstrumentationConfig = {}) {
this._config = Object.assign({}, config);
}

Expand Down
3 changes: 2 additions & 1 deletion packages/instrumentation-express/package.json
View file
Open in desktop
Expand Up @@ -53,7 +53,8 @@
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.3",
"opentelemetry-instrumentation-testing-utils": "^0.22.0",
"test-all-versions": "^5.0.1"
"test-all-versions": "^5.0.1",
"typescript": "4.3.4"
},
"mocha": {
"extension": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-express/src/express.ts
View file
Open in desktop
Expand Up @@ -37,13 +37,13 @@ const originalLayerStore = Symbol('otel.express-plugins.orig-layer-export');

export class ExpressInstrumentation extends InstrumentationBase<typeof express> {
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);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-kafkajs/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-kafkajs/src/kafkajs.ts
View file
Open in desktop
Expand Up @@ -41,14 +41,14 @@ import {

export class KafkaJsInstrumentation extends InstrumentationBase<typeof kafkaJs> {
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);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-mongoose/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-mongoose/src/mongoose.ts
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ export const _STORED_PARENT_SPAN: unique symbol = Symbol('stored-parent-span');

export class MongooseInstrumentation extends InstrumentationBase<typeof mongoose> {
static readonly component = 'mongoose';
protected _config: MongooseInstrumentationConfig;
protected override _config: MongooseInstrumentationConfig;
private moduleVersion: string;

constructor(config: MongooseInstrumentationConfig = {}) {
Expand All @@ -46,7 +46,7 @@ export class MongooseInstrumentation extends InstrumentationBase<typeof mongoose
if (!config.dbStatementSerializer) this._config.dbStatementSerializer = () => undefined;
}

setConfig(config: MongooseInstrumentationConfig = {}) {
override setConfig(config: MongooseInstrumentationConfig = {}) {
this._config = Object.assign({}, config);
if (!config.dbStatementSerializer) this._config.dbStatementSerializer = () => undefined;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-neo4j/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-neo4j/src/neo4j.ts
View file
Open in desktop
Expand Up @@ -15,13 +15,13 @@ import { getAttributesFromNeo4jSession } from './utils';
type Neo4J = typeof neo4j;

export class Neo4jInstrumentation extends InstrumentationBase<Neo4J> {
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;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-sequelize/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-sequelize/src/sequelize.ts
View file
Open in desktop
Expand Up @@ -16,14 +16,14 @@ import {

export class SequelizeInstrumentation extends InstrumentationBase<typeof sequelize> {
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);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-socket.io/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-socket.io/src/socket.io.ts
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ import isPromise from 'is-promise';
const reservedEvents = ['connect', 'connect_error', 'disconnect', 'disconnecting', 'newListener', 'removeListener'];

export class SocketIoInstrumentation extends InstrumentationBase<Io> {
protected _config!: SocketIoInstrumentationConfig;
protected override _config!: SocketIoInstrumentationConfig;

constructor(config: SocketIoInstrumentationConfig = {}) {
super('opentelemetry-instrumentation-socket.io', VERSION, Object.assign({}, config));
Expand Down
3 changes: 2 additions & 1 deletion packages/instrumentation-testing-utils/package.json
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@
"@opentelemetry/tracing": "^0.22.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0"
"@opentelemetry/api": "^1.0.0",
"typescript": "4.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/instrumentation-typeorm/package.json
View file
Open in desktop
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-typeorm/src/typeorm.ts
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ const selectQueryBuilderExecuteMethods: SelectQueryBuilderMethods[] = [
];

export class TypeormInstrumentation extends InstrumentationBase<typeof typeorm> {
protected _config!: TypeormInstrumentationConfig;
protected override _config!: TypeormInstrumentationConfig;

constructor(config: TypeormInstrumentationConfig = {}) {
super('opentelemetry-instrumentation-typeorm', VERSION, Object.assign({}, config));
Expand Down
2 changes: 1 addition & 1 deletion packages/propagation-utils/package.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.base.json
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
"inlineSources": true,
"types": ["node"],
"allowSyntheticDefaultImports": true,
"esModuleInterop": true
"esModuleInterop": true,
"noImplicitOverride": true
}
}