refactor: run gts fix (#1150)

Author: kjin

src/index.ts

@@ -53,7 +53,7 @@ function initConfig(userConfig: Forceable<Config>): TopLevelConfig {
   // 2. Project Config
   // 3. Environment Variable Set Configuration File (from GCLOUD_TRACE_CONFIG)
   // 4. Default Config (as specified in './config')
-  const mergedConfig: (typeof defaultConfig) & Forceable<Config> = extend(
+  const mergedConfig: typeof defaultConfig & Forceable<Config> = extend(
     true,
     {},
     defaultConfig,
@@ -214,7 +214,7 @@ export function start(config?: Config): PluginTypes.Tracer {
   }
 
   if (!traceAgent) {
-    traceAgent = new (require('./trace-api')).StackdriverTracer();
+    traceAgent = new (require('./trace-api').StackdriverTracer)();
   }
 
   try {
@@ -250,7 +250,7 @@ export function start(config?: Config): PluginTypes.Tracer {
  */
 export function get(): PluginTypes.Tracer {
   if (!traceAgent) {
-    traceAgent = new (require('./trace-api')).StackdriverTracer();
+    traceAgent = new (require('./trace-api').StackdriverTracer)();
   }
   return traceAgent;
 }

src/plugins/plugin-grpc.ts

@@ -48,10 +48,11 @@ type MakeClientConstructorFunction = (
 ) => typeof Client;
 // Meta-type of client-side handlers
 type ClientMethod<S, T> = (
-  | (typeof Client.prototype.makeUnaryRequest)
-  | (typeof Client.prototype.makeClientStreamRequest)
-  | (typeof Client.prototype.makeServerStreamRequest)
-  | (typeof Client.prototype.makeBidiStreamRequest)) &
+  | typeof Client.prototype.makeUnaryRequest
+  | typeof Client.prototype.makeClientStreamRequest
+  | typeof Client.prototype.makeServerStreamRequest
+  | typeof Client.prototype.makeBidiStreamRequest
+) &
   (() => EventEmitter) &
   MethodDefinition<S, T>;
 // Partial module exports of client.js

src/plugins/plugin-pg.ts

@@ -28,7 +28,7 @@ type ClientQueryArguments =
   | [string]
   | [string, {}];
 type PG7QueryReturnValue =
-  | (pg_7.QueryConfig & ({submit: Function} & EventEmitter) | pg_7.Query)
+  | ((pg_7.QueryConfig & ({submit: Function} & EventEmitter)) | pg_7.Query)
   | Promise<pg_7.QueryResult>;
 type Callback<T> = (err: Error | null, res?: T) => void;
 

src/trace-plugin-loader.ts

@@ -158,9 +158,9 @@ export class ModulePluginWrapper implements PluginWrapper {
     const plugin = this.getPluginExportedValue();
     // Get a list of supported patches. This is the subset of objects in the
     // plugin exported value with matching file/version fields.
-    const supportedPatches: Array<
-      Partial<Monkeypatch<T> & Intercept<T>>
-    > = plugin.filter(
+    const supportedPatches: Array<Partial<
+      Monkeypatch<T> & Intercept<T>
+    >> = plugin.filter(
       patch =>
         semver.satisfies(version, patch.versions || '*') &&
         (file === patch.file || (!file && !patch.file))
@@ -172,43 +172,40 @@ export class ModulePluginWrapper implements PluginWrapper {
     }
 
     // Apply each patch object.
-    return supportedPatches.reduce<T>(
-      (exportedValue, patch) => {
-        // TODO(kjin): The only benefit of creating a new StackdriverTracer object
-        // per patched file is to give us granularity in log messages. See if we
-        // can refactor the StackdriverTracer class to avoid this.
-
-        this.logger.info(
-          `PluginWrapper#applyPlugin: [${logString}] Applying plugin.`
-        );
-        if (patch.patch) {
-          patch.patch(exportedValue, this.createTraceAgentInstance(logString));
-          // Queue a function to run if the plugin gets disabled.
-          if (patch.unpatch) {
-            const unpatch = patch.unpatch;
-            this.unpatchFns.push(() => {
-              this.logger.info(
-                `PluginWrapper#unapplyAll: [${logString}] Unpatching file.`
-              );
-              unpatch(exportedValue);
-            });
-          }
-          // The patch object should only have either patch() or intercept().
-          if (patch.intercept) {
-            this.logger.warn(
-              `PluginWrapper#applyPlugin: [${logString}] Patch object has both patch() and intercept() for this file. Only applying patch().`
+    return supportedPatches.reduce<T>((exportedValue, patch) => {
+      // TODO(kjin): The only benefit of creating a new StackdriverTracer object
+      // per patched file is to give us granularity in log messages. See if we
+      // can refactor the StackdriverTracer class to avoid this.
+
+      this.logger.info(
+        `PluginWrapper#applyPlugin: [${logString}] Applying plugin.`
+      );
+      if (patch.patch) {
+        patch.patch(exportedValue, this.createTraceAgentInstance(logString));
+        // Queue a function to run if the plugin gets disabled.
+        if (patch.unpatch) {
+          const unpatch = patch.unpatch;
+          this.unpatchFns.push(() => {
+            this.logger.info(
+              `PluginWrapper#unapplyAll: [${logString}] Unpatching file.`
             );
-          }
-        } else if (patch.intercept) {
-          exportedValue = patch.intercept(
-            exportedValue,
-            this.createTraceAgentInstance(file)
+            unpatch(exportedValue);
+          });
+        }
+        // The patch object should only have either patch() or intercept().
+        if (patch.intercept) {
+          this.logger.warn(
+            `PluginWrapper#applyPlugin: [${logString}] Patch object has both patch() and intercept() for this file. Only applying patch().`
           );
         }
-        return exportedValue;
-      },
-      moduleExports as T
-    );
+      } else if (patch.intercept) {
+        exportedValue = patch.intercept(
+          exportedValue,
+          this.createTraceAgentInstance(file)
+        );
+      }
+      return exportedValue;
+    }, moduleExports as T);
   }
 
   // Helper function to get the cached plugin value if it wasn't loaded yet.

test/plugins/test-cls-bluebird.ts

@@ -164,10 +164,12 @@ describe('Patch plugin for bluebird', () => {
   // tslint:disable-next-line:no-any
   testCases.forEach((testCase: TestCase<any>) => {
     it(`enables context propagation in the same way as native promises for test case: ${testCase.description}`, async () => {
-      const actual = (await getTracesForPromiseImplementation(
-        testCase.makePromise,
-        testCase.thenFn
-      ))
+      const actual = (
+        await getTracesForPromiseImplementation(
+          testCase.makePromise,
+          testCase.thenFn
+        )
+      )
         .map(trace => trace.spans.length)
         .join(', ');
       // In each case, the second trace should have the child span.

test/plugins/test-trace-http2.ts

@@ -260,7 +260,7 @@ maybeSkipHttp2('Trace Agent integration with http2', () => {
       server.on(
         'stream',
         (
-          s: http2Types.ServerHttp2Stream & ({rstWithInternalError: () => void})
+          s: http2Types.ServerHttp2Stream & {rstWithInternalError: () => void}
         ) => {
           // In Node 9.9+, the error handler is not added by default.
           s.on('error', () => {});
@@ -383,7 +383,10 @@ maybeSkipHttp2('Trace Agent integration with http2', () => {
                   assert.strictEqual(statusCodes.indexOf(code), -1);
                   statusCodes.push(code);
                 }
-                assert.strictEqual(statusCodes.reduce((a, b) => a + b), 1010);
+                assert.strictEqual(
+                  statusCodes.reduce((a, b) => a + b),
+                  1010
+                );
                 slowServer.close();
                 done();
               }

test/test-cls.ts

@@ -274,7 +274,10 @@ describe('Continuation-Local Storage', () => {
           c.disable();
           assert.ok(!c.isEnabled());
           assert.ok(c.getContext().type, SpanType.UNSAMPLED);
-          assert.ok(c.runWithContext(() => 'hi', TraceCLS.UNCORRELATED), 'hi');
+          assert.ok(
+            c.runWithContext(() => 'hi', TraceCLS.UNCORRELATED),
+            'hi'
+          );
           const fn = () => {};
           assert.strictEqual(c.bindWithCurrentContext(fn), fn);
           c.patchEmitterToPropagateContext(new EventEmitter());

test/web-frameworks/base.ts

@@ -47,7 +47,8 @@ export type WebFrameworkAddHandlerOptions = {
       fn: (
         incomingHeaders: IncomingHttpHeaders
       ) => Promise<WebFrameworkResponse>;
-    });
+    }
+);
 
 /**
  * A type that describes a ramework-agnostic request handler function.