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

Commit 81f9dfb

Browse files
committed
fix: export logger to others packages
1 parent 39e6fea commit 81f9dfb

8 files changed

Lines changed: 830 additions & 265 deletions

File tree

packages/opencensus-core/package-lock.json

Lines changed: 816 additions & 254 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/opencensus-core/src/common/console-logger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ const logger = (options?: LoggerOptions|string) => {
110110

111111
logger();
112112

113-
export = logger;
113+
export{logger};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class Buffer {
5050
*/
5151
constructor(exporter: Exporter, config: BufferConfig) {
5252
this.exporter = exporter;
53-
this.logger = config.logger || logger();
53+
this.logger = config.logger || logger.logger();
5454
this.bufferSize = config.bufferSize;
5555
this.bufferTimeout = config.bufferTimeout;
5656
return this;

packages/opencensus-core/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export * from './common/types';
2828
export * from './trace/model/root-span';
2929
export * from './trace/model/span';
3030
export * from './trace/model/tracer';
31+
export * from './common/console-logger';
3132

3233
// sampler impl
3334
export * from './trace/sampler/sampler';

packages/opencensus-core/src/trace/model/root-span.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class RootSpanImpl extends SpanBaseModel implements RootSpan {
5252
this.parentSpanId = context.traceContext.spanId || '';
5353
}
5454
this.spansLocal = [];
55-
this.logger = tracer.logger || logger();
55+
this.logger = tracer.logger || logger.logger();
5656
}
5757

5858
/** Gets span list from rootspan instance. */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class SpanImpl extends SpanBaseModel implements Span {
3333
constructor(root: RootSpan) {
3434
super();
3535
this.root = root;
36-
this.logger = this.root.logger || logger();
36+
this.logger = this.root.logger || logger.logger();
3737
}
3838

3939
/** Gets trace id of span. */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class TracerImpl implements Tracer {
4848
/** A sampler used to make sample decisions */
4949
sampler: Sampler;
5050
/** A configuration for starting the tracer */
51-
logger: Logger = logger();
51+
logger: Logger = logger.logger();
5252

5353
/** Constructs a new TraceImpl instance. */
5454
constructor() {
@@ -74,7 +74,7 @@ export class TracerImpl implements Tracer {
7474
start(config: TracerConfig): Tracer {
7575
this.activeLocal = true;
7676
this.config = config;
77-
this.logger = this.config.logger || logger();
77+
this.logger = this.config.logger || logger.logger();
7878
this.sampler = new SamplerImpl().probability(config.samplingRate);
7979
return this;
8080
}

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

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

20+
// import * as logger from '../src/common/console-logger';
2021
import * as logger from '../src/common/console-logger';
22+
2123
import {Logger} from '../src/common/types';
2224
import {Buffer} from '../src/exporters/buffer';
2325
import {ConsoleExporter} from '../src/exporters/console-exporter';
@@ -39,19 +41,19 @@ describe('ConsoleLogger', () => {
3941
/** Should create a new ConsoleLogger */
4042
describe('new ConsoleLogger()', () => {
4143
it('should consoleLogger with default levels', () => {
42-
const consoleLogger = logger();
44+
const consoleLogger = logger.logger();
4345
assert.equal(LEVELS.length, consoleLogger.logger.levels.length);
4446
});
4547

4648
it('should consoleLogger with error', () => {
47-
const consoleLogger = logger(LEVELS[0]);
49+
const consoleLogger = logger.logger(LEVELS[0]);
4850
assert.strictEqual(LEVELS[0], consoleLogger.logger.level);
4951
});
5052
});
5153

5254
/** Should logger only error log */
5355
describe('error logger', () => {
54-
const consoleLogger = logger(LEVELS[0]);
56+
const consoleLogger = logger.logger(LEVELS[0]);
5557

5658
it('should logger error', () => {
5759
consoleTxt = '';
@@ -103,7 +105,7 @@ describe('ConsoleLogger', () => {
103105

104106
/** Should logger error, warn and info log */
105107
describe('info logger', () => {
106-
const consoleLogger = logger(LEVELS[2]);
108+
const consoleLogger = logger.logger(LEVELS[2]);
107109

108110
it('should logger error', () => {
109111
const intercept = require('intercept-stdout');
@@ -188,7 +190,7 @@ describe('ConsoleLogger', () => {
188190
'debug' in object && 'silly' in object;
189191
}
190192

191-
const consoleLogger = logger('debug');
193+
const consoleLogger = logger.logger('debug');
192194

193195
const tracer = new TracerImpl();
194196
tracer.start({logger: consoleLogger});

0 commit comments

Comments
 (0)