chore: remove NoopLogger from sdk and use from api (#1746)

open-telemetry · Dec 22, 2020 · 80ea2e0 · 80ea2e0
1 parent a2304c9
commit 80ea2e0
Show file tree

Hide file tree

Showing 65 changed files with 130 additions and 157 deletions.
diff --git a/benchmark/tracer.js b/benchmark/tracer.js
@@ -2,10 +2,9 @@
 
 const benchmark = require('./benchmark');
 const opentelemetry = require('../packages/opentelemetry-api');
-const { NoopLogger } = require('../packages/opentelemetry-core');
 const { BasicTracerProvider, BatchSpanProcessor, InMemorySpanExporter, SimpleSpanProcessor } = require('../packages/opentelemetry-tracing');
 
-const logger = new NoopLogger();
+const logger = new opentelemetry.NoopLogger();
 
 const setups = [
   {

diff --git a/packages/opentelemetry-core/src/common/NoopLogger.ts b/packages/opentelemetry-core/src/common/NoopLogger.ts
diff --git a/packages/opentelemetry-core/src/context/propagation/composite.ts b/packages/opentelemetry-core/src/context/propagation/composite.ts
@@ -20,8 +20,8 @@ import {
   TextMapPropagator,
   Logger,
   TextMapSetter,
+  NoopLogger,
 } from '@opentelemetry/api';
-import { NoopLogger } from '../../common/NoopLogger';
 import { CompositePropagatorConfig } from './types';
 
 /** Combines multiple propagators into a single propagator. */

diff --git a/packages/opentelemetry-core/src/index.ts b/packages/opentelemetry-core/src/index.ts
@@ -18,7 +18,6 @@ export * from './common/attributes';
 export * from './common/ConsoleLogger';
 export * from './common/global-error-handler';
 export * from './common/logging-error-handler';
-export * from './common/NoopLogger';
 export * from './common/time';
 export * from './common/types';
 export * from './ExportResult';

diff --git a/packages/opentelemetry-core/test/platform/BasePlugin.test.ts b/packages/opentelemetry-core/test/platform/BasePlugin.test.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { NoopTracerProvider } from '@opentelemetry/api';
+import { NoopTracerProvider, NoopLogger } from '@opentelemetry/api';
 import * as assert from 'assert';
 import * as path from 'path';
-import { BasePlugin, NoopLogger } from '../../src';
+import { BasePlugin } from '../../src';
 import * as types from '../trace/fixtures/test-package/foo/bar/internal';
 
 const provider = new NoopTracerProvider();

diff --git a/packages/opentelemetry-core/test/platform/browser/BasePlugin.test.ts b/packages/opentelemetry-core/test/platform/browser/BasePlugin.test.ts
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-import { NOOP_TRACER, NoopTracerProvider } from '@opentelemetry/api';
+import {
+  NOOP_TRACER,
+  NoopTracerProvider,
+  NoopLogger,
+} from '@opentelemetry/api';
 import * as assert from 'assert';
-import { BasePlugin, NoopLogger } from '../../../src';
+import { BasePlugin } from '../../../src';
 
 const provider = new NoopTracerProvider();
 const logger = new NoopLogger();

diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts
@@ -20,7 +20,6 @@ import {
 } from '@opentelemetry/exporter-collector';
 import * as api from '@opentelemetry/api';
 import * as metrics from '@opentelemetry/metrics';
-import * as core from '@opentelemetry/core';
 import * as http from 'http';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
@@ -64,7 +63,7 @@ describe('CollectorMetricExporter - node with proto over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        logger: new core.NoopLogger(),
+        logger: new api.NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',

diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts
@@ -19,7 +19,7 @@ import {
   CollectorExporterNodeConfigBase,
 } from '@opentelemetry/exporter-collector';
 
-import * as core from '@opentelemetry/core';
+import { NoopLogger } from '@opentelemetry/api';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import * as http from 'http';
 import * as assert from 'assert';
@@ -59,7 +59,7 @@ describe('CollectorTraceExporter - node with proto over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        logger: new core.NoopLogger(),
+        logger: new NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',

diff --git a/packages/opentelemetry-exporter-collector/src/CollectorExporterBase.ts b/packages/opentelemetry-exporter-collector/src/CollectorExporterBase.ts
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-import { Attributes, Logger } from '@opentelemetry/api';
-import {
-  ExportResult,
-  ExportResultCode,
-  NoopLogger,
-} from '@opentelemetry/core';
+import { Attributes, Logger, NoopLogger } from '@opentelemetry/api';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 import {
   CollectorExporterError,
   CollectorExporterConfigBase,

diff --git a/packages/opentelemetry-exporter-collector/src/util.ts b/packages/opentelemetry-exporter-collector/src/util.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { Logger } from '@opentelemetry/api';
-import { NoopLogger } from '@opentelemetry/core';
+import { Logger, NoopLogger } from '@opentelemetry/api';
 
 /**
  * Parses headers from config leaving only those that have defined values

diff --git a/packages/opentelemetry-exporter-collector/test/browser/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/browser/CollectorMetricExporter.test.ts
@@ -15,7 +15,7 @@
  */
 
 import * as api from '@opentelemetry/api';
-import { ExportResultCode, NoopLogger } from '@opentelemetry/core';
+import { ExportResultCode } from '@opentelemetry/core';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { CollectorMetricExporter } from '../../src/platform/browser/index';
@@ -85,7 +85,7 @@ describe('CollectorMetricExporter - web', () => {
     describe('when "sendBeacon" is available', () => {
       beforeEach(() => {
         collectorExporter = new CollectorMetricExporter({
-          logger: new NoopLogger(),
+          logger: new api.NoopLogger(),
           url: 'http://foo.bar.com',
           serviceName: 'bar',
         });
@@ -196,7 +196,7 @@ describe('CollectorMetricExporter - web', () => {
       beforeEach(() => {
         (window.navigator as any).sendBeacon = false;
         collectorExporter = new CollectorMetricExporter({
-          logger: new NoopLogger(),
+          logger: new api.NoopLogger(),
           url: 'http://foo.bar.com',
           serviceName: 'bar',
         });
@@ -330,7 +330,7 @@ describe('CollectorMetricExporter - web', () => {
 
     beforeEach(() => {
       collectorExporterConfig = {
-        logger: new NoopLogger(),
+        logger: new api.NoopLogger(),
         headers: customHeaders,
       };
       server = sinon.fakeServer.create();

diff --git a/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { NoopLogger, ExportResultCode } from '@opentelemetry/core';
+import { NoopLogger } from '@opentelemetry/api';
+import { ExportResultCode } from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import * as assert from 'assert';
 import * as sinon from 'sinon';

diff --git a/packages/opentelemetry-exporter-collector/test/common/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/common/CollectorMetricExporter.test.ts
@@ -15,7 +15,7 @@
  */
 
 import * as api from '@opentelemetry/api';
-import { ExportResultCode, NoopLogger } from '@opentelemetry/core';
+import { ExportResultCode } from '@opentelemetry/core';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { CollectorExporterBase } from '../../src/CollectorExporterBase';
@@ -62,7 +62,7 @@ describe('CollectorMetricExporter - common', () => {
       onInitSpy = sinon.stub(CollectorMetricExporter.prototype, 'onInit');
       collectorExporterConfig = {
         hostname: 'foo',
-        logger: new NoopLogger(),
+        logger: new api.NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',
@@ -126,7 +126,7 @@ describe('CollectorMetricExporter - common', () => {
       });
 
       it('should set default logger', () => {
-        assert.ok(collectorExporter.logger instanceof NoopLogger);
+        assert.ok(collectorExporter.logger instanceof api.NoopLogger);
       });
     });
   });
@@ -212,7 +212,7 @@ describe('CollectorMetricExporter - common', () => {
       );
       collectorExporterConfig = {
         hostname: 'foo',
-        logger: new NoopLogger(),
+        logger: new api.NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',

diff --git a/packages/opentelemetry-exporter-collector/test/common/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/common/CollectorTraceExporter.test.ts
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import { ExportResultCode, NoopLogger } from '@opentelemetry/core';
+import { NoopLogger } from '@opentelemetry/api';
+import { ExportResultCode } from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import * as assert from 'assert';
 import * as sinon from 'sinon';

diff --git a/packages/opentelemetry-exporter-collector/test/common/utils.test.ts b/packages/opentelemetry-exporter-collector/test/common/utils.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { NoopLogger } from '@opentelemetry/core';
+import { NoopLogger } from '@opentelemetry/api';
 import { parseHeaders } from '../../src/util';
 
 describe('utils', () => {

diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts
@@ -81,7 +81,7 @@ describe('CollectorMetricExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        logger: new core.NoopLogger(),
+        logger: new api.NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',

diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { NoopLogger } from '@opentelemetry/api';
 import * as core from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import * as http from 'http';
@@ -71,7 +72,7 @@ describe('CollectorTraceExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        logger: new core.NoopLogger(),
+        logger: new NoopLogger(),
         serviceName: 'bar',
         attributes: {},
         url: 'http://foo.bar.com',

diff --git a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts
@@ -15,11 +15,7 @@
  */
 
 import * as api from '@opentelemetry/api';
-import {
-  ExportResult,
-  ExportResultCode,
-  NoopLogger,
-} from '@opentelemetry/core';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing';
 import { Socket } from 'dgram';
 import { spanToThrift } from './transform';
@@ -39,7 +35,7 @@ export class JaegerExporter implements SpanExporter {
 
   constructor(config: jaegerTypes.ExporterConfig) {
     const localConfig = Object.assign({}, config);
-    this._logger = localConfig.logger || new NoopLogger();
+    this._logger = localConfig.logger || new api.NoopLogger();
     const tags: jaegerTypes.Tag[] = localConfig.tags || [];
     this._onShutdownFlushTimeout =
       typeof localConfig.flushTimeout === 'number'

diff --git a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts
@@ -16,11 +16,7 @@
 
 import * as assert from 'assert';
 import { JaegerExporter } from '../src';
-import {
-  ExportResult,
-  ExportResultCode,
-  NoopLogger,
-} from '@opentelemetry/core';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 import * as api from '@opentelemetry/api';
 import { ThriftProcess } from '../src/types';
 import { ReadableSpan } from '@opentelemetry/tracing';
@@ -48,7 +44,7 @@ describe('JaegerExporter', () => {
         serviceName: 'opentelemetry',
         host: 'remotehost',
         port: 8080,
-        logger: new NoopLogger(),
+        logger: new api.NoopLogger(),
         tags: [{ key: 'opentelemetry-exporter-jaeger', value: '0.1.0' }],
       });
       assert.ok(typeof exporter.export === 'function');

diff --git a/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts
@@ -17,7 +17,6 @@
 import * as api from '@opentelemetry/api';
 import {
   ExportResult,
-  NoopLogger,
   globalErrorHandler,
   ExportResultCode,
 } from '@opentelemetry/core';
@@ -55,7 +54,7 @@ export class PrometheusExporter implements MetricExporter {
    * @param callback Callback to be called after a server was started
    */
   constructor(config: ExporterConfig = {}, callback?: () => void) {
-    this._logger = config.logger || new NoopLogger();
+    this._logger = config.logger || new api.NoopLogger();
     this._port = config.port || PrometheusExporter.DEFAULT_OPTIONS.port;
     this._prefix = config.prefix || PrometheusExporter.DEFAULT_OPTIONS.prefix;
     this._appendTimestamp =

diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts
@@ -15,11 +15,7 @@
  */
 
 import * as api from '@opentelemetry/api';
-import {
-  ExportResult,
-  ExportResultCode,
-  NoopLogger,
-} from '@opentelemetry/core';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 import { SpanExporter, ReadableSpan } from '@opentelemetry/tracing';
 import { prepareSend } from './platform/index';
 import * as zipkinTypes from './types';
@@ -46,7 +42,7 @@ export class ZipkinExporter implements SpanExporter {
 
   constructor(config: zipkinTypes.ExporterConfig = {}) {
     const urlStr = config.url || ZipkinExporter.DEFAULT_URL;
-    this._logger = config.logger || new NoopLogger();
+    this._logger = config.logger || new api.NoopLogger();
     this._send = prepareSend(this._logger, urlStr, config.headers);
     this._serviceName = config.serviceName;
     this._statusCodeTagName = config.statusCodeTagName || statusCodeTagName;

diff --git a/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { NoopLogger } from '@opentelemetry/api';
 import {
-  NoopLogger,
   setGlobalErrorHandler,
   loggingErrorHandler,
 } from '@opentelemetry/core';

diff --git a/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts b/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts
@@ -18,7 +18,6 @@ import * as api from '@opentelemetry/api';
 import {
   hrTimeDuration,
   hrTimeToMicroseconds,
-  NoopLogger,
   VERSION,
 } from '@opentelemetry/core';
 import { Resource, TELEMETRY_SDK_RESOURCE } from '@opentelemetry/resources';
@@ -32,7 +31,7 @@ import {
   _toZipkinTags,
 } from '../../src/transform';
 import * as zipkinTypes from '../../src/types';
-const logger = new NoopLogger();
+const logger = new api.NoopLogger();
 const tracer = new BasicTracerProvider({
   logger,
 }).getTracer('default');