Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 05cee77

Browse files
committed
fix: minor tslint issues
1 parent e94e0c4 commit 05cee77

5 files changed

Lines changed: 32 additions & 37 deletions

File tree

packages/opencensus-core/src/exporters/console-exporter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import {Logger} from '../common/types';
2222

2323
/** Do not send span data */
2424
export class NoopExporter implements Exporter {
25-
logger: Logger
25+
logger: Logger;
2626
onEndSpan(root: RootSpan) {}
2727
publish(rootSpans: RootSpan[]) {}
2828
}
2929

3030
/** Format and sends span data to the console. */
31-
export class ConsoleLogExporter implements Exporter {
31+
export class ConsoleExporter implements Exporter {
3232
/** Buffer object to store the spans. */
3333
private buffer: Buffer;
3434
logger: Logger;

packages/opencensus-core/src/exporters/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import {OnEndSpanEventListener, RootSpan} from '../trace/model/types';
1919
import {BufferConfig} from '../trace/config/types';
20-
import {Logger} from '../common/types'
20+
import {Logger} from '../common/types';
2121

2222
/** Defines an exporter interface. */
2323
export interface Exporter extends OnEndSpanEventListener {
2424
/** An object to log information to */
25-
logger: Logger
25+
logger: Logger;
2626

2727
/**
2828
* Sends a list of root spans to the service.

packages/opencensus-core/src/trace/model/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import {Config, Sampler, TracerConfig} from '../config/types';
18-
import {Logger} from '../../common/types'
18+
import {Logger} from '../../common/types';
1919

2020

2121
/** Default type for functions */

packages/opencensus-core/test/test-console-exporter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import * as assert from 'assert';
1818
import * as mocha from 'mocha';
1919

2020
import {Buffer} from '../src/exporters/buffer';
21-
import {ConsoleLogExporter, NoopExporter} from '../src/exporters/consolelog-exporter';
21+
import {ConsoleExporter, NoopExporter} from '../src/exporters/consolelog-exporter';
2222
import {RootSpanImpl} from '../src/trace/model/rootspan';
2323
import {TracerImpl} from '../src/trace/model/tracer';
2424
import {RootSpan} from '../src/trace/model/types';
@@ -60,7 +60,7 @@ describe('ConsoleLogExporter', () => {
6060
/** Should end a span */
6161
describe('onEndSpan()', () => {
6262
it('should end a span', () => {
63-
const exporter = new ConsoleLogExporter(defaultBufferConfig);
63+
const exporter = new ConsoleExporter(defaultBufferConfig);
6464
const rootSpan = new RootSpanImpl(tracer);
6565
exporter.onEndSpan(rootSpan);
6666
assert.ok(true);
@@ -70,7 +70,7 @@ describe('ConsoleLogExporter', () => {
7070
/** Should publish the rootspan in queue */
7171
describe('publish()', () => {
7272
it('should publish the rootspans in queue', () => {
73-
const exporter = new ConsoleLogExporter(defaultBufferConfig);
73+
const exporter = new ConsoleExporter(defaultBufferConfig);
7474
const rootSpan = new RootSpanImpl(tracer);
7575
rootSpan.startSpan('name', 'type', rootSpan.traceId);
7676
const queue: RootSpan[] = [];

packages/opencensus-core/test/test-console-logger.ts

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import * as assert from 'assert';
1818
import * as mocha from 'mocha';
19-
import * as logger from '../src/common/consolelogger';
2019

21-
import {Logger} from '../src/common/types'
22-
import {RootSpanImpl} from '../src/trace/model/rootspan'
20+
import * as logger from '../src/common/consolelogger';
21+
import {Logger} from '../src/common/types';
22+
import {Buffer} from '../src/exporters/buffer';
23+
import {ConsoleExporter} from '../src/exporters/consolelog-exporter';
24+
import {BufferConfig, TracerConfig} from '../src/trace/config/types';
25+
import {RootSpanImpl} from '../src/trace/model/rootspan';
2326
import {TracerImpl} from '../src/trace/model/tracer';
24-
import {TracerConfig, BufferConfig} from '../src/trace/config/types';
2527
import {TraceOptions} from '../src/trace/model/types';
26-
import {Buffer} from '../src/exporters/buffer';
27-
import {ConsoleLogExporter} from '../src/exporters/consolelog-exporter'
2828

2929
const LEVELS = ['error', 'warn', 'info', 'debug', 'silly'];
3030
let consoleTxt = '';
@@ -36,7 +36,7 @@ describe('ConsoleLogger', () => {
3636
return txt;
3737
});
3838

39-
/** Should create a new ConsoleLogger */
39+
/** Should create a new ConsoleLogger */
4040
describe('new ConsoleLogger()', () => {
4141
it('should consoleLogger with default levels', () => {
4242
const consoleLogger = logger();
@@ -100,10 +100,9 @@ describe('ConsoleLogger', () => {
100100
assert.equal(validateString, -1);
101101
});
102102
});
103-
103+
104104
/** Should logger error, warn and info log */
105-
describe('info logger', () => {
106-
105+
describe('info logger', () => {
107106
const consoleLogger = logger(LEVELS[2]);
108107

109108
it('should logger error', () => {
@@ -112,7 +111,7 @@ describe('ConsoleLogger', () => {
112111
consoleTxt = txt;
113112
return txt;
114113
});
115-
114+
116115
consoleTxt = '';
117116
consoleLogger.error('error test logger');
118117
unhookIntercept();
@@ -127,7 +126,7 @@ describe('ConsoleLogger', () => {
127126
consoleTxt = txt;
128127
return txt;
129128
});
130-
129+
131130
consoleTxt = '';
132131
consoleLogger.warn('warn test logger');
133132
unhookIntercept();
@@ -142,7 +141,7 @@ describe('ConsoleLogger', () => {
142141
consoleTxt = txt;
143142
return txt;
144143
});
145-
144+
146145
consoleTxt = '';
147146
consoleLogger.info('info test logger');
148147
unhookIntercept();
@@ -157,7 +156,7 @@ describe('ConsoleLogger', () => {
157156
consoleTxt = txt;
158157
return txt;
159158
});
160-
159+
161160
consoleTxt = '';
162161
consoleLogger.debug('debug test logger');
163162
unhookIntercept();
@@ -172,7 +171,7 @@ describe('ConsoleLogger', () => {
172171
consoleTxt = txt;
173172
return txt;
174173
});
175-
174+
176175
consoleTxt = '';
177176
consoleLogger.silly('silly test logger');
178177
unhookIntercept();
@@ -185,13 +184,10 @@ describe('ConsoleLogger', () => {
185184
describe('Model classes has a logger', () => {
186185
// tslint:disable:no-any
187186
function instanceOfLogger(object: any): object is Logger {
188-
return 'error' in object
189-
&& 'warn' in object
190-
&& 'info' in object
191-
&& 'debug' in object
192-
&& 'silly' in object;
187+
return 'error' in object && 'warn' in object && 'info' in object &&
188+
'debug' in object && 'silly' in object;
193189
}
194-
190+
195191
const consoleLogger = logger('debug');
196192

197193
const tracer = new TracerImpl();
@@ -204,23 +200,22 @@ describe('ConsoleLogger', () => {
204200
it('checks if RootSpanImpl and SpanImpl has a logger', () => {
205201
tracer.startRootSpan({name: 'rootSpanTest'} as TraceOptions, (root) => {
206202
assert.ok(instanceOfLogger(root.logger));
207-
208-
let span = tracer.startSpan('spanTest')
203+
204+
const span = tracer.startSpan('spanTest');
209205
assert.ok(instanceOfLogger(span.logger));
210206
});
211207
});
212-
213-
let exporterConfig = {logger: consoleLogger};
214-
let exporter = new ConsoleLogExporter(exporterConfig);
215-
208+
209+
const exporterConfig = {logger: consoleLogger};
210+
const exporter = new ConsoleExporter(exporterConfig);
211+
216212
it('checks if exporter has a logger', () => {
217213
assert.ok(instanceOfLogger(exporter.logger));
218214
});
219215

220216
it('checks if buffer has a logger', () => {
221-
let buffer = new Buffer(exporter, exporterConfig)
217+
const buffer = new Buffer(exporter, exporterConfig);
222218
assert.ok(instanceOfLogger(buffer.logger));
223219
});
224220
});
225-
226221
});

0 commit comments

Comments
 (0)