fix: remove require usage in esm build

Also fixes that assuming esmodule namespace object as callable in tests

experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts

@@ -34,7 +34,7 @@ import {
   WebTracerProvider,
 } from '@opentelemetry/sdk-trace-web';
 import * as assert from 'assert';
-import * as sinon from 'sinon';
+import sinon from 'sinon';
 import {
   FetchInstrumentation,
   FetchInstrumentationConfig,

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',

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';
 

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';

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';
 

experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts

@@ -32,7 +32,7 @@ import {
   parseUrl,
 } from '@opentelemetry/sdk-trace-web';
 import * as assert from 'assert';
-import * as sinon from 'sinon';
+import sinon from 'sinon';
 import { EventNames } from '../src/enums/EventNames';
 import {
   XMLHttpRequestInstrumentation,

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<T = any>
     } catch (error) {
       diag.warn('Failed extracting version', baseDir);
     }
-    
+
     return undefined;
   }
 

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.

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

experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts

@@ -14,11 +14,11 @@
  * 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';
-import sinon = require('sinon');
+import sinon from 'sinon';
 
 describe('HistogramAggregator', () => {
   describe('constructor()', () => {

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,

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';
 

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';
 

packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts

@@ -27,7 +27,7 @@ import {
 } from '@opentelemetry/exporter-collector';
 import * as metrics from '@opentelemetry/sdk-metrics-base';
 import * as assert from 'assert';
-import * as http from 'http';
+import http from 'http';
 import * as sinon from 'sinon';
 import { CollectorMetricExporter } from '../src';
 import { getExportRequestProto } from '../src/util';

packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts

@@ -23,7 +23,7 @@ import {
 } from '@opentelemetry/exporter-collector';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import * as assert from 'assert';
-import * as http from 'http';
+import http from 'http';
 import * as sinon from 'sinon';
 import { Stream } from 'stream';
 import * as zlib from 'zlib';

packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts

@@ -29,7 +29,7 @@ import {
   MetricRecord,
 } from '@opentelemetry/sdk-metrics-base';
 import * as assert from 'assert';
-import * as http from 'http';
+import http from 'http';
 import * as sinon from 'sinon';
 import {
   CollectorExporterNodeConfigBase,

packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts

@@ -17,7 +17,7 @@
 import { diag } from '@opentelemetry/api';
 import * as core from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
-import * as http from 'http';
+import http from 'http';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { PassThrough, Stream } from 'stream';

packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts

@@ -14,15 +14,15 @@
  * 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';
 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', () => {

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,

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';

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';

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,

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,

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';

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';
 

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,

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';

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', () => {

tsconfig.base.json

@@ -5,6 +5,7 @@
     "composite": true,
     "declaration": true,
     "declarationMap": true,
+    "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "module": "commonjs",
     "noEmitOnError": true,