diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts index 9f62d807b1c..5a20cb6bb21 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts @@ -18,7 +18,7 @@ import { context, propagation, Span as ISpan, - SpanKind, + SpanKind, trace, SpanAttributes, } from '@opentelemetry/api'; @@ -31,8 +31,8 @@ import { NetTransportValues, SemanticAttributes, } from '@opentelemetry/semantic-conventions'; -import * as assert from 'assert'; -import * as nock from 'nock'; +import assert from 'assert'; +import nock from 'nock'; import * as path from 'path'; import { HttpInstrumentation } from '../../src/http'; import { HttpInstrumentationConfig } from '../../src/types'; @@ -507,7 +507,7 @@ describe('HttpInstrumentation', () => { hostname: 'localhost', pathname: '/', forceStatus: { - code: SpanStatusCode.ERROR, + code: SpanStatusCode.ERROR, message: err.message, }, component: 'http', diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts index 8da3577ddb6..1b67a400472 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts @@ -33,9 +33,9 @@ instrumentation.enable(); instrumentation.disable(); import * as http from 'http'; -import * as request from 'request-promise-native'; +import request from 'request-promise-native'; import * as superagent from 'superagent'; -import * as got from 'got'; +import got from 'got'; import * as nock from 'nock'; import axios, { AxiosResponse } from 'axios'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts index 3811dbf8034..783012c2195 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts @@ -36,7 +36,7 @@ import { import * as assert from 'assert'; import * as fs from 'fs'; import * as semver from 'semver'; -import * as nock from 'nock'; +import nock from 'nock'; import * as path from 'path'; import { HttpInstrumentation } from '../../src/http'; import { assertSpan } from '../utils/assertSpan'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts index 3735e530f92..a205efad938 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts @@ -33,9 +33,9 @@ instrumentation.enable(); instrumentation.disable(); import * as http from 'http'; -import * as request from 'request-promise-native'; +import request from 'request-promise-native'; import * as superagent from 'superagent'; -import * as got from 'got'; +import got from 'got'; import * as nock from 'nock'; import axios, { AxiosResponse } from 'axios'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts index f631f001ee9..340f89517fa 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts @@ -16,7 +16,7 @@ import * as types from '../../types'; import * as path from 'path'; -import * as RequireInTheMiddle from 'require-in-the-middle'; +import RequireInTheMiddle from 'require-in-the-middle'; import { satisfies } from 'semver'; import { InstrumentationAbstract } from '../../instrumentation'; import { InstrumentationModuleDefinition } from './types'; @@ -67,7 +67,7 @@ export abstract class InstrumentationBase } catch (error) { diag.warn('Failed extracting version', baseDir); } - + return undefined; } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts index 32f295694c6..79ad90d8ad3 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts @@ -18,6 +18,7 @@ import { diag } from '@opentelemetry/api'; import * as api from '@opentelemetry/api-metrics'; import { InstrumentationLibrary } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; +import merge from 'lodash.merge'; import { BatchObserver } from './BatchObserver'; import { BaseBoundInstrument } from './BoundInstrument'; import { CounterMetric } from './CounterMetric'; @@ -31,8 +32,6 @@ import { UpDownCounterMetric } from './UpDownCounterMetric'; import { UpDownSumObserverMetric } from './UpDownSumObserverMetric'; import { ValueObserverMetric } from './ValueObserverMetric'; import { ValueRecorderMetric } from './ValueRecorderMetric'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const merge = require('lodash.merge'); /** * Meter is an implementation of the {@link Meter} interface. diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts index 226ff63aa64..89735d2d930 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts @@ -16,10 +16,9 @@ import * as api from '@opentelemetry/api-metrics'; import { Resource } from '@opentelemetry/resources'; +import merge from 'lodash.merge'; import { Meter } from '.'; import { DEFAULT_CONFIG, MeterConfig } from './types'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const merge = require('lodash.merge'); /** * This class represents a meter provider which platform libraries can extend diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts index 6ebf7bdf64b..16da3ac5282 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as assert from 'assert'; +import assert from 'assert'; import { HistogramAggregator } from '../../../src/export/aggregators'; import { Histogram } from '../../../src'; import { hrTime, hrTimeToMilliseconds } from '@opentelemetry/core'; diff --git a/packages/opentelemetry-context-async-hooks/test/AsyncHooksContextManager.test.ts b/packages/opentelemetry-context-async-hooks/test/AsyncHooksContextManager.test.ts index 0b8e4868919..ce765543fa5 100644 --- a/packages/opentelemetry-context-async-hooks/test/AsyncHooksContextManager.test.ts +++ b/packages/opentelemetry-context-async-hooks/test/AsyncHooksContextManager.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as assert from 'assert'; +import assert from 'assert'; import { AsyncHooksContextManager, AsyncLocalStorageContextManager, diff --git a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts index d612d4ca6b4..0455599c742 100644 --- a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts +++ b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts @@ -16,7 +16,7 @@ import 'zone.js'; import * as sinon from 'sinon'; -import * as assert from 'assert'; +import assert from 'assert'; import { ZoneContextManager } from '../src'; import { ROOT_CONTEXT, createContextKey } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts b/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts index bda93eddd38..0020b7c8ae2 100644 --- a/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts +++ b/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as assert from 'assert'; +import assert from 'assert'; import * as api from '@opentelemetry/api'; import { AlwaysOffSampler } from '../../src/trace/sampler/AlwaysOffSampler'; diff --git a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts index c51dd2b022c..ea0362f4510 100644 --- a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts +++ b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as assert from 'assert'; +import assert from 'assert'; import { JaegerExporter } from '../src'; import { ExportResult, ExportResultCode } from '@opentelemetry/core'; import * as api from '@opentelemetry/api'; @@ -22,7 +22,7 @@ import { ThriftProcess } from '../src/types'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { TraceFlags } from '@opentelemetry/api'; import { Resource } from '@opentelemetry/resources'; -import * as nock from 'nock'; +import nock from 'nock'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; describe('JaegerExporter', () => { diff --git a/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts b/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts index 6e0a0d38c6a..e2d8cbf38ad 100644 --- a/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts +++ b/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as assert from 'assert'; +import assert from 'assert'; import { PrometheusLabelsBatcher } from '../src/PrometheusLabelsBatcher'; import { CounterMetric, diff --git a/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts index 4934ebb7889..b467bbb4c55 100644 --- a/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts +++ b/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts @@ -24,7 +24,7 @@ import { ValueObserverMetric, } from '@opentelemetry/sdk-metrics-base'; import { diag, DiagLogLevel } from '@opentelemetry/api'; -import * as assert from 'assert'; +import assert from 'assert'; import { Labels } from '@opentelemetry/api-metrics'; import { PrometheusSerializer } from '../src/PrometheusSerializer'; import { PrometheusLabelsBatcher } from '../src/PrometheusLabelsBatcher'; diff --git a/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts index e9d2c083a60..64d1119fd57 100644 --- a/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts @@ -19,7 +19,7 @@ import { loggingErrorHandler, } from '@opentelemetry/core'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; +import assert from 'assert'; import * as sinon from 'sinon'; import { ZipkinExporter } from '../../src'; import * as zipkinTypes from '../../src/types'; diff --git a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts index 8749917fe91..49d284a518a 100644 --- a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import * as nock from 'nock'; +import nock from 'nock'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { ExportResult, diff --git a/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts b/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts index 93836c84c90..6addb415c45 100644 --- a/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts +++ b/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts @@ -24,7 +24,7 @@ import { TraceFlags, } from '@opentelemetry/api'; import { suppressTracing } from '@opentelemetry/core'; -import * as assert from 'assert'; +import assert from 'assert'; import { JaegerPropagator, UBER_TRACE_ID_HEADER, diff --git a/packages/opentelemetry-sdk-node/test/sdk.test.ts b/packages/opentelemetry-sdk-node/test/sdk.test.ts index 6584f5f870e..b22ae486e9d 100644 --- a/packages/opentelemetry-sdk-node/test/sdk.test.ts +++ b/packages/opentelemetry-sdk-node/test/sdk.test.ts @@ -50,7 +50,7 @@ import { HOST_ADDRESS, SECONDARY_HOST_ADDRESS, } from 'gcp-metadata'; -import * as nock from 'nock'; +import nock from 'nock'; import * as semver from 'semver'; import * as Sinon from 'sinon'; import { NodeSDK } from '../src'; diff --git a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts index 4c028448b41..04d8c09d2b3 100644 --- a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts @@ -29,13 +29,12 @@ import { getEnv, } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; +import merge from 'lodash.merge'; import { SpanProcessor, Tracer } from '.'; import { DEFAULT_CONFIG } from './config'; import { MultiSpanProcessor } from './MultiSpanProcessor'; import { NoopSpanProcessor } from './export/NoopSpanProcessor'; import { SDKRegistrationConfig, TracerConfig } from './types'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const merge = require('lodash.merge'); import { SpanExporter } from './export/SpanExporter'; import { BatchSpanProcessor } from './platform'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts index 1b5e6872e38..555a26217be 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts @@ -34,7 +34,7 @@ import { TraceState, } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; +import assert from 'assert'; import * as sinon from 'sinon'; import { BasicTracerProvider, diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts index b0e56c21613..45c59ed5e43 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts @@ -31,7 +31,7 @@ import { InstrumentationLibrary, suppressTracing } from '@opentelemetry/core'; -import * as assert from 'assert'; +import assert from 'assert'; import { BasicTracerProvider, Span, Tracer } from '../../src'; import { TestStackContextManager } from './export/TestStackContextManager'; import * as sinon from 'sinon'; diff --git a/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts b/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts index 1509780e7ba..a2d7a8ab247 100644 --- a/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts +++ b/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts @@ -15,7 +15,7 @@ */ import { createContextKey, ROOT_CONTEXT } from '@opentelemetry/api'; -import * as assert from 'assert'; +import assert from 'assert'; import { StackContextManager } from '../src'; describe('StackContextManager', () => { diff --git a/tsconfig.base.json b/tsconfig.base.json index b2d1a3bd96f..e29df5f3aab 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -5,6 +5,7 @@ "composite": true, "declaration": true, "declarationMap": true, + "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "module": "commonjs", "noEmitOnError": true,