refactor: plugin.enable has logger param

Signed-off-by: Olivier Albertini <[email protected]>
open-telemetry · Aug 30, 2019 · d612642 · d612642
1 parent f3c1805
commit d612642
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/packages/opentelemetry-plugin-http/src/http.ts b/packages/opentelemetry-plugin-http/src/http.ts
@@ -14,15 +14,8 @@
  * limitations under the License.
  */
 
-import { BasePlugin, NoopLogger, isValid } from '@opentelemetry/core';
-import {
-  Span,
-  SpanKind,
-  SpanOptions,
-  Logger,
-  Tracer,
-  Attributes,
-} from '@opentelemetry/types';
+import { BasePlugin, isValid } from '@opentelemetry/core';
+import { Span, SpanKind, SpanOptions, Attributes } from '@opentelemetry/types';
 import {
   ClientRequest,
   IncomingMessage,
@@ -51,14 +44,9 @@ import { Utils } from './utils';
 export class HttpPlugin extends BasePlugin<Http> {
   static readonly component = 'http';
   options!: HttpPluginConfig;
-  protected _logger!: Logger;
-  protected readonly _tracer!: Tracer;
 
   constructor(readonly moduleName: string, readonly version: string) {
     super();
-    // TODO: remove this once a logger will be passed
-    // https://github.com/open-telemetry/opentelemetry-js/issues/193
-    this._logger = new NoopLogger();
     // TODO: remove this once options will be passed
     // see https://github.com/open-telemetry/opentelemetry-js/issues/210
     this.options = {};

diff --git a/packages/opentelemetry-plugin-http/src/index.ts b/packages/opentelemetry-plugin-http/src/index.ts
@@ -2,4 +2,4 @@ export * from './http';
 export * from './types';
 export * from './utils';
 export * from './enums/attributeNames';
-export * from './enums/format';
+export * from './enums/format';
diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts
@@ -44,7 +44,7 @@ describe('HttpPlugin', () => {
       nock.cleanAll();
       nock.enableNetConnect();
 
-      plugin.enable(http, tracer);
+      plugin.enable(http, tracer, tracer.logger);
       server = http.createServer((request, response) => {
         response.end('Test Server Response');
       });

diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
@@ -83,7 +83,7 @@ describe('HttpPlugin', () => {
     });
 
     before(() => {
-      plugin.enable(http, tracer);
+      plugin.enable(http, tracer, tracer.logger);
       const ignoreConfig = [
         `http://${hostname}:${serverPort}/ignored/string`,
         /\/ignored\/regexp$/i,

diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts
@@ -57,7 +57,7 @@ describe('Packages', () => {
     });
 
     before(() => {
-      plugin.enable(http, tracer);
+      plugin.enable(http, tracer, tracer.logger);
     });
 
     after(() => {

diff --git a/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts
@@ -54,7 +54,7 @@ describe('HttpPlugin Integration tests', () => {
 
     before(() => {
       plugin.disable();
-      plugin.enable(http, tracer);
+      plugin.enable(http, tracer, tracer.logger);
       const ignoreConfig = [
         `http://${hostname}:${serverPort}/ignored/string`,
         /\/ignored\/regexp$/i,