refactor: rework according to review follow up

Author: silva-fabio

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

@@ -30,13 +30,23 @@ export class ConsoleLogger implements types.Logger {
   static LEVELS = ['silent', 'error', 'warn', 'info', 'debug', 'silly'];
   level: string;
 
+
+  // TODO: reevaluate options to accept numbers as a parameter
+
   /**
    * Constructs a new ConsoleLogger instance
    * @param options A logger configuration object.
    */
-  constructor(options?: types.LoggerOptions|string) {
+  constructor(options?: types.LoggerOptions|string|number) {
     let opt: types.LoggerOptions = {};
-    if (typeof options === 'string') {
+    if (typeof options === 'number') {
+      if (options < 0) {
+        options = 0;
+      } else if (options > ConsoleLogger.LEVELS.length) {
+        options = ConsoleLogger.LEVELS.length - 1;
+      }
+      opt = {level: ConsoleLogger.LEVELS[options]};
+    } else if (typeof options === 'string') {
       opt = {level: options};
     } else {
       opt = options || {};
@@ -98,24 +108,15 @@ export class ConsoleLogger implements types.Logger {
 }
 
 
+// TODO: reevaluate the need to create a new logger instance on every call to
+// logger();
+
 /**
  *  Function logger exported to others classes.
  * @param options A logger options or strig to logger in console
  */
 const logger = (options?: types.LoggerOptions|string|number) => {
-  let opt: types.LoggerOptions|string;
-  if (typeof options === 'number') {
-    if (options < 0) {
-      options = 0;
-    } else if (options > ConsoleLogger.LEVELS.length) {
-      options = ConsoleLogger.LEVELS.length - 1;
-    }
-    opt = {level: ConsoleLogger.LEVELS[options]};
-  } else {
-    opt = options;
-  }
-
-  const aLogger = new ConsoleLogger(opt);
+  const aLogger = new ConsoleLogger(options);
   logger['logger'] = aLogger;
   return aLogger;
 };

packages/opencensus-core/src/trace/instrumentation/base-plugin.ts

@@ -53,43 +53,6 @@ export abstract class BasePlugin implements types.Plugin {
     this.version = version;
   }
 
-  /**
-   * Wraps a function.
-   * @param nodule The module.
-   * @param name The function name.
-   * @param wrapper The wrapper.
-   */
-  protected wrap(nodule, name, wrapper) {
-    shimmer.wrap(nodule, name, wrapper);
-  }
-
-  /**
-   * Unwraps a function.
-   * @param nodule The module.
-   * @param name The function name.
-   */
-  protected unwrap(nodule, name) {
-    shimmer.unwrap(nodule, name);
-  }
-
-  /**
-   * Wraps one or more funcitons.
-   * @param nodule The module.
-   * @param names A list of function names.
-   * @param wrapper The wrapper.
-   */
-  protected massWrap(nodule, names, wrapper) {
-    shimmer.massWrap(nodule, names, wrapper);
-  }
-
-  /**
-   * Unwraps one or more functions.
-   * @param nodule The module.
-   * @param names The list of function names.
-   */
-  protected massUnwrap(nodule, names) {
-    shimmer.massUnwrap(nodule, names);
-  }
 
   // TODO: review this implementation
   // From the perspective of an instrumentation module author,

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

@@ -181,14 +181,13 @@ export class Tracer implements types.Tracer {
    * @param type The span type.
    * @param parentSpanId The parent span ID.
    */
-  startChildSpan(name?: string, type?: string, parentSpanId?: string):
-      types.Span {
+  startChildSpan(name?: string, type?: string): types.Span {
     let newSpan: types.Span = null;
     if (!this.currentRootSpan) {
       this.logger.debug(
           'no current trace found - must start a new root span first');
     } else {
-      newSpan = this.currentRootSpan.startChildSpan(name, type, parentSpanId);
+      newSpan = this.currentRootSpan.startChildSpan(name, type);
     }
     return newSpan;
   }

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

@@ -207,7 +207,7 @@ export interface RootSpan extends Span {
   end(): void;
 
   /** Starts a new Span instance in the RootSpan instance */
-  startChildSpan(name: string, type: string, parentSpanId?: string): Span;
+  startChildSpan(name: string, type: string): Span;
 }
 
 

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

@@ -20,12 +20,7 @@ import * as mocha from 'mocha';
 import * as logger from '../src/common/console-logger';
 import {ConsoleLogger} from '../src/common/console-logger';
 import {Logger} from '../src/common/types';
-import {ConsoleExporter} from '../src/exporters/console-exporter';
-import {ExporterBuffer} from '../src/exporters/exporter-buffer';
-import {BufferConfig, TracerConfig} from '../src/trace/config/types';
-import {RootSpan} from '../src/trace/model/root-span';
-import {Tracer} from '../src/trace/model/tracer';
-import {TraceOptions} from '../src/trace/model/types';
+
 
 const LEVELS = ['silent', 'error', 'warn', 'info', 'debug', 'silly'];
 let consoleTxt = '';

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

@@ -67,9 +67,10 @@ describe('ExporterBuffer', () => {
   describe('setBufferSize', () => {
     it('should set BufferSize', () => {
       const buffer = new ExporterBuffer(exporter, defaultBufferConfig);
-      const bufferResize = buffer.setBufferSize(DEFAULT_BUFFER_SIZE);
+      const newBufferSize = DEFAULT_BUFFER_SIZE + 10;
+      const bufferResize = buffer.setBufferSize(newBufferSize);
       assert.ok(bufferResize instanceof ExporterBuffer);
-      assert.strictEqual(bufferResize.getBufferSize(), DEFAULT_BUFFER_SIZE);
+      assert.strictEqual(bufferResize.getBufferSize(), newBufferSize);
     });
   });
 

packages/opencensus-core/test/test-sampler.ts

@@ -35,14 +35,14 @@ describe('Sampler', () => {
       const samplerShouldSampler = sampler.shouldSample(root.traceId);
       assert.ok(samplerShouldSampler);
     });
-    it('should return a always sampler', () => {
+    it('should return a always sampler for 1', () => {
       const root = new RootSpan(tracer);
       const sampler = new Sampler().probability(1);
       const samplerShouldSampler = sampler.shouldSample(root.traceId);
       assert.strictEqual(sampler.description, 'always');
       assert.ok(samplerShouldSampler);
     });
-    it('should return a always sampler', () => {
+    it('should return a always sampler for >1', () => {
       const root = new RootSpan(tracer);
       const sampler = new Sampler().probability(100);
       const samplerShouldSampler = sampler.shouldSample(root.traceId);
@@ -61,14 +61,14 @@ describe('Sampler', () => {
       const samplerShouldSampler = sampler.shouldSample(root.traceId);
       assert.ok(!samplerShouldSampler);
     });
-    it('should return a never sampler', () => {
+    it('should return a never sampler for 0', () => {
       const root = new RootSpan(tracer);
       const sampler = new Sampler().probability(0);
       const samplerShouldSampler = sampler.shouldSample(root.traceId);
       assert.strictEqual(sampler.description, 'never');
       assert.ok(!samplerShouldSampler);
     });
-    it('should return a never sampler', () => {
+    it('should return a never sampler for negative value', () => {
       const root = new RootSpan(tracer);
       const sampler = new Sampler().probability(-1);
       const samplerShouldSampler = sampler.shouldSample(root.traceId);

packages/opencensus-core/test/test-tracer.ts

@@ -199,7 +199,7 @@ describe('Tracer', () => {
     } as types.SpanContext;
 
 
-    it('should reate the new RootSpan with propagation', () => {
+    it('should create the new RootSpan with propagation', () => {
       const tracer = new Tracer();
       tracer.start(defaultConfig);
       traceOptions.spanContext = spanContextPropagated;
@@ -212,7 +212,7 @@ describe('Tracer', () => {
       });
     });
 
-    it('should reate the new RootSpan with no propagation', () => {
+    it('should create the new RootSpan with no propagation', () => {
       const tracer = new Tracer();
       tracer.start(defaultConfig);
       traceOptions.spanContext.options = 0x0;