From bd44b6ca02f8f9da65825e58c8ade465b7922557 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Mon, 14 Dec 2020 21:07:48 +0530 Subject: [PATCH 1/4] chore: remove nooplogger from sdk and use from api --- benchmark/tracer.js | 3 +- .../src/common/NoopLogger.ts | 32 ------------------- .../src/context/propagation/composite.ts | 2 +- packages/opentelemetry-core/src/index.ts | 1 - .../test/platform/BasePlugin.test.ts | 4 +-- .../test/platform/browser/BasePlugin.test.ts | 8 +++-- .../test/helper.ts | 4 ++- .../test/CollectorMetricExporter.test.ts | 3 +- .../test/CollectorTraceExporter.test.ts | 4 +-- .../test/helper.ts | 4 ++- .../src/CollectorExporterBase.ts | 8 ++--- .../src/util.ts | 3 +- .../browser/CollectorMetricExporter.test.ts | 8 ++--- .../browser/CollectorTraceExporter.test.ts | 3 +- .../common/CollectorMetricExporter.test.ts | 8 ++--- .../common/CollectorTraceExporter.test.ts | 4 +-- .../test/common/utils.test.ts | 2 +- .../test/helper.ts | 4 ++- .../test/node/CollectorMetricExporter.test.ts | 2 +- .../test/node/CollectorTraceExporter.test.ts | 3 +- .../src/jaeger.ts | 8 ++--- .../test/jaeger.test.ts | 8 ++--- .../src/PrometheusExporter.ts | 3 +- .../src/zipkin.ts | 8 ++--- .../test/browser/zipkin.test.ts | 2 +- .../test/common/transform.test.ts | 3 +- .../test/node/zipkin.test.ts | 19 ++++++----- .../test/grpcUtils.test.ts | 2 +- .../src/version.ts | 2 +- .../test/functionals/http-disable.test.ts | 7 ++-- .../test/functionals/http-enable.test.ts | 2 +- .../test/functionals/http-package.test.ts | 9 ++++-- .../test/functionals/https-disable.test.ts | 7 ++-- .../test/functionals/https-enable.test.ts | 2 +- .../test/functionals/https-package.test.ts | 9 ++++-- .../test/functionals/utils.test.ts | 2 +- .../test/integrations/http-enable.test.ts | 9 ++++-- .../test/integrations/https-enable.test.ts | 9 ++++-- .../src/xhr.ts | 4 ++- packages/opentelemetry-metrics/src/Metric.ts | 3 +- .../opentelemetry-metrics/test/Meter.test.ts | 4 +-- .../test/MeterProvider.test.ts | 2 +- .../test/Processor.test.ts | 3 +- .../test/NodeTracerProvider.test.ts | 2 +- .../test/instrumentation/PluginLoader.test.ts | 3 +- .../test/instrumentation/utils.test.ts | 2 +- .../test/functionals/http-disable.test.ts | 7 ++-- .../test/functionals/http-enable.test.ts | 2 +- .../test/functionals/http-package.test.ts | 3 +- .../test/functionals/utils.test.ts | 2 +- .../test/integrations/http-enable.test.ts | 3 +- .../test/functionals/https-disable.test.ts | 2 +- .../test/functionals/https-enable.test.ts | 2 +- .../test/functionals/https-package.test.ts | 3 +- .../test/integrations/https-enable.test.ts | 3 +- .../detectors/AwsBeanstalkDetector.test.ts | 2 +- .../test/detectors/AwsEc2Detector.test.ts | 2 +- .../test/detectors/AwsEcsDetector.test.ts | 2 +- .../test/detectors/AwsEksDetector.test.ts | 2 +- .../package.json | 1 + .../test/detectors/GcpDetector.test.ts | 2 +- .../src/platform/node/detect-resources.ts | 3 +- .../test/detectors/EnvDetector.test.ts | 2 +- .../test/detectors/ProcessDetector.test.ts | 2 +- .../src/shim.ts | 3 +- .../test/BasicTracerProvider.test.ts | 2 +- .../opentelemetry-tracing/test/Span.test.ts | 2 +- .../opentelemetry-tracing/test/Tracer.test.ts | 2 +- .../test/export/TestTracingSpanExporter.ts | 3 +- packages/opentelemetry-web/src/utils.ts | 4 ++- .../test/WebTracerProvider.test.ts | 4 +-- 71 files changed, 146 insertions(+), 163 deletions(-) delete mode 100644 packages/opentelemetry-core/src/common/NoopLogger.ts diff --git a/benchmark/tracer.js b/benchmark/tracer.js index ab636e924ed..274cd6de99f 100644 --- 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 deleted file mode 100644 index b3db42c994d..00000000000 --- a/packages/opentelemetry-core/src/common/NoopLogger.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Logger } from '@opentelemetry/api'; - -/** No-op implementation of Logger */ -export class NoopLogger implements Logger { - // By default does nothing - debug(_message: string, ..._args: unknown[]) {} - - // By default does nothing - error(_message: string, ..._args: unknown[]) {} - - // By default does nothing - warn(_message: string, ..._args: unknown[]) {} - - // By default does nothing - info(_message: string, ..._args: unknown[]) {} -} diff --git a/packages/opentelemetry-core/src/context/propagation/composite.ts b/packages/opentelemetry-core/src/context/propagation/composite.ts index 7048c3e7d4e..27b4101ee49 100644 --- 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 index 0835399ec1e..ebfe5623c6d 100644 --- 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 index 912d4bc4a1e..b55fde88500 100644 --- 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 index 202d74e350d..919acbba1b8 100644 --- 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-grpc/test/helper.ts b/packages/opentelemetry-exporter-collector-grpc/test/helper.ts index a45eecff164..55018273c26 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/helper.ts +++ b/packages/opentelemetry-exporter-collector-grpc/test/helper.ts @@ -87,7 +87,9 @@ export function mockObserver( return metric; } -export function mockValueRecorder(): metrics.Metric & +export function mockValueRecorder(): metrics.Metric< + metrics.BoundValueRecorder +> & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts index 0a943a737f8..b8645a5ba62 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts +++ b/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts @@ -17,7 +17,6 @@ import * as api from '@opentelemetry/api'; import * as metrics from '@opentelemetry/metrics'; import { collectorTypes } from '@opentelemetry/exporter-collector'; -import * as core from '@opentelemetry/core'; import * as http from 'http'; import * as assert from 'assert'; import * as sinon from 'sinon'; @@ -61,7 +60,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 index 6f534d95581..a0e6687f67b 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts +++ b/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts @@ -16,7 +16,7 @@ import { collectorTypes } 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'; @@ -56,7 +56,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-proto/test/helper.ts b/packages/opentelemetry-exporter-collector-proto/test/helper.ts index a2edcfd9f4c..116253205d5 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/helper.ts +++ b/packages/opentelemetry-exporter-collector-proto/test/helper.ts @@ -67,7 +67,9 @@ export function mockObserver( return metric; } -export function mockValueRecorder(): metrics.Metric & +export function mockValueRecorder(): metrics.Metric< + metrics.BoundValueRecorder +> & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-exporter-collector/src/CollectorExporterBase.ts b/packages/opentelemetry-exporter-collector/src/CollectorExporterBase.ts index cb4d535d941..fc75a2a806f 100644 --- 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 index 1cb1b18aae4..739698f0e0c 100644 --- 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 index 934dc72c157..9a8d39491d6 100644 --- 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 index 776a01c04b8..968b3ae8f51 100644 --- 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 index 82b8186ba66..fb1b7bb446f 100644 --- 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 index fa08f1b185d..7dc89886ac8 100644 --- 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 index b5fb8d3507e..3f31225de18 100644 --- 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/helper.ts b/packages/opentelemetry-exporter-collector/test/helper.ts index b451bd14430..31f5e1316ae 100644 --- a/packages/opentelemetry-exporter-collector/test/helper.ts +++ b/packages/opentelemetry-exporter-collector/test/helper.ts @@ -127,7 +127,9 @@ export function mockUpDownSumObserver( return metric; } -export function mockValueRecorder(): metrics.Metric & +export function mockValueRecorder(): metrics.Metric< + metrics.BoundValueRecorder +> & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts index ecf87d39836..6bd680ddf8a 100644 --- a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts @@ -79,7 +79,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 index 86b65faa12a..a905f473032 100644 --- 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'; @@ -69,7 +70,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 index f9bac2207a9..8ae8890b63c 100644 --- 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 index 35311875bb5..122759e018d 100644 --- 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 index c83fcb944b0..ad18b0440c5 100644 --- 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'; @@ -53,7 +52,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._server = createServer(this._requestHandler); diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts index cceb8d7d193..93a8fe3006f 100644 --- 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 index 0ed5ca6b0ca..8deac84c17d 100644 --- 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 index 0c6773d227c..99617f4bd17 100644 --- 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'); diff --git a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts index 2d222321793..aa2e357b715 100644 --- a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts @@ -19,7 +19,6 @@ import * as nock from 'nock'; import { ReadableSpan } from '@opentelemetry/tracing'; import { ExportResult, - NoopLogger, hrTimeToMicroseconds, ExportResultCode, } from '@opentelemetry/core'; @@ -77,7 +76,7 @@ describe('Zipkin Exporter - node', () => { it('should construct an exporter with logger', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); assert.ok(typeof exporter.export === 'function'); assert.ok(typeof exporter.shutdown === 'function'); @@ -112,7 +111,7 @@ describe('Zipkin Exporter - node', () => { it('should skip send with empty array', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([], (result: ExportResult) => { @@ -188,7 +187,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([span1, span2], (result: ExportResult) => { @@ -244,7 +243,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), url: 'https://localhost:9411/api/v2/spans', }); @@ -261,7 +260,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([getReadableSpan()], (result: ExportResult) => { @@ -277,7 +276,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([getReadableSpan()], (result: ExportResult) => { @@ -293,7 +292,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([getReadableSpan()], (result: ExportResult) => { @@ -305,7 +304,7 @@ describe('Zipkin Exporter - node', () => { it('should return failed result after shutdown', done => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.shutdown(); @@ -473,7 +472,7 @@ describe('Zipkin Exporter - node', () => { const exporter = new ZipkinExporter({ serviceName: 'my-service', - logger: new NoopLogger(), + logger: new api.NoopLogger(), }); exporter.export([getReadableSpan()], (result: ExportResult) => { diff --git a/packages/opentelemetry-grpc-utils/test/grpcUtils.test.ts b/packages/opentelemetry-grpc-utils/test/grpcUtils.test.ts index c2f877455a3..b9b8f206d2e 100644 --- a/packages/opentelemetry-grpc-utils/test/grpcUtils.test.ts +++ b/packages/opentelemetry-grpc-utils/test/grpcUtils.test.ts @@ -19,9 +19,9 @@ import { NoopTracerProvider, SpanKind, propagation, + NoopLogger, } from '@opentelemetry/api'; import { - NoopLogger, HttpTraceContext, BasePlugin, PluginConfig, diff --git a/packages/opentelemetry-instrumentation-http/src/version.ts b/packages/opentelemetry-instrumentation-http/src/version.ts index 707690f363b..db447568f37 100644 --- a/packages/opentelemetry-instrumentation-http/src/version.ts +++ b/packages/opentelemetry-instrumentation-http/src/version.ts @@ -15,4 +15,4 @@ */ // this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.12.0'; +export const VERSION = '0.13.0'; diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts index 7a962a56e35..a83ae7f04d9 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts @@ -13,8 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { NoopTracerProvider, NOOP_TRACER } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; +import { + NoopTracerProvider, + NoopLogger, + NOOP_TRACER, +} from '@opentelemetry/api'; import * as assert from 'assert'; import { HttpInstrumentation } from '../../src/http'; import { AddressInfo } from 'net'; diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts index 73d37ea79f1..ea3a4654c34 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts @@ -20,8 +20,8 @@ import { Span as ISpan, SpanKind, getActiveSpan, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { InMemorySpanExporter, diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts index 44f6468ec53..88171297f57 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts @@ -14,9 +14,14 @@ * limitations under the License. */ -import { context, SpanKind, Span, propagation } from '@opentelemetry/api'; +import { + context, + SpanKind, + Span, + propagation, + NoopLogger, +} from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { InMemorySpanExporter, diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts index f0eb60b38f0..ed1645f3fd0 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts @@ -14,8 +14,11 @@ * limitations under the License. */ -import { NoopTracerProvider, NOOP_TRACER } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; +import { + NoopTracerProvider, + NoopLogger, + NOOP_TRACER, +} from '@opentelemetry/api'; import * as assert from 'assert'; import * as fs from 'fs'; import type { AddressInfo } from 'net'; diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts index e8a7a186555..4a07ad50852 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts @@ -20,8 +20,8 @@ import { propagation, Span as ISpan, SpanKind, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { ContextManager } from '@opentelemetry/context-base'; import { diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts index 826792953bb..6169ff1b329 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts @@ -14,9 +14,14 @@ * limitations under the License. */ -import { context, SpanKind, propagation, Span } from '@opentelemetry/api'; +import { + context, + SpanKind, + propagation, + NoopLogger, + Span, +} from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { InMemorySpanExporter, diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts index 1a43c057bb2..761238d2225 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts @@ -18,8 +18,8 @@ import { ROOT_CONTEXT, SpanKind, TraceFlags, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { BasicTracerProvider, Span } from '@opentelemetry/tracing'; import { HttpAttribute } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; diff --git a/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts b/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts index 86df32f56e2..f0ba3ec005b 100644 --- a/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts @@ -14,8 +14,13 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; -import { SpanKind, Span, context, propagation } from '@opentelemetry/api'; +import { + SpanKind, + Span, + context, + propagation, + NoopLogger, +} from '@opentelemetry/api'; import { HttpAttribute, GeneralAttribute, diff --git a/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts b/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts index b9d68ea8d14..880c2ec0f6a 100644 --- a/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts @@ -14,8 +14,13 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; -import { SpanKind, Span, context, propagation } from '@opentelemetry/api'; +import { + SpanKind, + Span, + context, + propagation, + NoopLogger, +} from '@opentelemetry/api'; import { HttpAttribute, GeneralAttribute, diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 2ee1d0afe8c..ed11cd74af6 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -68,7 +68,9 @@ export interface XMLHttpRequestInstrumentationConfig /** * This class represents a XMLHttpRequest plugin for auto instrumentation */ -export class XMLHttpRequestInstrumentation extends InstrumentationBase { +export class XMLHttpRequestInstrumentation extends InstrumentationBase< + XMLHttpRequest +> { readonly component: string = 'xml-http-request'; readonly version: string = VERSION; moduleName = this.component; diff --git a/packages/opentelemetry-metrics/src/Metric.ts b/packages/opentelemetry-metrics/src/Metric.ts index e492115cbec..525c166d765 100644 --- a/packages/opentelemetry-metrics/src/Metric.ts +++ b/packages/opentelemetry-metrics/src/Metric.ts @@ -14,7 +14,6 @@ * limitations under the License. */ import * as api from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; import { BaseBoundInstrument } from './BoundInstrument'; import { MetricDescriptor, MetricKind, MetricRecord } from './export/types'; @@ -43,7 +42,7 @@ export abstract class Metric typeof _options.valueType === 'number' ? _options.valueType : api.ValueType.DOUBLE; - this._logger = _options.logger ?? new NoopLogger(); + this._logger = _options.logger ?? new api.NoopLogger(); this._boundaries = _options.boundaries; this._descriptor = this._getMetricDescriptor(); } diff --git a/packages/opentelemetry-metrics/test/Meter.test.ts b/packages/opentelemetry-metrics/test/Meter.test.ts index 957d21a497c..f31470e0403 100644 --- a/packages/opentelemetry-metrics/test/Meter.test.ts +++ b/packages/opentelemetry-metrics/test/Meter.test.ts @@ -34,7 +34,7 @@ import { Histogram, } from '../src'; import * as api from '@opentelemetry/api'; -import { NoopLogger, hrTime, hrTimeToNanoseconds } from '@opentelemetry/core'; +import { hrTime, hrTimeToNanoseconds } from '@opentelemetry/core'; import { BatchObserverResult } from '../src/BatchObserverResult'; import { SumAggregator } from '../src/export/aggregators'; import { SumObserverMetric } from '../src/SumObserverMetric'; @@ -80,7 +80,7 @@ describe('Meter', () => { beforeEach(() => { meter = new MeterProvider({ - logger: new NoopLogger(), + logger: new api.NoopLogger(), }).getMeter('test-meter'); }); diff --git a/packages/opentelemetry-metrics/test/MeterProvider.test.ts b/packages/opentelemetry-metrics/test/MeterProvider.test.ts index ace5b0b4728..f92af4458ca 100644 --- a/packages/opentelemetry-metrics/test/MeterProvider.test.ts +++ b/packages/opentelemetry-metrics/test/MeterProvider.test.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { MeterProvider, Meter, CounterMetric } from '../src'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; describe('MeterProvider', () => { describe('constructor', () => { diff --git a/packages/opentelemetry-metrics/test/Processor.test.ts b/packages/opentelemetry-metrics/test/Processor.test.ts index f7d1ce9c11c..d14bd4fe5a0 100644 --- a/packages/opentelemetry-metrics/test/Processor.test.ts +++ b/packages/opentelemetry-metrics/test/Processor.test.ts @@ -16,7 +16,6 @@ import * as assert from 'assert'; import * as api from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { Meter, MeterProvider } from '../src'; describe('Processor', () => { @@ -27,7 +26,7 @@ describe('Processor', () => { let counter: api.Counter; beforeEach(() => { meter = new MeterProvider({ - logger: new NoopLogger(), + logger: new api.NoopLogger(), interval: 10000, }).getMeter('test-meter'); counter = meter.createCounter('ungrouped-processor-test'); diff --git a/packages/opentelemetry-node/test/NodeTracerProvider.test.ts b/packages/opentelemetry-node/test/NodeTracerProvider.test.ts index 5fcc81e1b8c..5dd1aef9f1a 100644 --- a/packages/opentelemetry-node/test/NodeTracerProvider.test.ts +++ b/packages/opentelemetry-node/test/NodeTracerProvider.test.ts @@ -19,11 +19,11 @@ import { TraceFlags, setActiveSpan, setExtractedSpanContext, + NoopLogger, } from '@opentelemetry/api'; import { AlwaysOnSampler, AlwaysOffSampler, - NoopLogger, NoRecordingSpan, } from '@opentelemetry/core'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; diff --git a/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts b/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts index 954cf7f8ed4..8594b1c8b41 100644 --- a/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts +++ b/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { NoopTracerProvider } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopTracerProvider, NoopLogger } from '@opentelemetry/api'; import * as assert from 'assert'; import * as path from 'path'; import { diff --git a/packages/opentelemetry-node/test/instrumentation/utils.test.ts b/packages/opentelemetry-node/test/instrumentation/utils.test.ts index 0f2eb4f7ac1..06ccdd12e01 100644 --- a/packages/opentelemetry-node/test/instrumentation/utils.test.ts +++ b/packages/opentelemetry-node/test/instrumentation/utils.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; import * as assert from 'assert'; import * as path from 'path'; import * as utils from '../../src/instrumentation/utils'; diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts index 3b80fe84baa..d4298955f93 100644 --- a/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts +++ b/packages/opentelemetry-plugin-http/test/functionals/http-disable.test.ts @@ -13,8 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { NoopTracerProvider, NOOP_TRACER } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; +import { + NoopTracerProvider, + NoopLogger, + NOOP_TRACER, +} from '@opentelemetry/api'; import * as assert from 'assert'; import * as http from 'http'; import { AddressInfo } from 'net'; diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts index c453bbf3160..040e8f3e482 100644 --- a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts +++ b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts @@ -20,8 +20,8 @@ import { Span as ISpan, SpanKind, getActiveSpan, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { InMemorySpanExporter, diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts index 4a775482a52..70f97f0cbb7 100644 --- a/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts +++ b/packages/opentelemetry-plugin-http/test/functionals/http-package.test.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import { context, SpanKind } from '@opentelemetry/api'; +import { context, SpanKind, NoopLogger } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { InMemorySpanExporter, diff --git a/packages/opentelemetry-plugin-http/test/functionals/utils.test.ts b/packages/opentelemetry-plugin-http/test/functionals/utils.test.ts index 9bfd6126ed1..c145413e9ae 100644 --- a/packages/opentelemetry-plugin-http/test/functionals/utils.test.ts +++ b/packages/opentelemetry-plugin-http/test/functionals/utils.test.ts @@ -19,8 +19,8 @@ import { ROOT_CONTEXT, SpanKind, TraceFlags, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { BasicTracerProvider, Span } from '@opentelemetry/tracing'; import { HttpAttribute } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; diff --git a/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts index 8ea38fea17b..383a4b3b456 100644 --- a/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts +++ b/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; -import { SpanKind, Span, context } from '@opentelemetry/api'; +import { SpanKind, Span, context, NoopLogger } from '@opentelemetry/api'; import { HttpAttribute, GeneralAttribute, diff --git a/packages/opentelemetry-plugin-https/test/functionals/https-disable.test.ts b/packages/opentelemetry-plugin-https/test/functionals/https-disable.test.ts index 9d0e8dece6a..7f1e06a568a 100644 --- a/packages/opentelemetry-plugin-https/test/functionals/https-disable.test.ts +++ b/packages/opentelemetry-plugin-https/test/functionals/https-disable.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; import { Http } from '@opentelemetry/plugin-http'; import * as assert from 'assert'; import * as fs from 'fs'; diff --git a/packages/opentelemetry-plugin-https/test/functionals/https-enable.test.ts b/packages/opentelemetry-plugin-https/test/functionals/https-enable.test.ts index 10cc3aeb534..5f24ac1914b 100644 --- a/packages/opentelemetry-plugin-https/test/functionals/https-enable.test.ts +++ b/packages/opentelemetry-plugin-https/test/functionals/https-enable.test.ts @@ -20,8 +20,8 @@ import { propagation, Span as ISpan, SpanKind, + NoopLogger, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { Http, HttpPluginConfig } from '@opentelemetry/plugin-http'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; diff --git a/packages/opentelemetry-plugin-https/test/functionals/https-package.test.ts b/packages/opentelemetry-plugin-https/test/functionals/https-package.test.ts index ff7430afb3e..daf3ac7e9ee 100644 --- a/packages/opentelemetry-plugin-https/test/functionals/https-package.test.ts +++ b/packages/opentelemetry-plugin-https/test/functionals/https-package.test.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import { context, Span, SpanKind } from '@opentelemetry/api'; +import { context, Span, SpanKind, NoopLogger } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { NoopLogger } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/node'; import { Http } from '@opentelemetry/plugin-http'; import { diff --git a/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts b/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts index ef291281f5e..3fc48cdcadf 100644 --- a/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts +++ b/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import { NoopLogger } from '@opentelemetry/core'; import { HttpPluginConfig, Http } from '@opentelemetry/plugin-http'; -import { SpanKind, Span, context } from '@opentelemetry/api'; +import { SpanKind, Span, context, NoopLogger } from '@opentelemetry/api'; import { HttpAttribute, GeneralAttribute, diff --git a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts index 9ccebd70669..f132a8015c9 100644 --- a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts +++ b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts @@ -21,7 +21,7 @@ import { assertEmptyResource, assertServiceResource, } from '@opentelemetry/resources/test/util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; describe('BeanstalkResourceDetector', () => { const err = new Error('failed to read config file'); diff --git a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts index 99461164fd1..340328551b8 100644 --- a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts +++ b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts @@ -22,7 +22,7 @@ import { assertCloudResource, assertHostResource, } from '@opentelemetry/resources/test/util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; const AWS_HOST = 'http://' + awsEc2Detector.AWS_IDMS_ENDPOINT; const AWS_TOKEN_PATH = awsEc2Detector.AWS_INSTANCE_TOKEN_DOCUMENT_PATH; diff --git a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts index e8bed2b3e57..857e40603d0 100644 --- a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts +++ b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts @@ -24,7 +24,7 @@ import { assertEmptyResource, assertContainerResource, } from '@opentelemetry/resources/test/util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; import * as os from 'os'; describe('BeanstalkResourceDetector', () => { diff --git a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts index ce350e2084a..7356240bc32 100644 --- a/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts +++ b/packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts @@ -24,7 +24,7 @@ import { assertContainerResource, assertEmptyResource, } from '@opentelemetry/resources/test/util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; const K8S_SVC_URL = awsEksDetector.K8S_SVC_URL; const AUTH_CONFIGMAP_PATH = awsEksDetector.AUTH_CONFIGMAP_PATH; diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json index af5980df071..11bbaacbc21 100644 --- a/packages/opentelemetry-resource-detector-gcp/package.json +++ b/packages/opentelemetry-resource-detector-gcp/package.json @@ -56,6 +56,7 @@ "typescript": "3.9.7" }, "dependencies": { + "@opentelemetry/api": "^0.13.0", "@opentelemetry/resources": "^0.13.0", "gcp-metadata": "^4.1.4", "semver": "7.3.4" diff --git a/packages/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts b/packages/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts index 4d227919f2e..f64e684d084 100644 --- a/packages/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts +++ b/packages/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts @@ -32,7 +32,7 @@ import { assertContainerResource, assertEmptyResource, } from '@opentelemetry/resources/test/util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; import { Resource } from '@opentelemetry/resources'; const HEADERS = { diff --git a/packages/opentelemetry-resources/src/platform/node/detect-resources.ts b/packages/opentelemetry-resources/src/platform/node/detect-resources.ts index 37fa35278d5..cb29dc7c40e 100644 --- a/packages/opentelemetry-resources/src/platform/node/detect-resources.ts +++ b/packages/opentelemetry-resources/src/platform/node/detect-resources.ts @@ -19,9 +19,8 @@ import { ResourceDetectionConfig, ResourceDetectionConfigWithLogger, } from '../../config'; -import { Logger } from '@opentelemetry/api'; +import { Logger, NoopLogger } from '@opentelemetry/api'; import * as util from 'util'; -import { NoopLogger } from '@opentelemetry/core'; /** * Runs all resource detectors and returns the results merged into a single diff --git a/packages/opentelemetry-resources/test/detectors/EnvDetector.test.ts b/packages/opentelemetry-resources/test/detectors/EnvDetector.test.ts index df45725cb9d..c2056d0031b 100644 --- a/packages/opentelemetry-resources/test/detectors/EnvDetector.test.ts +++ b/packages/opentelemetry-resources/test/detectors/EnvDetector.test.ts @@ -19,7 +19,7 @@ import { assertK8sResource, assertEmptyResource, } from '../util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; describe('envDetector()', () => { describe('with valid env', () => { diff --git a/packages/opentelemetry-resources/test/detectors/ProcessDetector.test.ts b/packages/opentelemetry-resources/test/detectors/ProcessDetector.test.ts index 9290ef5f630..c4f8ce9569a 100644 --- a/packages/opentelemetry-resources/test/detectors/ProcessDetector.test.ts +++ b/packages/opentelemetry-resources/test/detectors/ProcessDetector.test.ts @@ -19,7 +19,7 @@ import { assertProcessResource, assertEmptyResource, } from '../util/resource-assertions'; -import { NoopLogger } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; describe('processDetector()', () => { let sandbox: sinon.SinonSandbox; diff --git a/packages/opentelemetry-shim-opentracing/src/shim.ts b/packages/opentelemetry-shim-opentracing/src/shim.ts index 000a96dee3c..f391f6acf9d 100644 --- a/packages/opentelemetry-shim-opentracing/src/shim.ts +++ b/packages/opentelemetry-shim-opentracing/src/shim.ts @@ -16,7 +16,6 @@ import * as api from '@opentelemetry/api'; import { - NoopLogger, setCorrelationContext, getCorrelationContext, } from '@opentelemetry/core'; @@ -133,7 +132,7 @@ export class TracerShim extends opentracing.Tracer { super(); this._tracer = tracer; - this._logger = logger || new NoopLogger(); + this._logger = logger || new api.NoopLogger(); } startSpan( diff --git a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts b/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts index fe212d351cf..a6fa4d53ead 100644 --- a/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-tracing/test/BasicTracerProvider.test.ts @@ -22,11 +22,11 @@ import { ROOT_CONTEXT, setActiveSpan, setExtractedSpanContext, + NoopLogger, } from '@opentelemetry/api'; import { AlwaysOnSampler, AlwaysOffSampler, - NoopLogger, NoRecordingSpan, TraceState, } from '@opentelemetry/core'; diff --git a/packages/opentelemetry-tracing/test/Span.test.ts b/packages/opentelemetry-tracing/test/Span.test.ts index 9bf0fb19fc9..6a764c8ffd8 100644 --- a/packages/opentelemetry-tracing/test/Span.test.ts +++ b/packages/opentelemetry-tracing/test/Span.test.ts @@ -22,13 +22,13 @@ import { SpanContext, SpanKind, TraceFlags, + NoopLogger, } from '@opentelemetry/api'; import { hrTime, hrTimeDuration, hrTimeToMilliseconds, hrTimeToNanoseconds, - NoopLogger, } from '@opentelemetry/core'; import { ExceptionAttribute } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; diff --git a/packages/opentelemetry-tracing/test/Tracer.test.ts b/packages/opentelemetry-tracing/test/Tracer.test.ts index 9e28fa46f89..288a8237428 100644 --- a/packages/opentelemetry-tracing/test/Tracer.test.ts +++ b/packages/opentelemetry-tracing/test/Tracer.test.ts @@ -23,11 +23,11 @@ import { TraceFlags, ROOT_CONTEXT, suppressInstrumentation, + NoopLogger, } from '@opentelemetry/api'; import { BasicTracerProvider, Tracer, Span } from '../src'; import { InstrumentationLibrary, - NoopLogger, AlwaysOnSampler, AlwaysOffSampler, } from '@opentelemetry/core'; diff --git a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts b/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts index a5804e8af5c..cff7c0e9f45 100644 --- a/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts +++ b/packages/opentelemetry-tracing/test/export/TestTracingSpanExporter.ts @@ -21,7 +21,8 @@ import { Tracer, SpanProcessor, } from '../../src'; -import { ExportResult, NoopLogger, AlwaysOnSampler } from '@opentelemetry/core'; +import { ExportResult, AlwaysOnSampler } from '@opentelemetry/core'; +import { NoopLogger } from '@opentelemetry/api'; /** * A test-only span exporter that naively simulates triggering instrumentation diff --git a/packages/opentelemetry-web/src/utils.ts b/packages/opentelemetry-web/src/utils.ts index 6b94959f963..385cb1d05fa 100644 --- a/packages/opentelemetry-web/src/utils.ts +++ b/packages/opentelemetry-web/src/utils.ts @@ -125,7 +125,9 @@ export function getResource( startTimeHR: api.HrTime, endTimeHR: api.HrTime, resources: PerformanceResourceTiming[], - ignoredResources: WeakSet = new WeakSet(), + ignoredResources: WeakSet = new WeakSet< + PerformanceResourceTiming + >(), initiatorType?: string ): PerformanceResourceTimingInfo { // de-relativize the URL before usage (does no harm to absolute URLs) diff --git a/packages/opentelemetry-web/test/WebTracerProvider.test.ts b/packages/opentelemetry-web/test/WebTracerProvider.test.ts index 281f901fc57..051c2f4bca4 100644 --- a/packages/opentelemetry-web/test/WebTracerProvider.test.ts +++ b/packages/opentelemetry-web/test/WebTracerProvider.test.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { context } from '@opentelemetry/api'; +import { context, NoopLogger } from '@opentelemetry/api'; import { ContextManager } from '@opentelemetry/context-base'; import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { BasePlugin, NoopLogger } from '@opentelemetry/core'; +import { BasePlugin } from '@opentelemetry/core'; import { InstrumentationBase } from '@opentelemetry/instrumentation'; import { B3Propagator } from '@opentelemetry/propagator-b3'; import { Resource, TELEMETRY_SDK_RESOURCE } from '@opentelemetry/resources'; From 6302a1668c5a456e530f93e919314ef1eaf53830 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Mon, 14 Dec 2020 22:24:29 +0530 Subject: [PATCH 2/4] chore: fix lint --- packages/opentelemetry-exporter-collector-grpc/test/helper.ts | 4 +--- .../opentelemetry-exporter-collector-proto/test/helper.ts | 4 +--- packages/opentelemetry-exporter-collector/test/helper.ts | 4 +--- .../opentelemetry-instrumentation-xml-http-request/src/xhr.ts | 4 +--- packages/opentelemetry-web/src/utils.ts | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/packages/opentelemetry-exporter-collector-grpc/test/helper.ts b/packages/opentelemetry-exporter-collector-grpc/test/helper.ts index 55018273c26..a45eecff164 100644 --- a/packages/opentelemetry-exporter-collector-grpc/test/helper.ts +++ b/packages/opentelemetry-exporter-collector-grpc/test/helper.ts @@ -87,9 +87,7 @@ export function mockObserver( return metric; } -export function mockValueRecorder(): metrics.Metric< - metrics.BoundValueRecorder -> & +export function mockValueRecorder(): metrics.Metric & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-exporter-collector-proto/test/helper.ts b/packages/opentelemetry-exporter-collector-proto/test/helper.ts index 116253205d5..a2edcfd9f4c 100644 --- a/packages/opentelemetry-exporter-collector-proto/test/helper.ts +++ b/packages/opentelemetry-exporter-collector-proto/test/helper.ts @@ -67,9 +67,7 @@ export function mockObserver( return metric; } -export function mockValueRecorder(): metrics.Metric< - metrics.BoundValueRecorder -> & +export function mockValueRecorder(): metrics.Metric & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-exporter-collector/test/helper.ts b/packages/opentelemetry-exporter-collector/test/helper.ts index 31f5e1316ae..b451bd14430 100644 --- a/packages/opentelemetry-exporter-collector/test/helper.ts +++ b/packages/opentelemetry-exporter-collector/test/helper.ts @@ -127,9 +127,7 @@ export function mockUpDownSumObserver( return metric; } -export function mockValueRecorder(): metrics.Metric< - metrics.BoundValueRecorder -> & +export function mockValueRecorder(): metrics.Metric & api.ValueRecorder { const name = 'int-recorder'; const metric = diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 31787dd3c01..1e5fe3e1fd3 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -68,9 +68,7 @@ export interface XMLHttpRequestInstrumentationConfig /** * This class represents a XMLHttpRequest plugin for auto instrumentation */ -export class XMLHttpRequestInstrumentation extends InstrumentationBase< - XMLHttpRequest -> { +export class XMLHttpRequestInstrumentation extends InstrumentationBase { readonly component: string = 'xml-http-request'; readonly version: string = VERSION; moduleName = this.component; diff --git a/packages/opentelemetry-web/src/utils.ts b/packages/opentelemetry-web/src/utils.ts index 385cb1d05fa..6b94959f963 100644 --- a/packages/opentelemetry-web/src/utils.ts +++ b/packages/opentelemetry-web/src/utils.ts @@ -125,9 +125,7 @@ export function getResource( startTimeHR: api.HrTime, endTimeHR: api.HrTime, resources: PerformanceResourceTiming[], - ignoredResources: WeakSet = new WeakSet< - PerformanceResourceTiming - >(), + ignoredResources: WeakSet = new WeakSet(), initiatorType?: string ): PerformanceResourceTimingInfo { // de-relativize the URL before usage (does no harm to absolute URLs) From 158bdd39512d333d7c9caa318b18b0dcffa057f0 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 15 Dec 2020 13:01:58 +0530 Subject: [PATCH 3/4] Resolve conflict issue --- packages/opentelemetry-shim-opentracing/src/shim.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/opentelemetry-shim-opentracing/src/shim.ts b/packages/opentelemetry-shim-opentracing/src/shim.ts index 537ada1bac3..a5ca8ec5b1b 100644 --- a/packages/opentelemetry-shim-opentracing/src/shim.ts +++ b/packages/opentelemetry-shim-opentracing/src/shim.ts @@ -15,10 +15,6 @@ */ import * as api from '@opentelemetry/api'; -import { - setCorrelationContext, - getCorrelationContext, -} from '@opentelemetry/core'; import * as opentracing from 'opentracing'; import { Attributes, AttributeValue } from '@opentelemetry/api'; From 1ded256f73257dcc5467d1c7cddd5aff592a1e6c Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 15 Dec 2020 13:25:29 +0530 Subject: [PATCH 4/4] chore: remove unused import --- .../test/CollectorMetricExporter.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts index 80f3a3e1e11..2547dfeac18 100644 --- 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';