diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d72787e9..4134298bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,8 +85,11 @@ jobs: steps: - checkout - run: - name: Install modules and dependencies. - command: yarn install + name: Install minimal doc and lint modules globally + command: yarn global add lerna typedoc linkinator typescript gts tslint-consistent-codestyle tslint-microsoft-contrib + - run: + name: Symlink global modules into all lerna packages + command: lerna exec 'ln -s $(yarn global dir)/node_modules node_modules' - run: name: Check code style and linting command: yarn run check diff --git a/packages/opentelemetry-plugin-document-load/src/documentLoad.ts b/packages/opentelemetry-plugin-document-load/src/documentLoad.ts index 0ffea50d3..520c2b24b 100644 --- a/packages/opentelemetry-plugin-document-load/src/documentLoad.ts +++ b/packages/opentelemetry-plugin-document-load/src/documentLoad.ts @@ -198,7 +198,7 @@ export class DocumentLoad extends BasePlugin { }); } else { // // fallback to previous version - const perf: (typeof otperformance) & PerformanceLegacy = otperformance; + const perf: typeof otperformance & PerformanceLegacy = otperformance; const performanceTiming = perf.timing; if (performanceTiming) { const keys = Object.values(PTN); diff --git a/packages/opentelemetry-plugin-grpc/src/grpc.ts b/packages/opentelemetry-plugin-grpc/src/grpc.ts index 531bd80bb..9c44c65ab 100644 --- a/packages/opentelemetry-plugin-grpc/src/grpc.ts +++ b/packages/opentelemetry-plugin-grpc/src/grpc.ts @@ -354,9 +354,12 @@ export class GrpcPlugin extends BasePlugin { parent: currentSpan || undefined, }) .setAttribute(AttributeNames.COMPONENT, GrpcPlugin.component); - return plugin._makeGrpcClientRemoteCall(original, args, this, plugin)( - span - ); + return plugin._makeGrpcClientRemoteCall( + original, + args, + this, + plugin + )(span); }; }; } diff --git a/packages/opentelemetry-plugin-http/src/http.ts b/packages/opentelemetry-plugin-http/src/http.ts index 76278b576..22c34c62b 100644 --- a/packages/opentelemetry-plugin-http/src/http.ts +++ b/packages/opentelemetry-plugin-http/src/http.ts @@ -485,7 +485,7 @@ export class HttpPlugin extends BasePlugin { span: Span, execute: T, rethrow: K - ): K extends true ? ReturnType : (ReturnType | void); + ): K extends true ? ReturnType : ReturnType | void; private _safeExecute ReturnType>( span: Span, execute: T, diff --git a/packages/opentelemetry-plugin-http/src/types.ts b/packages/opentelemetry-plugin-http/src/types.ts index 05fe03386..e55c35834 100644 --- a/packages/opentelemetry-plugin-http/src/types.ts +++ b/packages/opentelemetry-plugin-http/src/types.ts @@ -39,7 +39,7 @@ export type RequestSignature = [http.RequestOptions, HttpCallbackOptional] & export type HttpRequestArgs = Array; export type ParsedRequestOptions = - | http.RequestOptions & Partial + | (http.RequestOptions & Partial) | http.RequestOptions; export type Http = typeof http; /* tslint:disable-next-line:no-any */ diff --git a/packages/opentelemetry-plugin-http/src/utils.ts b/packages/opentelemetry-plugin-http/src/utils.ts index b1a27b97f..fbada00b1 100644 --- a/packages/opentelemetry-plugin-http/src/utils.ts +++ b/packages/opentelemetry-plugin-http/src/utils.ts @@ -46,7 +46,9 @@ export const getAbsoluteUrl = ( // it should be displayed if it's not 80 and 443 (default ports) if ( (host as string).indexOf(':') === -1 && - (port && port !== '80' && port !== '443') + port && + port !== '80' && + port !== '443' ) { host += `:${port}`; } diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts index e41ceee08..a6841ae33 100644 --- a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts @@ -97,9 +97,10 @@ export class PostgresPlugin extends BasePlugin { const parentSpan = plugin._tracer.getCurrentSpan(); if (typeof args[args.length - 1] === 'function') { // Patch ParameterQuery callback - args[args.length - 1] = utils.patchCallback(span, args[ - args.length - 1 - ] as PostgresCallback); + args[args.length - 1] = utils.patchCallback( + span, + args[args.length - 1] as PostgresCallback + ); // If a parent span exists, bind the callback if (parentSpan) { args[args.length - 1] = plugin._tracer.bind(