Skip to content

Commit

Permalink
chore: run gts fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicKramer committed Sep 5, 2018
1 parent 0544d11 commit 0590247
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/cls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import {CLS, Func} from './cls/base';
import {NullCLS} from './cls/null';
import {SingularCLS} from './cls/singular';
import {SpanType} from './constants';
import {Logger} from './logger';
import {RootSpan} from './plugin-types';
import {UNCORRELATED_ROOT_SPAN, UNTRACED_ROOT_SPAN} from './span-data';
import {Trace, TraceSpan} from './trace';
import {Singleton} from './util';
import {Logger} from './logger';

const asyncHooksAvailable = semver.satisfies(process.version, '>=8');

Expand Down
8 changes: 4 additions & 4 deletions src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export type LogLevel = 'silent'|ConsoleLogLevel;
* The list of log levels.
*/
export const LEVELS: ReadonlyArray<LogLevel> =
['silent', 'error', 'warn', 'info', 'debug'];
['silent', 'error', 'warn', 'info', 'debug'];

export interface LoggerConfig {
/**
Expand Down Expand Up @@ -54,9 +54,9 @@ export class Logger {
private logger: consoleLogLevel.Logger|null;

constructor(opts?: Partial<LoggerConfig>) {
const levelName =
opts && opts.level !== undefined ?
opts.level : logLevelToName(defaultConfig.logLevel);
const levelName = opts && opts.level !== undefined ?
opts.level :
logLevelToName(defaultConfig.logLevel);

if (levelName === false || levelName === 'silent') {
this.logger = null;
Expand Down
2 changes: 1 addition & 1 deletion src/trace-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import * as uuid from 'uuid';

import {cls, RootContext} from './cls';
import {Constants, SpanType} from './constants';
import {Logger} from './logger';
import {Func, RootSpan, RootSpanOptions, Span, SpanOptions, Tracer} from './plugin-types';
import {RootSpanData, UNCORRELATED_CHILD_SPAN, UNCORRELATED_ROOT_SPAN, UNTRACED_CHILD_SPAN, UNTRACED_ROOT_SPAN} from './span-data';
import {TraceLabels} from './trace-labels';
import {traceWriter} from './trace-writer';
import * as TracingPolicy from './tracing-policy';
import * as util from './util';
import {Logger} from './logger';

/**
* An interface describing configuration fields read by the StackdriverTracer
Expand Down
2 changes: 1 addition & 1 deletion src/trace-plugin-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import * as path from 'path';
import * as hook from 'require-in-the-middle';
import * as semver from 'semver';

import {Logger} from './logger';
import {Intercept, Monkeypatch, Plugin} from './plugin-types';
import {StackdriverTracer, StackdriverTracerConfig} from './trace-api';
import {Singleton} from './util';
import {Logger} from './logger';

/**
* Plugins are user-provided objects containing functions that should be run
Expand Down
2 changes: 1 addition & 1 deletion src/trace-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import * as os from 'os';
import * as request from 'request';

import {Constants} from './constants';
import {Logger} from './logger';
import {SpanKind, Trace} from './trace';
import {TraceLabels} from './trace-labels';
import {Singleton} from './util';
import {Logger} from './logger';

const pjson = require('../../package.json');

Expand Down
2 changes: 1 addition & 1 deletion src/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import * as path from 'path';

import {cls, TraceCLSConfig, TraceCLSMechanism} from './cls';
import {CLSMechanism} from './config';
import {LEVELS, Logger} from './logger';
import {StackdriverTracer} from './trace-api';
import {pluginLoader, PluginLoaderConfig} from './trace-plugin-loader';
import {traceWriter, TraceWriterConfig} from './trace-writer';
import {Component, FORCE_NEW, Forceable, packageNameFromPath, Singleton} from './util';
import {Logger, LEVELS} from './logger';

export interface TopLevelConfig {
enabled: boolean;
Expand Down
6 changes: 3 additions & 3 deletions test/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import {Logger, LEVELS, LoggerConfig} from '../src/logger';
import {LEVELS, Logger, LoggerConfig} from '../src/logger';

const PASS_THROUGH_LOG_LEVEL = Number(process.env.GCLOUD_TEST_LOG_LEVEL || 0);
// Capture the value of common.Logger so that we don't enter an infinite loop
Expand All @@ -26,8 +26,8 @@ const OriginalLogger = Logger;
type LoggerFunction<R> = (message: any, ...args: any[]) => R;

export class TestLogger extends Logger {
private logs: {[k in keyof Logger]: string[]} =
{error: [], warn: [], info: [], debug: []};
private logs: {[k in keyof Logger]:
string[]} = {error: [], warn: [], info: [], debug: []};
private innerLogger =
new OriginalLogger({level: LEVELS[PASS_THROUGH_LOG_LEVEL]});

Expand Down
2 changes: 1 addition & 1 deletion test/test-config-plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import * as assert from 'assert';

import {defaultConfig} from '../src/config';
import {PluginLoader, PluginLoaderConfig} from '../src/trace-plugin-loader';
import {Logger} from '../src/logger';
import {PluginLoader, PluginLoaderConfig} from '../src/trace-plugin-loader';

import * as testTraceModule from './trace';

Expand Down
2 changes: 1 addition & 1 deletion test/test-env-log-level.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import * as common from '@google-cloud/common';
import * as assert from 'assert';
import * as shimmer from 'shimmer';

import * as logger from '../src/logger';
import {FORCE_NEW} from '../src/util';

import {TestLogger} from './logger';
import * as logger from '../src/logger';
import * as traceTestModule from './trace';

describe('should respect environment variables', () => {
Expand Down
3 changes: 2 additions & 1 deletion test/test-modules-loaded-before-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ import * as common from '@google-cloud/common';
import * as assert from 'assert';
import * as shimmer from 'shimmer';

import {TestLogger} from './logger';
import * as log from '../src/logger';

import {TestLogger} from './logger';
import * as testTraceModule from './trace';

describe('modules loaded before agent', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/test-plugin-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import * as path from 'path';
import * as hook from 'require-in-the-middle';
import * as shimmer from 'shimmer';

import {Logger} from '../src/logger';
import {PluginLoader, PluginLoaderState, PluginWrapper} from '../src/trace-plugin-loader';

import {TestLogger} from './logger';
import {Logger} from '../src/logger';

export interface SimplePluginLoaderConfig {
// An object which contains paths to files that should be loaded as plugins
Expand Down
2 changes: 1 addition & 1 deletion test/test-trace-uncaught-exception.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

import * as assert from 'assert';

import {Logger} from '../src/logger';
import {TraceWriterConfig} from '../src/trace-writer';

import {TestLogger} from './logger';
import {Logger} from '../src/logger';
import * as trace from './trace';

/**
Expand Down
2 changes: 1 addition & 1 deletion test/test-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import * as assert from 'assert';
import {inspect} from 'util';

import {Constants} from '../src/constants';
import {Logger} from '../src/logger';
import * as util from '../src/util';

import {TestLogger} from './logger';
import {Logger} from '../src/logger';

const notNull = <T>(x: T|null|undefined): T => {
assert.notStrictEqual(x, null);
Expand Down
2 changes: 1 addition & 1 deletion test/trace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ import * as shimmer from 'shimmer';
import * as trace from '../src';
import {Config, PluginTypes} from '../src';
import {cls, TraceCLS, TraceCLSMechanism} from '../src/cls';
import * as logger from '../src/logger';
import {Trace, TraceSpan} from '../src/trace';
import {PluginLoader, pluginLoader} from '../src/trace-plugin-loader';
import {TraceWriter, traceWriter, TraceWriterConfig} from '../src/trace-writer';
import {tracing, Tracing} from '../src/tracing';
import {FORCE_NEW} from '../src/util';
import * as logger from '../src/logger';

import {TestLogger} from './logger';

Expand Down

0 comments on commit 0590247

Please sign in to comment.