From a9c8b4b029f48050245f1887728e7d0c4be2acb9 Mon Sep 17 00:00:00 2001 From: overbalance Date: Tue, 3 Mar 2026 16:57:37 -0600 Subject: [PATCH 1/4] chore: add type import rule --- eslint.base.js | 140 ++++++++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 60 deletions(-) diff --git a/eslint.base.js b/eslint.base.js index 69272ad7d5b..005d092dc01 100644 --- a/eslint.base.js +++ b/eslint.base.js @@ -1,82 +1,102 @@ module.exports = { - plugins: [ - "@typescript-eslint", - "header", - "n", - "prettier" - ], - extends: ["eslint:recommended", "plugin:prettier/recommended"], - parser: "@typescript-eslint/parser", + plugins: ['@typescript-eslint', 'header', 'n', 'prettier'], + extends: ['eslint:recommended', 'plugin:prettier/recommended'], + parser: '@typescript-eslint/parser', parserOptions: { - "project": null, + project: null, }, rules: { - "quotes": ["error", "single", { "avoidEscape": true }], - "eqeqeq": [ - "error", - "smart" + quotes: ['error', 'single', { avoidEscape: true }], + eqeqeq: ['error', 'smart'], + 'prefer-rest-params': 'off', + 'no-console': 'error', + 'no-shadow': 'off', + 'n/no-deprecated-api': ['warn'], + 'header/header': [ + 'error', + 'block', + [ + { + pattern: + / \* Copyright The OpenTelemetry Authors[\r\n]+ \* SPDX-License-Identifier: Apache-2\.0/, + template: `\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n `, + }, + ], ], - "prefer-rest-params": "off", - "no-console": "error", - "no-shadow": "off", - "n/no-deprecated-api": ["warn"], - "header/header": ["error", "block", [{ - pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \* SPDX-License-Identifier: Apache-2\.0/, - template: `\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n ` - }]] }, overrides: [ { files: ['*.ts'], // Enable typescript-eslint for ts files. - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:prettier/recommended', + ], parserOptions: { - "projectService": true + projectService: true, }, rules: { - "@typescript-eslint/no-floating-promises": "error", - "@typescript-eslint/no-this-alias": "off", - "@typescript-eslint/naming-convention": [ - "error", + '@typescript-eslint/no-floating-promises': 'error', + '@typescript-eslint/no-this-alias': 'off', + '@typescript-eslint/naming-convention': [ + 'error', + { + selector: 'memberLike', + modifiers: ['private', 'protected'], + format: ['camelCase'], + leadingUnderscore: 'require', + }, + ], + '@typescript-eslint/consistent-type-imports': [ + 'error', { - "selector": "memberLike", - "modifiers": ["private", "protected"], - "format": ["camelCase"], - "leadingUnderscore": "require" - } + prefer: 'type-imports', + fixStyle: 'separate-type-imports', + }, + ], + '@typescript-eslint/no-unused-vars': [ + 'error', + { argsIgnorePattern: '^_', args: 'after-used' }, + ], + '@typescript-eslint/no-inferrable-types': [ + 'error', + { ignoreProperties: true }, ], - "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}], - "@typescript-eslint/no-inferrable-types": ["error", { ignoreProperties: true }], - "@typescript-eslint/no-empty-function": ["off"], - "@typescript-eslint/no-unsafe-function-type": ["warn"], - "@typescript-eslint/no-shadow": ["warn"], - "@typescript-eslint/parameter-properties": "error", - "no-restricted-syntax": ["error", "ExportAllDeclaration"], - "prefer-rest-params": "off", - } + '@typescript-eslint/no-empty-function': ['off'], + '@typescript-eslint/no-unsafe-function-type': ['warn'], + '@typescript-eslint/no-shadow': ['warn'], + '@typescript-eslint/parameter-properties': 'error', + 'no-restricted-syntax': ['error', 'ExportAllDeclaration'], + 'prefer-rest-params': 'off', + }, }, { - files: ["test/**/*.ts"], + files: ['test/**/*.ts'], // Enable typescript-eslint for ts files. - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:prettier/recommended', + ], parserOptions: { - "projectService": true + projectService: true, }, rules: { - "no-console": "warn", - "no-empty": "off", - "@typescript-eslint/ban-ts-ignore": "off", - "@typescript-eslint/no-unsafe-function-type": ["warn"], - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-require-imports": "off", - "@typescript-eslint/no-shadow": ["off"], - "@typescript-eslint/no-floating-promises": ["off"], - "@typescript-eslint/no-non-null-assertion": ["off"], - "@typescript-eslint/explicit-module-boundary-types": ["off"], - "prefer-rest-params": "off", - } - } - ] + 'no-console': 'warn', + 'no-empty': 'off', + '@typescript-eslint/ban-ts-ignore': 'off', + '@typescript-eslint/no-unsafe-function-type': ['warn'], + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/no-require-imports': 'off', + '@typescript-eslint/no-shadow': ['off'], + '@typescript-eslint/no-floating-promises': ['off'], + '@typescript-eslint/no-non-null-assertion': ['off'], + '@typescript-eslint/explicit-module-boundary-types': ['off'], + 'prefer-rest-params': 'off', + }, + }, + ], }; From d38e272fc1185ffadf8c88bd4094a7a6df86514e Mon Sep 17 00:00:00 2001 From: overbalance Date: Tue, 3 Mar 2026 17:16:05 -0600 Subject: [PATCH 2/4] lint fix --- api/src/api/context.ts | 2 +- api/src/api/diag.ts | 4 +- api/src/api/metrics.ts | 4 +- api/src/api/propagation.ts | 10 +++-- api/src/api/trace.ts | 4 +- api/src/baggage/context-helpers.ts | 4 +- api/src/baggage/types.ts | 2 +- api/src/baggage/utils.ts | 2 +- api/src/context/NoopContextManager.ts | 2 +- api/src/context/context.ts | 2 +- api/src/diag/ComponentLogger.ts | 2 +- api/src/diag/consoleLogger.ts | 2 +- api/src/diag/internal/logLevelLogger.ts | 3 +- api/src/diag/internal/noopLogger.ts | 2 +- api/src/experimental/trace/SugaredOptions.ts | 2 +- api/src/experimental/trace/SugaredTracer.ts | 11 ++---- api/src/internal/global-utils.ts | 8 ++-- api/src/metrics/Meter.ts | 2 +- api/src/metrics/MeterProvider.ts | 2 +- api/src/metrics/Metric.ts | 4 +- api/src/metrics/NoopMeter.ts | 4 +- api/src/metrics/NoopMeterProvider.ts | 4 +- api/src/propagation/NoopTextMapPropagator.ts | 4 +- api/src/propagation/TextMapPropagator.ts | 2 +- api/src/trace/NonRecordingSpan.ts | 14 +++---- api/src/trace/NoopTracer.ts | 10 ++--- api/src/trace/NoopTracerProvider.ts | 6 +-- api/src/trace/ProxyTracer.ts | 10 ++--- api/src/trace/ProxyTracerProvider.ts | 6 +-- api/src/trace/Sampler.ts | 10 ++--- api/src/trace/SamplingResult.ts | 4 +- api/src/trace/SpanOptions.ts | 8 ++-- api/src/trace/attributes.ts | 2 +- api/src/trace/context-utils.ts | 6 +-- api/src/trace/internal/tracestate-impl.ts | 2 +- api/src/trace/internal/utils.ts | 2 +- api/src/trace/invalid-span-constants.ts | 2 +- api/src/trace/link.ts | 4 +- api/src/trace/span.ts | 12 +++--- api/src/trace/span_context.ts | 2 +- api/src/trace/spancontext-utils.ts | 4 +- api/src/trace/tracer.ts | 6 +-- api/src/trace/tracer_provider.ts | 4 +- api/test/common/api/api.test.ts | 14 ++++--- api/test/common/diag/ComponentLogger.test.ts | 3 +- api/test/common/diag/logLevel.test.ts | 3 +- api/test/common/diag/logger.test.ts | 2 +- .../experimental/trace/SugaredTracer.test.ts | 5 ++- api/test/common/internal/global.test.ts | 4 +- api/test/common/metrics/Metric.test.ts | 2 +- .../noop-implementations/noop-tracer.test.ts | 3 +- .../proxy-tracer.test.ts | 12 +----- api/test/common/trace/tracestate.test.ts | 2 +- api/test/tree-shaking/tree-shaking.test.ts | 6 ++- .../packages/api-logs/src/NoopLogger.ts | 4 +- .../api-logs/src/NoopLoggerProvider.ts | 6 +-- .../packages/api-logs/src/ProxyLogger.ts | 6 +-- .../api-logs/src/ProxyLoggerProvider.ts | 6 +-- .../packages/api-logs/src/api/logs.ts | 6 +-- .../api-logs/src/internal/global-utils.ts | 2 +- .../packages/api-logs/src/types/LogRecord.ts | 4 +- .../packages/api-logs/src/types/Logger.ts | 2 +- .../api-logs/src/types/LoggerOptions.ts | 2 +- .../api-logs/src/types/LoggerProvider.ts | 4 +- .../packages/api-logs/test/api/api.test.ts | 3 +- .../api-logs/test/internal/global.test.ts | 4 +- .../proxy-logger.test.ts | 2 +- .../configuration/src/ConfigFactory.ts | 2 +- .../src/EnvironmentConfigFactory.ts | 26 ++++++------- .../configuration/src/FileConfigFactory.ts | 39 +++++++++---------- .../configuration/src/IConfigFactory.ts | 2 +- .../configuration/src/models/configModel.ts | 8 ++-- .../src/models/loggerProviderModel.ts | 2 +- .../src/models/meterProviderModel.ts | 2 +- .../configuration/src/models/resourceModel.ts | 2 +- .../src/models/tracerProviderModel.ts | 2 +- .../packages/configuration/src/utils.ts | 2 +- .../configuration/test/ConfigFactory.test.ts | 10 +++-- .../src/OTLPLogExporter.ts | 7 +++- .../test/OTLPLogExporter.test.ts | 3 +- .../exporter-logs-otlp-grpc/test/utils.ts | 8 +--- .../src/platform/browser/OTLPLogExporter.ts | 11 +++--- .../src/platform/node/OTLPLogExporter.ts | 11 +++--- .../src/OTLPTraceExporter.ts | 4 +- .../test/OTLPTraceExporter.test.ts | 3 +- .../exporter-trace-otlp-grpc/test/utils.ts | 8 +--- .../src/platform/browser/OTLPTraceExporter.ts | 8 ++-- .../src/platform/node/OTLPTraceExporter.ts | 8 ++-- .../src/platform/browser/OTLPTraceExporter.ts | 8 ++-- .../src/platform/node/OTLPTraceExporter.ts | 8 ++-- .../src/BrowserDetector.ts | 10 +++-- .../test/util.ts | 4 +- .../src/OTLPMetricExporter.ts | 8 ++-- .../test/OTLPMetricExporter.test.ts | 3 +- .../test/utils.ts | 8 +--- .../src/OTLPMetricExporterBase.ts | 20 +++++----- .../src/OTLPMetricExporterOptions.ts | 4 +- .../platform/browser/OTLPMetricExporter.ts | 4 +- .../src/platform/node/OTLPMetricExporter.ts | 4 +- .../test/browser/OTLPMetricExporter.test.ts | 2 +- .../test/node/OTLPMetricExporter.test.ts | 2 +- .../platform/browser/OTLPMetricExporter.ts | 4 +- .../src/platform/node/OTLPMetricExporter.ts | 4 +- .../src/PrometheusExporter.ts | 5 ++- .../src/PrometheusSerializer.ts | 15 ++++--- .../src/export/types.ts | 2 +- .../test/PrometheusExporter.test.ts | 4 +- .../test/PrometheusSerializer.test.ts | 5 +-- .../src/fetch.ts | 4 +- .../src/utils.ts | 2 +- .../test/fetch.test.ts | 4 +- .../src/instrumentation.ts | 3 +- .../src/types.ts | 2 +- .../test/grpc-protobuf-ts.test.ts | 12 ++---- .../test/helper.ts | 21 +++++----- .../test/protobuf-ts-utils.ts | 5 ++- .../test/utils/assertionUtils.ts | 2 +- .../src/http.ts | 22 ++++++----- .../src/internal-types.ts | 4 +- .../src/types.ts | 6 +-- .../src/utils.ts | 14 ++++--- .../test/functionals/http-disable.test.ts | 9 ++--- .../test/functionals/http-enable.test.ts | 7 ++-- .../test/functionals/http-metrics.test.ts | 3 +- .../test/functionals/http-package.test.ts | 5 ++- .../test/functionals/http-sampler.test.ts | 7 ++-- .../test/functionals/https-disable.test.ts | 7 +--- .../test/functionals/https-enable.test.ts | 4 +- .../test/functionals/https-package.test.ts | 5 ++- .../test/functionals/utils.test.ts | 21 +++++----- .../test/integrations/http-enable.test.ts | 5 ++- .../test/integrations/https-enable.test.ts | 7 ++-- .../test/utils/DummyPropagation.ts | 8 +--- .../test/utils/TestMetricReader.ts | 3 +- .../test/utils/assertSpan.ts | 12 ++---- .../test/utils/httpRequest.ts | 2 +- .../test/utils/httpsRequest.ts | 4 +- .../src/types.ts | 2 +- .../src/utils.ts | 2 +- .../src/xhr.ts | 4 +- .../test/unmocked.test.ts | 7 +++- .../test/xhr.test.ts | 6 +-- .../src/autoLoader.ts | 2 +- .../src/autoLoaderUtils.ts | 6 +-- .../src/instrumentation.ts | 11 +++--- .../instrumentationNodeModuleDefinition.ts | 2 +- .../src/instrumentationNodeModuleFile.ts | 2 +- .../src/platform/browser/instrumentation.ts | 4 +- .../src/platform/node/instrumentation.ts | 13 +++---- .../src/shimmer.ts | 2 +- .../src/types.ts | 4 +- .../src/types_internal.ts | 6 +-- .../src/utils.ts | 2 +- .../test/common/Instrumentation.test.ts | 4 +- .../test/common/autoLoader.test.ts | 8 +++- .../test/common/semver.test.ts | 3 +- .../test/common/shimmer.test.ts | 2 +- .../test/node/InstrumentationBase.test.ts | 2 +- .../test/node/ModuleNameTrie.test.ts | 2 +- .../scoped-package-instrumentation.test.ts | 2 +- .../opentelemetry-sdk-node/src/sdk.ts | 37 ++++++++---------- .../opentelemetry-sdk-node/src/start.ts | 12 +++--- .../opentelemetry-sdk-node/src/types.ts | 15 ++++--- .../opentelemetry-sdk-node/src/utils.ts | 37 +++++++++--------- .../opentelemetry-sdk-node/test/sdk.test.ts | 5 +-- .../opentelemetry-sdk-node/test/start.test.ts | 6 +-- .../test/util/resource-assertions.ts | 2 +- .../opentelemetry-sdk-node/test/utils.test.ts | 4 +- .../src/OTLPExporterBase.ts | 4 +- .../convert-legacy-browser-http-options.ts | 4 +- .../convert-legacy-http-options.ts | 4 +- .../convert-legacy-node-http-options.ts | 8 ++-- .../create-legacy-browser-delegate.ts | 6 +-- .../legacy-base-configuration.ts | 2 +- .../configuration/otlp-http-configuration.ts | 2 +- .../otlp-node-http-configuration.ts | 2 +- .../otlp-node-http-env-configuration.ts | 6 +-- .../src/configuration/shared-configuration.ts | 2 +- .../configuration/shared-env-configuration.ts | 2 +- .../src/exporter-transport.ts | 2 +- .../src/logging-response-handler.ts | 2 +- .../src/otlp-browser-http-export-delegate.ts | 6 +-- .../src/otlp-export-delegate.ts | 14 ++++--- .../src/otlp-http-export-delegate.ts | 10 ++--- .../src/otlp-network-export-delegate.ts | 12 +++--- .../src/retrying-transport.ts | 4 +- .../src/transport/fetch-transport.ts | 6 +-- .../src/transport/http-exporter-transport.ts | 6 +-- .../src/transport/http-transport-types.ts | 2 +- .../src/transport/http-transport-utils.ts | 2 +- .../transport/node-http-transport-types.ts | 4 +- .../test/browser/fetch-transport.test.ts | 2 +- .../test/common/OTLPExporterBase.test.ts | 3 +- .../otlp-http-configuration.test.ts | 6 +-- .../shared-configuration.test.ts | 6 +-- .../common/logging-response-handler.test.ts | 2 +- .../test/common/otlp-export-delegate.test.ts | 8 ++-- .../test/common/retrying-transport.test.ts | 4 +- .../otlp-http-configuration.test.ts | 2 +- .../shared-env-configuration.test.ts | 2 +- .../test/node/http-exporter-transport.test.ts | 5 ++- .../node/otlp-http-export-delegate.test.ts | 2 +- .../otlp-exporter-base/test/testHelper.ts | 2 +- .../convert-legacy-otlp-grpc-options.ts | 4 +- .../configuration/otlp-grpc-configuration.ts | 2 +- .../otlp-grpc-env-configuration.ts | 2 +- .../src/grpc-exporter-transport.ts | 2 +- .../src/otlp-grpc-export-delegate.ts | 10 ++--- .../otlp-grpc-exporter-base/src/types.ts | 2 +- .../test/grpc-exporter-transport.test.ts | 6 +-- .../otlp-transformer/src/common/internal.ts | 6 +-- .../common/protobuf/protobuf-export-type.ts | 2 +- .../otlp-transformer/src/common/utils.ts | 2 +- .../otlp-transformer/src/logs/internal.ts | 12 +++--- .../otlp-transformer/src/logs/json/logs.ts | 6 +-- .../src/logs/protobuf/logs.ts | 10 ++--- .../src/metrics/internal-types.ts | 2 +- .../otlp-transformer/src/metrics/internal.ts | 12 +++--- .../src/metrics/json/metrics.ts | 6 +-- .../src/metrics/protobuf/metrics.ts | 10 ++--- .../src/trace/internal-types.ts | 2 +- .../otlp-transformer/src/trace/internal.ts | 4 +- .../otlp-transformer/src/trace/json/trace.ts | 6 +-- .../src/trace/protobuf/trace.ts | 10 ++--- .../otlp-transformer/test/logs.test.ts | 19 ++++----- .../otlp-transformer/test/metrics.test.ts | 6 +-- .../otlp-transformer/test/trace.test.ts | 9 +++-- .../sampler-composite/src/annotating.ts | 2 +- .../sampler-composite/src/composite.ts | 13 +++---- .../sampler-composite/src/parentthreshold.ts | 13 ++----- .../sampler-composite/src/rulebased.ts | 2 +- .../sampler-composite/src/traceidratio.ts | 2 +- .../sampler-composite/src/tracestate.ts | 2 +- .../packages/sampler-composite/src/types.ts | 2 +- .../sampler-composite/test/sampler.test.ts | 9 +---- .../src/JaegerRemoteSampler.ts | 9 +++-- .../src/PerOperationSampler.ts | 16 ++++---- .../test/JaegerRemoteSampler.test.ts | 3 +- .../packages/sdk-logs/src/LogRecordImpl.ts | 5 ++- .../sdk-logs/src/LogRecordProcessor.ts | 4 +- experimental/packages/sdk-logs/src/Logger.ts | 4 +- .../src/export/BatchLogRecordProcessorBase.ts | 2 +- .../src/export/ConsoleLogRecordExporter.ts | 7 +--- .../src/export/NoopLogRecordProcessor.ts | 6 +-- .../sdk-logs/src/export/SdkLogRecord.ts | 2 +- .../src/internal/LoggerProviderSharedState.ts | 12 ++++-- experimental/packages/sdk-logs/src/types.ts | 2 +- .../packages/sdk-logs/src/utils/validation.ts | 2 +- .../export/BatchLogRecordProcessor.test.ts | 2 +- .../sdk-logs/test/common/LogRecord.test.ts | 20 +++------- .../sdk-logs/test/common/Logger.test.ts | 6 +-- .../export/BatchLogRecordProcessor.test.ts | 8 ++-- .../export/InMemoryLogRecordExporter.test.ts | 3 +- .../export/SimpleLogRecordProcessor.test.ts | 4 +- .../common/export/TestExporterWithDelay.ts | 5 ++- .../src/OpenCensusMetricProducer.ts | 2 +- .../packages/shim-opencensus/src/ShimSpan.ts | 5 ++- .../shim-opencensus/src/ShimTracer.ts | 3 +- .../shim-opencensus/src/metric-transform.ts | 11 ++++-- .../shim-opencensus/src/propagation.ts | 11 ++---- .../packages/shim-opencensus/src/shim.ts | 5 ++- .../shim-opencensus/src/trace-transform.ts | 9 +---- .../test/OpenCensusMetricProducer.test.ts | 2 +- .../shim-opencensus/test/ShimSpan.test.ts | 4 +- .../shim-opencensus/test/ShimTracer.test.ts | 2 +- .../test/metric-transform.test.ts | 8 ++-- .../shim-opencensus/test/propagation.test.ts | 2 +- .../packages/shim-opencensus/test/util.ts | 5 ++- .../web-common/src/DefaultIdGenerator.ts | 2 +- .../src/LocalStorageSessionStore.ts | 4 +- .../src/SessionLogRecordProcessor.ts | 6 +-- .../packages/web-common/src/SessionManager.ts | 12 +++--- .../web-common/src/SessionSpanProcessor.ts | 6 +-- .../web-common/src/types/SessionObserver.ts | 2 +- .../web-common/src/types/SessionPublisher.ts | 2 +- .../web-common/src/types/SessionStore.ts | 2 +- experimental/packages/web-common/src/utils.ts | 13 ++++--- .../test/LocalStorageSessionStore.test.ts | 2 +- .../web-common/test/SessionManager.test.ts | 11 +++--- .../test/SessionSpanProcessor.test.ts | 3 +- .../packages/web-common/test/utils.test.ts | 8 ++-- .../src/AbstractAsyncHooksContextManager.ts | 2 +- .../src/AsyncHooksContextManager.ts | 3 +- .../src/AsyncLocalStorageContextManager.ts | 3 +- .../src/ZoneContextManager.ts | 5 ++- .../propagation/W3CBaggagePropagator.ts | 4 +- .../opentelemetry-core/src/baggage/utils.ts | 7 +--- .../src/common/attributes.ts | 3 +- .../src/common/global-error-handler.ts | 4 +- .../src/common/logging-error-handler.ts | 5 ++- .../opentelemetry-core/src/common/time.ts | 2 +- .../opentelemetry-core/src/common/types.ts | 2 +- .../src/internal/exporter.ts | 2 +- .../src/propagation/composite.ts | 4 +- .../src/trace/TraceState.ts | 2 +- .../src/trace/W3CTraceContextPropagator.ts | 6 +-- .../src/trace/rpc-metadata.ts | 3 +- .../src/trace/suppress-tracing.ts | 3 +- .../baggage/W3CBaggagePropagator.test.ts | 3 +- .../test/common/global-error-handler.test.ts | 2 +- .../test/common/internal/exporter.test.ts | 3 +- .../test/common/logging-error-handler.test.ts | 3 +- .../test/common/propagation/composite.test.ts | 11 ++++-- .../test/common/time.test.ts | 2 +- .../trace/W3CTraceContextPropagator.test.ts | 2 +- .../src/jaeger.ts | 4 +- .../src/transform.ts | 11 +++--- .../test/jaeger.test.ts | 7 ++-- .../test/transform.test.ts | 2 +- .../src/platform/browser/util.ts | 9 ++--- .../src/platform/node/util.ts | 5 ++- .../src/transform.ts | 2 +- .../src/types.ts | 2 +- .../src/utils.ts | 2 +- .../src/zipkin.ts | 11 ++---- .../test/browser/zipkin.test.ts | 4 +- .../test/common/transform.test.ts | 6 +-- .../test/helper.ts | 4 +- .../test/node/zipkin.test.ts | 11 ++---- .../src/B3MultiPropagator.ts | 10 +++-- .../src/B3Propagator.ts | 5 ++- .../src/B3SinglePropagator.ts | 10 +++-- .../test/B3MultiPropagator.test.ts | 2 +- .../test/B3Propagator.test.ts | 2 +- .../test/B3SinglePropagator.test.ts | 2 +- .../src/JaegerPropagator.ts | 8 ++-- .../test/JaegerPropagator.test.ts | 3 +- .../opentelemetry-resources/src/Resource.ts | 4 +- .../src/ResourceImpl.ts | 7 ++-- .../src/detect-resources.ts | 4 +- .../src/detectors/EnvDetector.ts | 7 ++-- .../src/detectors/NoopDetector.ts | 2 +- .../detectors/platform/node/HostDetector.ts | 4 +- .../src/detectors/platform/node/OSDetector.ts | 6 +-- .../platform/node/ProcessDetector.ts | 7 ++-- .../node/ServiceInstanceIdDetector.ts | 4 +- packages/opentelemetry-resources/src/types.ts | 4 +- .../test/detect-resources.test.ts | 3 +- .../node/machine-id/getMachineId-bsd.test.ts | 2 +- .../machine-id/getMachineId-darwin.test.ts | 2 +- .../node/machine-id/getMachineId-win.test.ts | 2 +- .../test/util/resource-assertions.ts | 2 +- .../test/util/sample-detector.ts | 4 +- .../src/BasicTracerProvider.ts | 9 +++-- .../src/MultiSpanProcessor.ts | 8 ++-- .../src/Sampler.ts | 2 +- .../opentelemetry-sdk-trace-base/src/Span.ts | 17 ++++---- .../src/SpanProcessor.ts | 6 +-- .../src/TimedEvent.ts | 2 +- .../src/Tracer.ts | 17 ++++---- .../src/TracerMetrics.ts | 7 +++- .../src/config.ts | 2 +- .../src/export/BatchSpanProcessorBase.ts | 13 ++++--- .../src/export/ConsoleSpanExporter.ts | 11 ++---- .../src/export/InMemorySpanExporter.ts | 7 ++-- .../src/export/NoopSpanProcessor.ts | 8 ++-- .../src/export/ReadableSpan.ts | 8 ++-- .../src/export/SimpleSpanProcessor.ts | 11 +++--- .../src/export/SpanExporter.ts | 4 +- .../src/platform/browser/RandomIdGenerator.ts | 2 +- .../browser/export/BatchSpanProcessor.ts | 4 +- .../src/platform/node/RandomIdGenerator.ts | 2 +- .../node/export/BatchSpanProcessor.ts | 2 +- .../src/sampler/AlwaysOffSampler.ts | 3 +- .../src/sampler/AlwaysOnSampler.ts | 3 +- .../src/sampler/ParentBasedSampler.ts | 13 ++----- .../src/sampler/TraceIdRatioBasedSampler.ts | 3 +- .../src/utility.ts | 4 +- .../export/BatchSpanProcessor.bench.ts | 11 ++---- .../browser/export/BatchSpanProcessor.test.ts | 4 +- .../test/common/BasicTracerProvider.test.ts | 6 +-- .../test/common/MultiSpanProcessor.test.ts | 3 +- .../test/common/Span.test.ts | 17 ++++---- .../test/common/Tracer.test.ts | 21 +++++----- .../export/BatchSpanProcessorBase.test.ts | 12 +++--- .../common/export/ConsoleSpanExporter.test.ts | 3 +- .../export/InMemorySpanExporter.test.ts | 3 +- .../common/export/SimpleSpanProcessor.test.ts | 4 +- .../common/export/TestExporterWithDelay.ts | 5 ++- .../common/export/TestRecordOnlySampler.ts | 3 +- .../common/export/TestStackContextManager.ts | 3 +- .../common/export/TestTracingSpanExporter.ts | 5 +-- .../test/common/sampler/Sampler.test.ts | 4 +- .../test/node/BasicTracerProvider.test.ts | 2 +- .../node/export/BatchSpanProcessor.bench.ts | 11 ++---- .../export/BatchSpanProcessorBase.test.ts | 3 +- .../src/NodeTracerProvider.ts | 17 +++----- .../src/config.ts | 2 +- .../test/NodeTracerProvider.test.ts | 11 ++---- .../src/StackContextManager.ts | 3 +- .../src/WebTracerProvider.ts | 13 ++----- .../opentelemetry-sdk-trace-web/src/types.ts | 2 +- .../opentelemetry-sdk-trace-web/src/utils.ts | 4 +- .../test/WebTracerProvider.test.ts | 7 ++-- .../test/utils.test.ts | 7 ++-- .../test/window/utils.test.ts | 8 +--- .../src/shim.ts | 4 +- .../test/Shim.test.ts | 6 ++- .../sdk-metrics/src/InstrumentDescriptor.ts | 12 ++---- packages/sdk-metrics/src/Instruments.ts | 12 +++--- packages/sdk-metrics/src/Meter.ts | 4 +- packages/sdk-metrics/src/MeterProvider.ts | 15 +++---- packages/sdk-metrics/src/ObservableResult.ts | 8 ++-- packages/sdk-metrics/src/aggregator/Drop.ts | 11 +++--- .../src/aggregator/ExponentialHistogram.ts | 22 +++++------ .../sdk-metrics/src/aggregator/Histogram.ts | 24 +++++------- .../sdk-metrics/src/aggregator/LastValue.ts | 15 +++---- packages/sdk-metrics/src/aggregator/Sum.ts | 15 +++---- .../mapping/ExponentMapping.ts | 3 +- .../mapping/LogarithmMapping.ts | 3 +- .../mapping/getMapping.ts | 3 +- packages/sdk-metrics/src/aggregator/types.ts | 10 ++--- ...AlignedHistogramBucketExemplarReservoir.ts | 2 +- .../exemplar/AlwaysSampleExemplarFilter.ts | 4 +- packages/sdk-metrics/src/exemplar/Exemplar.ts | 2 +- .../src/exemplar/ExemplarFilter.ts | 2 +- .../src/exemplar/ExemplarReservoir.ts | 11 ++---- .../src/exemplar/NeverSampleExemplarFilter.ts | 4 +- .../SimpleFixedSizeExemplarReservoir.ts | 2 +- .../src/exemplar/WithTraceExemplarFilter.ts | 12 ++---- .../src/export/AggregationSelector.ts | 5 ++- .../src/export/CardinalitySelector.ts | 2 +- .../src/export/ConsoleMetricExporter.ts | 15 ++++--- .../src/export/InMemoryMetricExporter.ts | 8 ++-- packages/sdk-metrics/src/export/MetricData.ts | 10 ++--- .../sdk-metrics/src/export/MetricExporter.ts | 8 ++-- .../sdk-metrics/src/export/MetricProducer.ts | 2 +- .../sdk-metrics/src/export/MetricReader.ts | 16 ++++---- .../export/PeriodicExportingMetricReader.ts | 4 +- .../src/state/AsyncMetricStorage.ts | 16 ++++---- .../src/state/DeltaMetricProcessor.ts | 7 ++-- packages/sdk-metrics/src/state/HashMap.ts | 2 +- .../src/state/MeterProviderSharedState.ts | 10 ++--- .../sdk-metrics/src/state/MeterSharedState.ts | 30 +++++++------- .../sdk-metrics/src/state/MetricCollector.ts | 15 ++++--- .../sdk-metrics/src/state/MetricStorage.ts | 14 +++---- .../src/state/MetricStorageRegistry.ts | 10 ++--- .../src/state/MultiWritableMetricStorage.ts | 4 +- .../src/state/ObservableRegistry.ts | 7 ++-- .../src/state/SyncMetricStorage.ts | 16 ++++---- .../src/state/TemporalMetricProcessor.ts | 12 +++--- .../src/state/WritableMetricStorage.ts | 4 +- packages/sdk-metrics/src/utils.ts | 4 +- packages/sdk-metrics/src/view/Aggregation.ts | 8 ++-- .../sdk-metrics/src/view/AggregationOption.ts | 2 +- .../src/view/AttributesProcessor.ts | 2 +- .../src/view/InstrumentSelector.ts | 5 ++- .../sdk-metrics/src/view/MeterSelector.ts | 3 +- .../src/view/RegistrationConflicts.ts | 4 +- packages/sdk-metrics/src/view/View.ts | 13 +++---- packages/sdk-metrics/src/view/ViewRegistry.ts | 10 ++--- .../sdk-metrics/test/ExemplarFilter.test.ts | 8 +--- .../test/ExemplarReservoir.test.ts | 8 +--- .../test/InstrumentDescriptor.test.ts | 2 +- packages/sdk-metrics/test/Instruments.test.ts | 20 ++++------ packages/sdk-metrics/test/Meter.test.ts | 3 +- .../sdk-metrics/test/MeterProvider.test.ts | 9 +---- .../sdk-metrics/test/aggregator/Drop.test.ts | 2 +- .../aggregator/ExponentialHistogram.test.ts | 9 +++-- .../test/aggregator/Histogram.test.ts | 5 ++- .../test/aggregator/LastValue.test.ts | 5 ++- .../sdk-metrics/test/aggregator/Sum.test.ts | 5 ++- .../test/export/ConsoleMetricExporter.test.ts | 6 +-- .../export/InMemoryMetricExporter.test.ts | 4 +- .../test/export/MetricReader.test.ts | 2 +- .../PeriodicExportingMetricReader.test.ts | 15 +++---- .../test/export/TestMetricExporter.ts | 10 ++--- .../test/export/TestMetricProducer.ts | 7 +++- .../test/export/TestMetricReader.ts | 4 +- packages/sdk-metrics/test/export/utils.ts | 4 +- .../cumulative-exponential-histogram.test.ts | 4 +- .../histogram-recording-nan.test.ts | 6 +-- ...wo-metric-readers-async-instrument.test.ts | 2 +- .../test/state/AsyncMetricStorage.test.ts | 4 +- .../sdk-metrics/test/state/HashMap.test.ts | 2 +- .../test/state/MeterSharedState.test.ts | 16 +++----- .../test/state/MetricStorageRegistry.test.ts | 11 +++--- .../state/MultiWritableMetricStorage.test.ts | 6 +-- .../test/state/SyncMetricStorage.test.ts | 2 +- .../state/TemporalMetricProcessor.test.ts | 2 +- packages/sdk-metrics/test/util.ts | 19 +++++---- packages/sdk-metrics/test/utils.test.ts | 2 +- .../sdk-metrics/test/view/Aggregation.test.ts | 4 +- .../test/view/AttributesProcessor.test.ts | 5 ++- 484 files changed, 1426 insertions(+), 1539 deletions(-) diff --git a/api/src/api/context.ts b/api/src/api/context.ts index a24f5eff1b3..62cdabe9e66 100644 --- a/api/src/api/context.ts +++ b/api/src/api/context.ts @@ -4,7 +4,7 @@ */ import { NoopContextManager } from '../context/NoopContextManager'; -import { Context, ContextManager } from '../context/types'; +import type { Context, ContextManager } from '../context/types'; import { getGlobal, registerGlobal, diff --git a/api/src/api/diag.ts b/api/src/api/diag.ts index 99a0343db85..c0b1d8ab8d5 100644 --- a/api/src/api/diag.ts +++ b/api/src/api/diag.ts @@ -5,13 +5,13 @@ import { DiagComponentLogger } from '../diag/ComponentLogger'; import { createLogLevelDiagLogger } from '../diag/internal/logLevelLogger'; -import { +import type { ComponentLoggerOptions, DiagLogFunction, DiagLogger, DiagLoggerApi, - DiagLogLevel, } from '../diag/types'; +import { DiagLogLevel } from '../diag/types'; import { getGlobal, registerGlobal, diff --git a/api/src/api/metrics.ts b/api/src/api/metrics.ts index 33ecab294eb..985ad914d54 100644 --- a/api/src/api/metrics.ts +++ b/api/src/api/metrics.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Meter, MeterOptions } from '../metrics/Meter'; -import { MeterProvider } from '../metrics/MeterProvider'; +import type { Meter, MeterOptions } from '../metrics/Meter'; +import type { MeterProvider } from '../metrics/MeterProvider'; import { NOOP_METER_PROVIDER } from '../metrics/NoopMeterProvider'; import { getGlobal, diff --git a/api/src/api/propagation.ts b/api/src/api/propagation.ts index 0f293406fed..19de9f642b6 100644 --- a/api/src/api/propagation.ts +++ b/api/src/api/propagation.ts @@ -3,20 +3,22 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; +import type { Context } from '../context/types'; import { getGlobal, registerGlobal, unregisterGlobal, } from '../internal/global-utils'; import { NoopTextMapPropagator } from '../propagation/NoopTextMapPropagator'; -import { - defaultTextMapGetter, - defaultTextMapSetter, +import type { TextMapGetter, TextMapPropagator, TextMapSetter, } from '../propagation/TextMapPropagator'; +import { + defaultTextMapGetter, + defaultTextMapSetter, +} from '../propagation/TextMapPropagator'; import { getBaggage, getActiveBaggage, diff --git a/api/src/api/trace.ts b/api/src/api/trace.ts index 98139c0ea9a..f260b0e15ee 100644 --- a/api/src/api/trace.ts +++ b/api/src/api/trace.ts @@ -13,8 +13,8 @@ import { isSpanContextValid, wrapSpanContext, } from '../trace/spancontext-utils'; -import { Tracer } from '../trace/tracer'; -import { TracerProvider } from '../trace/tracer_provider'; +import type { Tracer } from '../trace/tracer'; +import type { TracerProvider } from '../trace/tracer_provider'; import { deleteSpan, getActiveSpan, diff --git a/api/src/baggage/context-helpers.ts b/api/src/baggage/context-helpers.ts index 01e1d9be6b5..5ad463424c4 100644 --- a/api/src/baggage/context-helpers.ts +++ b/api/src/baggage/context-helpers.ts @@ -5,8 +5,8 @@ import { ContextAPI } from '../api/context'; import { createContextKey } from '../context/context'; -import { Context } from '../context/types'; -import { Baggage } from './types'; +import type { Context } from '../context/types'; +import type { Baggage } from './types'; /** * Baggage key diff --git a/api/src/baggage/types.ts b/api/src/baggage/types.ts index df9c07b399c..690814e73f9 100644 --- a/api/src/baggage/types.ts +++ b/api/src/baggage/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { baggageEntryMetadataSymbol } from './internal/symbol'; +import type { baggageEntryMetadataSymbol } from './internal/symbol'; /* * Copyright The OpenTelemetry Authors diff --git a/api/src/baggage/utils.ts b/api/src/baggage/utils.ts index 7e163954fa9..8291a45ee0d 100644 --- a/api/src/baggage/utils.ts +++ b/api/src/baggage/utils.ts @@ -6,7 +6,7 @@ import { DiagAPI } from '../api/diag'; import { BaggageImpl } from './internal/baggage-impl'; import { baggageEntryMetadataSymbol } from './internal/symbol'; -import { Baggage, BaggageEntry, BaggageEntryMetadata } from './types'; +import type { Baggage, BaggageEntry, BaggageEntryMetadata } from './types'; const diag = DiagAPI.instance(); diff --git a/api/src/context/NoopContextManager.ts b/api/src/context/NoopContextManager.ts index fedeff89098..13f2ec3b3ba 100644 --- a/api/src/context/NoopContextManager.ts +++ b/api/src/context/NoopContextManager.ts @@ -4,7 +4,7 @@ */ import { ROOT_CONTEXT } from './context'; -import * as types from './types'; +import type * as types from './types'; export class NoopContextManager implements types.ContextManager { active(): types.Context { diff --git a/api/src/context/context.ts b/api/src/context/context.ts index 12571129eed..4888fabce08 100644 --- a/api/src/context/context.ts +++ b/api/src/context/context.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from './types'; +import type { Context } from './types'; /** * Get a key to uniquely identify a context value diff --git a/api/src/diag/ComponentLogger.ts b/api/src/diag/ComponentLogger.ts index 33a628d944c..483cd6e5a14 100644 --- a/api/src/diag/ComponentLogger.ts +++ b/api/src/diag/ComponentLogger.ts @@ -4,7 +4,7 @@ */ import { getGlobal } from '../internal/global-utils'; -import { ComponentLoggerOptions, DiagLogger } from './types'; +import type { ComponentLoggerOptions, DiagLogger } from './types'; /** * Component Logger which is meant to be used as part of any component which diff --git a/api/src/diag/consoleLogger.ts b/api/src/diag/consoleLogger.ts index 4d64eb821d7..329b908fda6 100644 --- a/api/src/diag/consoleLogger.ts +++ b/api/src/diag/consoleLogger.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { DiagLogger, DiagLogFunction } from './types'; +import type { DiagLogger, DiagLogFunction } from './types'; type ConsoleMapKeys = 'error' | 'warn' | 'info' | 'debug' | 'trace'; const consoleMap: { n: keyof DiagLogger; c: ConsoleMapKeys }[] = [ diff --git a/api/src/diag/internal/logLevelLogger.ts b/api/src/diag/internal/logLevelLogger.ts index 83f0275937c..2f123606964 100644 --- a/api/src/diag/internal/logLevelLogger.ts +++ b/api/src/diag/internal/logLevelLogger.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { DiagLogFunction, DiagLogger, DiagLogLevel } from '../types'; +import type { DiagLogFunction, DiagLogger } from '../types'; +import { DiagLogLevel } from '../types'; export function createLogLevelDiagLogger( maxLevel: DiagLogLevel, diff --git a/api/src/diag/internal/noopLogger.ts b/api/src/diag/internal/noopLogger.ts index e9892d365e9..8984220f1a4 100644 --- a/api/src/diag/internal/noopLogger.ts +++ b/api/src/diag/internal/noopLogger.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { DiagLogger } from '../types'; +import type { DiagLogger } from '../types'; function noopLogFunction() {} diff --git a/api/src/experimental/trace/SugaredOptions.ts b/api/src/experimental/trace/SugaredOptions.ts index 3eb5062fc7f..13c9b76b418 100644 --- a/api/src/experimental/trace/SugaredOptions.ts +++ b/api/src/experimental/trace/SugaredOptions.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Span, SpanOptions } from '../../'; +import type { Span, SpanOptions } from '../../'; /** * Options needed for span creation diff --git a/api/src/experimental/trace/SugaredTracer.ts b/api/src/experimental/trace/SugaredTracer.ts index 3d0e5d4ed22..04da3ffc612 100644 --- a/api/src/experimental/trace/SugaredTracer.ts +++ b/api/src/experimental/trace/SugaredTracer.ts @@ -2,14 +2,9 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { SugaredSpanOptions } from './SugaredOptions'; -import { - context as contextApi, - Context, - Span, - SpanStatusCode, - Tracer, -} from '../../'; +import type { SugaredSpanOptions } from './SugaredOptions'; +import type { Context, Span, Tracer } from '../../'; +import { context as contextApi, SpanStatusCode } from '../../'; const defaultOnException = (e: Error, span: Span) => { span.recordException(e); diff --git a/api/src/internal/global-utils.ts b/api/src/internal/global-utils.ts index 844e4eefcb2..9981abd5bb2 100644 --- a/api/src/internal/global-utils.ts +++ b/api/src/internal/global-utils.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { MeterProvider } from '../metrics/MeterProvider'; -import { ContextManager } from '../context/types'; -import { DiagLogger } from '../diag/types'; -import { TextMapPropagator } from '../propagation/TextMapPropagator'; +import type { MeterProvider } from '../metrics/MeterProvider'; +import type { ContextManager } from '../context/types'; +import type { DiagLogger } from '../diag/types'; +import type { TextMapPropagator } from '../propagation/TextMapPropagator'; import type { TracerProvider } from '../trace/tracer_provider'; import { VERSION } from '../version'; import { isCompatible } from './semver'; diff --git a/api/src/metrics/Meter.ts b/api/src/metrics/Meter.ts index 8717d75074f..34d6e60c173 100644 --- a/api/src/metrics/Meter.ts +++ b/api/src/metrics/Meter.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { BatchObservableCallback, Counter, Gauge, diff --git a/api/src/metrics/MeterProvider.ts b/api/src/metrics/MeterProvider.ts index 9d2a7349f75..b5b071b6795 100644 --- a/api/src/metrics/MeterProvider.ts +++ b/api/src/metrics/MeterProvider.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Meter, MeterOptions } from './Meter'; +import type { Meter, MeterOptions } from './Meter'; /** * A registry for creating named {@link Meter}s. diff --git a/api/src/metrics/Metric.ts b/api/src/metrics/Metric.ts index e256b40d150..dd00e6db41a 100644 --- a/api/src/metrics/Metric.ts +++ b/api/src/metrics/Metric.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, AttributeValue } from '../common/Attributes'; -import { Context } from '../context/types'; +import type { Attributes, AttributeValue } from '../common/Attributes'; +import type { Context } from '../context/types'; /** * Advisory options influencing aggregation configuration parameters. diff --git a/api/src/metrics/NoopMeter.ts b/api/src/metrics/NoopMeter.ts index 018fc1f5a78..9fe7adc8fea 100644 --- a/api/src/metrics/NoopMeter.ts +++ b/api/src/metrics/NoopMeter.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Meter } from './Meter'; -import { +import type { Meter } from './Meter'; +import type { BatchObservableCallback, Counter, Gauge, diff --git a/api/src/metrics/NoopMeterProvider.ts b/api/src/metrics/NoopMeterProvider.ts index 142d235d90d..450e3b20c23 100644 --- a/api/src/metrics/NoopMeterProvider.ts +++ b/api/src/metrics/NoopMeterProvider.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Meter, MeterOptions } from './Meter'; -import { MeterProvider } from './MeterProvider'; +import type { Meter, MeterOptions } from './Meter'; +import type { MeterProvider } from './MeterProvider'; import { NOOP_METER } from './NoopMeter'; /** diff --git a/api/src/propagation/NoopTextMapPropagator.ts b/api/src/propagation/NoopTextMapPropagator.ts index 56f9fc31843..f935bd53703 100644 --- a/api/src/propagation/NoopTextMapPropagator.ts +++ b/api/src/propagation/NoopTextMapPropagator.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; -import { TextMapPropagator } from './TextMapPropagator'; +import type { Context } from '../context/types'; +import type { TextMapPropagator } from './TextMapPropagator'; /** * No-op implementations of {@link TextMapPropagator}. diff --git a/api/src/propagation/TextMapPropagator.ts b/api/src/propagation/TextMapPropagator.ts index 1f18294f05b..83f02fc06e0 100644 --- a/api/src/propagation/TextMapPropagator.ts +++ b/api/src/propagation/TextMapPropagator.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; +import type { Context } from '../context/types'; /** * Injects `Context` into and extracts it from carriers that travel diff --git a/api/src/trace/NonRecordingSpan.ts b/api/src/trace/NonRecordingSpan.ts index 8642c98adb5..0c5d7fe59dd 100644 --- a/api/src/trace/NonRecordingSpan.ts +++ b/api/src/trace/NonRecordingSpan.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Exception } from '../common/Exception'; -import { TimeInput } from '../common/Time'; -import { SpanAttributes } from './attributes'; +import type { Exception } from '../common/Exception'; +import type { TimeInput } from '../common/Time'; +import type { SpanAttributes } from './attributes'; import { INVALID_SPAN_CONTEXT } from './invalid-span-constants'; -import { Span } from './span'; -import { SpanContext } from './span_context'; -import { SpanStatus } from './status'; -import { Link } from './link'; +import type { Span } from './span'; +import type { SpanContext } from './span_context'; +import type { SpanStatus } from './status'; +import type { Link } from './link'; /** * The NonRecordingSpan is the default {@link Span} that is used when no Span diff --git a/api/src/trace/NoopTracer.ts b/api/src/trace/NoopTracer.ts index 4f287cc9863..b29ed5327d1 100644 --- a/api/src/trace/NoopTracer.ts +++ b/api/src/trace/NoopTracer.ts @@ -4,14 +4,14 @@ */ import { ContextAPI } from '../api/context'; -import { Context } from '../context/types'; +import type { Context } from '../context/types'; import { getSpanContext, setSpan } from '../trace/context-utils'; import { NonRecordingSpan } from './NonRecordingSpan'; -import { Span } from './span'; +import type { Span } from './span'; import { isSpanContextValid } from './spancontext-utils'; -import { SpanOptions } from './SpanOptions'; -import { SpanContext } from './span_context'; -import { Tracer } from './tracer'; +import type { SpanOptions } from './SpanOptions'; +import type { SpanContext } from './span_context'; +import type { Tracer } from './tracer'; const contextApi = ContextAPI.getInstance(); diff --git a/api/src/trace/NoopTracerProvider.ts b/api/src/trace/NoopTracerProvider.ts index e573de39383..01f2c7bc4e8 100644 --- a/api/src/trace/NoopTracerProvider.ts +++ b/api/src/trace/NoopTracerProvider.ts @@ -4,9 +4,9 @@ */ import { NoopTracer } from './NoopTracer'; -import { Tracer } from './tracer'; -import { TracerOptions } from './tracer_options'; -import { TracerProvider } from './tracer_provider'; +import type { Tracer } from './tracer'; +import type { TracerOptions } from './tracer_options'; +import type { TracerProvider } from './tracer_provider'; /** * An implementation of the {@link TracerProvider} which returns an impotent diff --git a/api/src/trace/ProxyTracer.ts b/api/src/trace/ProxyTracer.ts index 3277891ddb1..349ce297418 100644 --- a/api/src/trace/ProxyTracer.ts +++ b/api/src/trace/ProxyTracer.ts @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; +import type { Context } from '../context/types'; import { NoopTracer } from './NoopTracer'; -import { Span } from './span'; -import { SpanOptions } from './SpanOptions'; -import { Tracer } from './tracer'; -import { TracerOptions } from './tracer_options'; +import type { Span } from './span'; +import type { SpanOptions } from './SpanOptions'; +import type { Tracer } from './tracer'; +import type { TracerOptions } from './tracer_options'; const NOOP_TRACER = new NoopTracer(); diff --git a/api/src/trace/ProxyTracerProvider.ts b/api/src/trace/ProxyTracerProvider.ts index 4b1b5298c2c..11e5e88e7e9 100644 --- a/api/src/trace/ProxyTracerProvider.ts +++ b/api/src/trace/ProxyTracerProvider.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Tracer } from './tracer'; -import { TracerProvider } from './tracer_provider'; +import type { Tracer } from './tracer'; +import type { TracerProvider } from './tracer_provider'; import { ProxyTracer } from './ProxyTracer'; import { NoopTracerProvider } from './NoopTracerProvider'; -import { TracerOptions } from './tracer_options'; +import type { TracerOptions } from './tracer_options'; const NOOP_TRACER_PROVIDER = new NoopTracerProvider(); diff --git a/api/src/trace/Sampler.ts b/api/src/trace/Sampler.ts index 49dbbe26135..34b6a8f4107 100644 --- a/api/src/trace/Sampler.ts +++ b/api/src/trace/Sampler.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; -import { SpanAttributes } from './attributes'; -import { Link } from './link'; -import { SamplingResult } from './SamplingResult'; -import { SpanKind } from './span_kind'; +import type { Context } from '../context/types'; +import type { SpanAttributes } from './attributes'; +import type { Link } from './link'; +import type { SamplingResult } from './SamplingResult'; +import type { SpanKind } from './span_kind'; /** * @deprecated use the one declared in @opentelemetry/sdk-trace-base instead. diff --git a/api/src/trace/SamplingResult.ts b/api/src/trace/SamplingResult.ts index df4f2e21f7e..6ed7d850748 100644 --- a/api/src/trace/SamplingResult.ts +++ b/api/src/trace/SamplingResult.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanAttributes } from './attributes'; -import { TraceState } from './trace_state'; +import type { SpanAttributes } from './attributes'; +import type { TraceState } from './trace_state'; /** * @deprecated use the one declared in @opentelemetry/sdk-trace-base instead. diff --git a/api/src/trace/SpanOptions.ts b/api/src/trace/SpanOptions.ts index 0c8be40f5c5..5247cea35f2 100644 --- a/api/src/trace/SpanOptions.ts +++ b/api/src/trace/SpanOptions.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TimeInput } from '../common/Time'; -import { SpanAttributes } from './attributes'; -import { Link } from './link'; -import { SpanKind } from './span_kind'; +import type { TimeInput } from '../common/Time'; +import type { SpanAttributes } from './attributes'; +import type { Link } from './link'; +import type { SpanKind } from './span_kind'; /** * Options needed for span creation diff --git a/api/src/trace/attributes.ts b/api/src/trace/attributes.ts index c8df7fb729e..8a8e1c63806 100644 --- a/api/src/trace/attributes.ts +++ b/api/src/trace/attributes.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, AttributeValue } from '../common/Attributes'; +import type { Attributes, AttributeValue } from '../common/Attributes'; /** * @deprecated please use {@link Attributes} diff --git a/api/src/trace/context-utils.ts b/api/src/trace/context-utils.ts index d018832c969..d880a299865 100644 --- a/api/src/trace/context-utils.ts +++ b/api/src/trace/context-utils.ts @@ -4,9 +4,9 @@ */ import { createContextKey } from '../context/context'; -import { Context } from '../context/types'; -import { Span } from './span'; -import { SpanContext } from './span_context'; +import type { Context } from '../context/types'; +import type { Span } from './span'; +import type { SpanContext } from './span_context'; import { NonRecordingSpan } from './NonRecordingSpan'; import { ContextAPI } from '../api/context'; diff --git a/api/src/trace/internal/tracestate-impl.ts b/api/src/trace/internal/tracestate-impl.ts index 2093e679b36..f3f6680f82f 100644 --- a/api/src/trace/internal/tracestate-impl.ts +++ b/api/src/trace/internal/tracestate-impl.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TraceState } from '../trace_state'; +import type { TraceState } from '../trace_state'; import { validateKey, validateValue } from './tracestate-validators'; const MAX_TRACE_STATE_ITEMS = 32; diff --git a/api/src/trace/internal/utils.ts b/api/src/trace/internal/utils.ts index a623f027b0f..10a1ac52a4e 100644 --- a/api/src/trace/internal/utils.ts +++ b/api/src/trace/internal/utils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TraceState } from '../trace_state'; +import type { TraceState } from '../trace_state'; import { TraceStateImpl } from './tracestate-impl'; /** diff --git a/api/src/trace/invalid-span-constants.ts b/api/src/trace/invalid-span-constants.ts index f3e9e0120e3..449dbe8cb83 100644 --- a/api/src/trace/invalid-span-constants.ts +++ b/api/src/trace/invalid-span-constants.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanContext } from './span_context'; +import type { SpanContext } from './span_context'; import { TraceFlags } from './trace_flags'; /** diff --git a/api/src/trace/link.ts b/api/src/trace/link.ts index bfeaaff6f8b..d748ff97d58 100644 --- a/api/src/trace/link.ts +++ b/api/src/trace/link.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanAttributes } from './attributes'; -import { SpanContext } from './span_context'; +import type { SpanAttributes } from './attributes'; +import type { SpanContext } from './span_context'; /** * A pointer from the current {@link Span} to another span in the same trace or diff --git a/api/src/trace/span.ts b/api/src/trace/span.ts index e62e53e19bc..65e932f7922 100644 --- a/api/src/trace/span.ts +++ b/api/src/trace/span.ts @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Exception } from '../common/Exception'; -import { TimeInput } from '../common/Time'; -import { SpanAttributes, SpanAttributeValue } from './attributes'; -import { SpanContext } from './span_context'; -import { SpanStatus } from './status'; -import { Link } from './link'; +import type { Exception } from '../common/Exception'; +import type { TimeInput } from '../common/Time'; +import type { SpanAttributes, SpanAttributeValue } from './attributes'; +import type { SpanContext } from './span_context'; +import type { SpanStatus } from './status'; +import type { Link } from './link'; /** * An interface that represents a span. A span represents a single operation diff --git a/api/src/trace/span_context.ts b/api/src/trace/span_context.ts index 3688a915487..ceeff3c7d38 100644 --- a/api/src/trace/span_context.ts +++ b/api/src/trace/span_context.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TraceState } from './trace_state'; +import type { TraceState } from './trace_state'; /** * A SpanContext represents the portion of a {@link Span} which must be diff --git a/api/src/trace/spancontext-utils.ts b/api/src/trace/spancontext-utils.ts index 7afd0841247..f9fb55f6634 100644 --- a/api/src/trace/spancontext-utils.ts +++ b/api/src/trace/spancontext-utils.ts @@ -4,8 +4,8 @@ */ import { INVALID_SPANID, INVALID_TRACEID } from './invalid-span-constants'; import { NonRecordingSpan } from './NonRecordingSpan'; -import { Span } from './span'; -import { SpanContext } from './span_context'; +import type { Span } from './span'; +import type { SpanContext } from './span_context'; // Valid characters (0-9, a-f, A-F) are marked as 1. const isHex = new Uint8Array([ diff --git a/api/src/trace/tracer.ts b/api/src/trace/tracer.ts index d73d771f67e..5b3220db097 100644 --- a/api/src/trace/tracer.ts +++ b/api/src/trace/tracer.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '../context/types'; -import { Span } from './span'; -import { SpanOptions } from './SpanOptions'; +import type { Context } from '../context/types'; +import type { Span } from './span'; +import type { SpanOptions } from './SpanOptions'; /** * Tracer provides an interface for creating {@link Span}s. diff --git a/api/src/trace/tracer_provider.ts b/api/src/trace/tracer_provider.ts index ef7180fcf81..a867dd7f89c 100644 --- a/api/src/trace/tracer_provider.ts +++ b/api/src/trace/tracer_provider.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Tracer } from './tracer'; -import { TracerOptions } from './tracer_options'; +import type { Tracer } from './tracer'; +import type { TracerOptions } from './tracer_options'; /** * A registry for creating named {@link Tracer}s. diff --git a/api/test/common/api/api.test.ts b/api/test/common/api/api.test.ts index b37958352f8..4c776ecb193 100644 --- a/api/test/common/api/api.test.ts +++ b/api/test/common/api/api.test.ts @@ -4,20 +4,22 @@ */ import * as assert from 'assert'; +import type { + Context, + Span, + SpanOptions, + TextMapGetter, + TextMapPropagator, + TextMapSetter, +} from '../../../src'; import api, { context, - Context, defaultTextMapGetter, defaultTextMapSetter, diag, metrics, propagation, ROOT_CONTEXT, - Span, - SpanOptions, - TextMapGetter, - TextMapPropagator, - TextMapSetter, trace, TraceFlags, } from '../../../src'; diff --git a/api/test/common/diag/ComponentLogger.test.ts b/api/test/common/diag/ComponentLogger.test.ts index 8b4541ef4ce..97040a7b190 100644 --- a/api/test/common/diag/ComponentLogger.test.ts +++ b/api/test/common/diag/ComponentLogger.test.ts @@ -5,7 +5,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { diag, DiagLogger, DiagLogLevel } from '../../../src'; +import type { DiagLogger } from '../../../src'; +import { diag, DiagLogLevel } from '../../../src'; class SpyLogger implements DiagLogger { debug() {} diff --git a/api/test/common/diag/logLevel.test.ts b/api/test/common/diag/logLevel.test.ts index 6b95f99e245..28ac688bacc 100644 --- a/api/test/common/diag/logLevel.test.ts +++ b/api/test/common/diag/logLevel.test.ts @@ -7,7 +7,8 @@ import * as assert from 'assert'; import { diag } from '../../../src'; import { createLogLevelDiagLogger } from '../../../src/diag/internal/logLevelLogger'; import { createNoopDiagLogger } from '../../../src/diag/internal/noopLogger'; -import { DiagLogger, DiagLogLevel } from '../../../src/diag/types'; +import type { DiagLogger } from '../../../src/diag/types'; +import { DiagLogLevel } from '../../../src/diag/types'; // Matches the previous Logger definition const incompleteLoggerFuncs = ['debug', 'info', 'warn', 'error'] as const; diff --git a/api/test/common/diag/logger.test.ts b/api/test/common/diag/logger.test.ts index 41f4a244bc6..c28c9ab51f8 100644 --- a/api/test/common/diag/logger.test.ts +++ b/api/test/common/diag/logger.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { diag, DiagLogLevel } from '../../../src'; import { createNoopDiagLogger } from '../../../src/diag/internal/noopLogger'; -import { DiagLogger } from '../../../src/diag/types'; +import type { DiagLogger } from '../../../src/diag/types'; export const diagLoggerFunctions = [ 'verbose', diff --git a/api/test/common/experimental/trace/SugaredTracer.test.ts b/api/test/common/experimental/trace/SugaredTracer.test.ts index 5ec83b85546..a1082e23034 100644 --- a/api/test/common/experimental/trace/SugaredTracer.test.ts +++ b/api/test/common/experimental/trace/SugaredTracer.test.ts @@ -6,8 +6,9 @@ import { wrapTracer } from '../../../../src/experimental'; import * as assert from 'assert'; import { NoopTracerProvider } from '../../../../src/trace/NoopTracerProvider'; import { NoopTracer } from '../../../../src/trace/NoopTracer'; -import { Span } from '../../../../src'; -import { Context, context, SpanOptions } from '../../../../src'; +import type { Span } from '../../../../src'; +import type { Context, SpanOptions } from '../../../../src'; +import { context } from '../../../../src'; describe('SugaredTracer', function () { class TestTracer extends NoopTracer { diff --git a/api/test/common/internal/global.test.ts b/api/test/common/internal/global.test.ts index 6475fd3d580..736f8144162 100644 --- a/api/test/common/internal/global.test.ts +++ b/api/test/common/internal/global.test.ts @@ -9,13 +9,13 @@ import { getGlobal } from '../../../src/internal/global-utils'; import { NoopContextManager } from '../../../src/context/NoopContextManager'; import { DiagLogLevel } from '../../../src/diag/types'; -const api1 = require('../../../src') as typeof import('../../../src'); +const api1 = require('../../../src'); // clear cache and load a second instance of the api for (const key of Object.keys(require.cache)) { delete require.cache[key]; } -const api2 = require('../../../src') as typeof import('../../../src'); +const api2 = require('../../../src'); // This will need to be changed manually on major version changes. // It is intentionally not autogenerated to ensure the author of the change is aware of what they are doing. diff --git a/api/test/common/metrics/Metric.test.ts b/api/test/common/metrics/Metric.test.ts index 473dc4f0924..3bd49e68ad6 100644 --- a/api/test/common/metrics/Metric.test.ts +++ b/api/test/common/metrics/Metric.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Counter, UpDownCounter, Histogram } from '../../../src'; +import type { Counter, UpDownCounter, Histogram } from '../../../src'; describe('Metric', function () { describe('Counter', function () { diff --git a/api/test/common/noop-implementations/noop-tracer.test.ts b/api/test/common/noop-implementations/noop-tracer.test.ts index 09a3e88fda9..17c27d62e12 100644 --- a/api/test/common/noop-implementations/noop-tracer.test.ts +++ b/api/test/common/noop-implementations/noop-tracer.test.ts @@ -5,11 +5,10 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; +import type { Span, SpanContext } from '../../../src'; import { context, ROOT_CONTEXT, - Span, - SpanContext, SpanKind, trace, TraceFlags, diff --git a/api/test/common/proxy-implementations/proxy-tracer.test.ts b/api/test/common/proxy-implementations/proxy-tracer.test.ts index d9159bf5cdf..86409d55ffc 100644 --- a/api/test/common/proxy-implementations/proxy-tracer.test.ts +++ b/api/test/common/proxy-implementations/proxy-tracer.test.ts @@ -5,16 +5,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { - context, - ProxyTracer, - ROOT_CONTEXT, - Span, - SpanKind, - SpanOptions, - Tracer, - TracerProvider, -} from '../../../src'; +import type { Span, SpanOptions, Tracer, TracerProvider } from '../../../src'; +import { context, ProxyTracer, ROOT_CONTEXT, SpanKind } from '../../../src'; import { NonRecordingSpan } from '../../../src/trace/NonRecordingSpan'; import { NoopTracer } from '../../../src/trace/NoopTracer'; import { ProxyTracerProvider } from '../../../src/trace/ProxyTracerProvider'; diff --git a/api/test/common/trace/tracestate.test.ts b/api/test/common/trace/tracestate.test.ts index 807358fdf33..b6ef17cf532 100644 --- a/api/test/common/trace/tracestate.test.ts +++ b/api/test/common/trace/tracestate.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { createTraceState } from '../../../src/trace/internal/utils'; -import { TraceStateImpl } from '../../../src/trace/internal/tracestate-impl'; +import type { TraceStateImpl } from '../../../src/trace/internal/tracestate-impl'; describe('TraceState', function () { describe('.serialize()', function () { diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts index c17e82721a0..b992adb53f7 100644 --- a/api/test/tree-shaking/tree-shaking.test.ts +++ b/api/test/tree-shaking/tree-shaking.test.ts @@ -4,9 +4,11 @@ */ import * as assert from 'assert'; -import { webpack, Stats } from 'webpack'; +import type { Stats } from 'webpack'; +import { webpack } from 'webpack'; import * as path from 'path'; -import { IFS, Union } from 'unionfs'; +import type { IFS } from 'unionfs'; +import { Union } from 'unionfs'; import { fs as mfs } from 'memfs'; import * as realFs from 'fs'; diff --git a/experimental/packages/api-logs/src/NoopLogger.ts b/experimental/packages/api-logs/src/NoopLogger.ts index fdd0cfdd689..600f2d4bfba 100644 --- a/experimental/packages/api-logs/src/NoopLogger.ts +++ b/experimental/packages/api-logs/src/NoopLogger.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Logger } from './types/Logger'; -import { LogRecord } from './types/LogRecord'; +import type { Logger } from './types/Logger'; +import type { LogRecord } from './types/LogRecord'; export class NoopLogger implements Logger { emit(_logRecord: LogRecord): void {} diff --git a/experimental/packages/api-logs/src/NoopLoggerProvider.ts b/experimental/packages/api-logs/src/NoopLoggerProvider.ts index e3e65b639c4..39a928c672c 100644 --- a/experimental/packages/api-logs/src/NoopLoggerProvider.ts +++ b/experimental/packages/api-logs/src/NoopLoggerProvider.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { LoggerProvider } from './types/LoggerProvider'; -import { Logger } from './types/Logger'; -import { LoggerOptions } from './types/LoggerOptions'; +import type { LoggerProvider } from './types/LoggerProvider'; +import type { Logger } from './types/Logger'; +import type { LoggerOptions } from './types/LoggerOptions'; import { NoopLogger } from './NoopLogger'; export class NoopLoggerProvider implements LoggerProvider { diff --git a/experimental/packages/api-logs/src/ProxyLogger.ts b/experimental/packages/api-logs/src/ProxyLogger.ts index a01dd525cde..b0814dffacb 100644 --- a/experimental/packages/api-logs/src/ProxyLogger.ts +++ b/experimental/packages/api-logs/src/ProxyLogger.ts @@ -4,9 +4,9 @@ */ import { NOOP_LOGGER } from './NoopLogger'; -import { Logger } from './types/Logger'; -import { LoggerOptions } from './types/LoggerOptions'; -import { LogRecord } from './types/LogRecord'; +import type { Logger } from './types/Logger'; +import type { LoggerOptions } from './types/LoggerOptions'; +import type { LogRecord } from './types/LogRecord'; export class ProxyLogger implements Logger { // When a real implementation is provided, this will be it diff --git a/experimental/packages/api-logs/src/ProxyLoggerProvider.ts b/experimental/packages/api-logs/src/ProxyLoggerProvider.ts index ec09403b5db..4aae4f83f1c 100644 --- a/experimental/packages/api-logs/src/ProxyLoggerProvider.ts +++ b/experimental/packages/api-logs/src/ProxyLoggerProvider.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { LoggerProvider } from './types/LoggerProvider'; -import { Logger } from './types/Logger'; -import { LoggerOptions } from './types/LoggerOptions'; +import type { LoggerProvider } from './types/LoggerProvider'; +import type { Logger } from './types/Logger'; +import type { LoggerOptions } from './types/LoggerOptions'; import { NOOP_LOGGER_PROVIDER } from './NoopLoggerProvider'; import { ProxyLogger } from './ProxyLogger'; diff --git a/experimental/packages/api-logs/src/api/logs.ts b/experimental/packages/api-logs/src/api/logs.ts index 15e4ad7851a..67b72d7f9a7 100644 --- a/experimental/packages/api-logs/src/api/logs.ts +++ b/experimental/packages/api-logs/src/api/logs.ts @@ -9,10 +9,10 @@ import { _global, makeGetter, } from '../internal/global-utils'; -import { LoggerProvider } from '../types/LoggerProvider'; +import type { LoggerProvider } from '../types/LoggerProvider'; import { NOOP_LOGGER_PROVIDER } from '../NoopLoggerProvider'; -import { Logger } from '../types/Logger'; -import { LoggerOptions } from '../types/LoggerOptions'; +import type { Logger } from '../types/Logger'; +import type { LoggerOptions } from '../types/LoggerOptions'; import { ProxyLoggerProvider } from '../ProxyLoggerProvider'; export class LogsAPI { diff --git a/experimental/packages/api-logs/src/internal/global-utils.ts b/experimental/packages/api-logs/src/internal/global-utils.ts index aebdee9ef94..f736d481ae0 100644 --- a/experimental/packages/api-logs/src/internal/global-utils.ts +++ b/experimental/packages/api-logs/src/internal/global-utils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { LoggerProvider } from '../types/LoggerProvider'; +import type { LoggerProvider } from '../types/LoggerProvider'; export const GLOBAL_LOGS_API_KEY = Symbol.for('io.opentelemetry.js.api.logs'); diff --git a/experimental/packages/api-logs/src/types/LogRecord.ts b/experimental/packages/api-logs/src/types/LogRecord.ts index 31dead8c1f2..de0b61bd29b 100644 --- a/experimental/packages/api-logs/src/types/LogRecord.ts +++ b/experimental/packages/api-logs/src/types/LogRecord.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, TimeInput } from '@opentelemetry/api'; -import { AnyValue, AnyValueMap } from './AnyValue'; +import type { Context, TimeInput } from '@opentelemetry/api'; +import type { AnyValue, AnyValueMap } from './AnyValue'; export type LogBody = AnyValue; export type LogAttributes = AnyValueMap; diff --git a/experimental/packages/api-logs/src/types/Logger.ts b/experimental/packages/api-logs/src/types/Logger.ts index 25b00947e26..3da70201381 100644 --- a/experimental/packages/api-logs/src/types/Logger.ts +++ b/experimental/packages/api-logs/src/types/Logger.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { LogRecord } from './LogRecord'; +import type { LogRecord } from './LogRecord'; export interface Logger { /** diff --git a/experimental/packages/api-logs/src/types/LoggerOptions.ts b/experimental/packages/api-logs/src/types/LoggerOptions.ts index 67129d08360..a3941bd7ed9 100644 --- a/experimental/packages/api-logs/src/types/LoggerOptions.ts +++ b/experimental/packages/api-logs/src/types/LoggerOptions.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; export interface LoggerOptions { /** * The schemaUrl of the tracer or instrumentation library diff --git a/experimental/packages/api-logs/src/types/LoggerProvider.ts b/experimental/packages/api-logs/src/types/LoggerProvider.ts index 7b50c9efeac..5ba47c28cc6 100644 --- a/experimental/packages/api-logs/src/types/LoggerProvider.ts +++ b/experimental/packages/api-logs/src/types/LoggerProvider.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Logger } from './Logger'; -import { LoggerOptions } from './LoggerOptions'; +import type { Logger } from './Logger'; +import type { LoggerOptions } from './LoggerOptions'; /** * A registry for creating named {@link Logger}s. diff --git a/experimental/packages/api-logs/test/api/api.test.ts b/experimental/packages/api-logs/test/api/api.test.ts index d2d2cae09be..89be78c67de 100644 --- a/experimental/packages/api-logs/test/api/api.test.ts +++ b/experimental/packages/api-logs/test/api/api.test.ts @@ -4,7 +4,8 @@ */ import * as assert from 'assert'; -import { Logger, logs } from '../../src'; +import type { Logger } from '../../src'; +import { logs } from '../../src'; import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider'; import { NoopLogger } from '../../src/NoopLogger'; import { NoopLoggerProvider } from '../../src/NoopLoggerProvider'; diff --git a/experimental/packages/api-logs/test/internal/global.test.ts b/experimental/packages/api-logs/test/internal/global.test.ts index 406e2ad3770..775f829f956 100644 --- a/experimental/packages/api-logs/test/internal/global.test.ts +++ b/experimental/packages/api-logs/test/internal/global.test.ts @@ -8,13 +8,13 @@ import { _global, GLOBAL_LOGS_API_KEY } from '../../src/internal/global-utils'; import { NoopLoggerProvider } from '../../src/NoopLoggerProvider'; import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider'; -const api1 = require('../../src') as typeof import('../../src'); +const api1 = require('../../src'); // clear cache and load a second instance of the api for (const key of Object.keys(require.cache)) { delete require.cache[key]; } -const api2 = require('../../src') as typeof import('../../src'); +const api2 = require('../../src'); describe('Global Utils', () => { // prove they are separate instances diff --git a/experimental/packages/api-logs/test/proxy-implementations/proxy-logger.test.ts b/experimental/packages/api-logs/test/proxy-implementations/proxy-logger.test.ts index 7fb98098f75..e74de3a5c9d 100644 --- a/experimental/packages/api-logs/test/proxy-implementations/proxy-logger.test.ts +++ b/experimental/packages/api-logs/test/proxy-implementations/proxy-logger.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { Logger, LoggerProvider } from '../../src'; +import type { Logger, LoggerProvider } from '../../src'; import { NoopLogger } from '../../src/NoopLogger'; import { ProxyLogger } from '../../src/ProxyLogger'; import { ProxyLoggerProvider } from '../../src/ProxyLoggerProvider'; diff --git a/experimental/packages/configuration/src/ConfigFactory.ts b/experimental/packages/configuration/src/ConfigFactory.ts index c3c966f4e64..5032c27b95d 100644 --- a/experimental/packages/configuration/src/ConfigFactory.ts +++ b/experimental/packages/configuration/src/ConfigFactory.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ConfigFactory } from './IConfigFactory'; +import type { ConfigFactory } from './IConfigFactory'; import { EnvironmentConfigFactory } from './EnvironmentConfigFactory'; import { FileConfigFactory, hasValidConfigFile } from './FileConfigFactory'; diff --git a/experimental/packages/configuration/src/EnvironmentConfigFactory.ts b/experimental/packages/configuration/src/EnvironmentConfigFactory.ts index 73eda53fdd9..e8186e5d801 100644 --- a/experimental/packages/configuration/src/EnvironmentConfigFactory.ts +++ b/experimental/packages/configuration/src/EnvironmentConfigFactory.ts @@ -3,10 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - ConfigurationModel, - initializeDefaultConfiguration, -} from './models/configModel'; +import type { ConfigurationModel } from './models/configModel'; +import { initializeDefaultConfiguration } from './models/configModel'; import { getBooleanFromEnv, getStringFromEnv, @@ -14,25 +12,23 @@ import { diagLogLevelFromString, getNumberFromEnv, } from '@opentelemetry/core'; -import { ConfigFactory } from './IConfigFactory'; +import type { ConfigFactory } from './IConfigFactory'; +import type { + PeriodicMetricReader, + PullMetricReader, +} from './models/meterProviderModel'; import { ExemplarFilter, ExporterDefaultHistogramAggregation, ExporterTemporalityPreference, initializeDefaultMeterProviderConfiguration, - PeriodicMetricReader, - PullMetricReader, } from './models/meterProviderModel'; import { OtlpHttpEncoding } from './models/commonModel'; import { diag } from '@opentelemetry/api'; -import { - BatchSpanProcessor, - initializeDefaultTracerProviderConfiguration, -} from './models/tracerProviderModel'; -import { - BatchLogRecordProcessor, - initializeDefaultLoggerProviderConfiguration, -} from './models/loggerProviderModel'; +import type { BatchSpanProcessor } from './models/tracerProviderModel'; +import { initializeDefaultTracerProviderConfiguration } from './models/tracerProviderModel'; +import type { BatchLogRecordProcessor } from './models/loggerProviderModel'; +import { initializeDefaultLoggerProviderConfiguration } from './models/loggerProviderModel'; import { getGrpcTlsConfig, getHttpTlsConfig } from './utils'; /** diff --git a/experimental/packages/configuration/src/FileConfigFactory.ts b/experimental/packages/configuration/src/FileConfigFactory.ts index 0d5a6f5bbf4..b029a81df1e 100644 --- a/experimental/packages/configuration/src/FileConfigFactory.ts +++ b/experimental/packages/configuration/src/FileConfigFactory.ts @@ -4,13 +4,13 @@ */ import { diagLogLevelFromString, getStringFromEnv } from '@opentelemetry/core'; -import { +import type { AttributeLimits, Propagator, ConfigurationModel, - initializeDefaultConfiguration, } from './models/configModel'; -import { ConfigFactory } from './IConfigFactory'; +import { initializeDefaultConfiguration } from './models/configModel'; +import type { ConfigFactory } from './IConfigFactory'; import * as fs from 'fs'; import * as yaml from 'yaml'; import { @@ -23,34 +23,25 @@ import { getStringFromConfigFile, getStringListFromConfigFile, } from './utils'; -import { - NameStringValuePair, - OtlpHttpEncoding, - SeverityNumber, -} from './models/commonModel'; -import { - initializeDefaultTracerProviderConfiguration, +import type { NameStringValuePair } from './models/commonModel'; +import { OtlpHttpEncoding, SeverityNumber } from './models/commonModel'; +import type { SpanExporter, SpanProcessor, TracerProvider, } from './models/tracerProviderModel'; -import { +import { initializeDefaultTracerProviderConfiguration } from './models/tracerProviderModel'; +import type { ExperimentalLoggerMatcherAndConfig, - initializeDefaultLoggerProviderConfiguration, LoggerProvider, LogRecordExporter, LogRecordProcessor, } from './models/loggerProviderModel'; -import { AttributeNameValue } from './models/resourceModel'; -import { +import { initializeDefaultLoggerProviderConfiguration } from './models/loggerProviderModel'; +import type { AttributeNameValue } from './models/resourceModel'; +import type { Aggregation, CardinalityLimits, - ExemplarFilter, - ExperimentalPrometheusTranslationStrategy, - ExporterDefaultHistogramAggregation, - ExporterTemporalityPreference, - initializeDefaultMeterProviderConfiguration, - InstrumentType, MeterProvider, MetricProducer, MetricReader, @@ -60,6 +51,14 @@ import { ViewSelector, ViewStream, } from './models/meterProviderModel'; +import { + ExemplarFilter, + ExperimentalPrometheusTranslationStrategy, + ExporterDefaultHistogramAggregation, + ExporterTemporalityPreference, + initializeDefaultMeterProviderConfiguration, + InstrumentType, +} from './models/meterProviderModel'; import { diag } from '@opentelemetry/api'; export class FileConfigFactory implements ConfigFactory { diff --git a/experimental/packages/configuration/src/IConfigFactory.ts b/experimental/packages/configuration/src/IConfigFactory.ts index 6804b153a93..fe58ec96272 100644 --- a/experimental/packages/configuration/src/IConfigFactory.ts +++ b/experimental/packages/configuration/src/IConfigFactory.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ConfigurationModel } from './models/configModel'; +import type { ConfigurationModel } from './models/configModel'; export interface ConfigFactory { /** diff --git a/experimental/packages/configuration/src/models/configModel.ts b/experimental/packages/configuration/src/models/configModel.ts index 5861b22676b..a6bd1f5bd18 100644 --- a/experimental/packages/configuration/src/models/configModel.ts +++ b/experimental/packages/configuration/src/models/configModel.ts @@ -5,10 +5,10 @@ 'use strict'; import { DiagLogLevel } from '@opentelemetry/api'; -import { TracerProvider } from './tracerProviderModel'; -import { LoggerProvider } from './loggerProviderModel'; -import { Resource } from './resourceModel'; -import { MeterProvider } from './meterProviderModel'; +import type { TracerProvider } from './tracerProviderModel'; +import type { LoggerProvider } from './loggerProviderModel'; +import type { Resource } from './resourceModel'; +import type { MeterProvider } from './meterProviderModel'; export interface ConfigurationModel { /** diff --git a/experimental/packages/configuration/src/models/loggerProviderModel.ts b/experimental/packages/configuration/src/models/loggerProviderModel.ts index 8be56303533..ea355bb0684 100644 --- a/experimental/packages/configuration/src/models/loggerProviderModel.ts +++ b/experimental/packages/configuration/src/models/loggerProviderModel.ts @@ -4,7 +4,7 @@ */ 'use strict'; -import { +import type { ExperimentalOtlpFileExporter, OtlpGrpcExporter, OtlpHttpExporter, diff --git a/experimental/packages/configuration/src/models/meterProviderModel.ts b/experimental/packages/configuration/src/models/meterProviderModel.ts index 68382450957..6c6b9d8b624 100644 --- a/experimental/packages/configuration/src/models/meterProviderModel.ts +++ b/experimental/packages/configuration/src/models/meterProviderModel.ts @@ -4,7 +4,7 @@ */ 'use strict'; -import { +import type { GrpcTls, HttpTls, IncludeExclude, diff --git a/experimental/packages/configuration/src/models/resourceModel.ts b/experimental/packages/configuration/src/models/resourceModel.ts index 0f1d3cbbdb8..dc6e06efaf0 100644 --- a/experimental/packages/configuration/src/models/resourceModel.ts +++ b/experimental/packages/configuration/src/models/resourceModel.ts @@ -4,7 +4,7 @@ */ 'use strict'; -import { IncludeExclude } from './commonModel'; +import type { IncludeExclude } from './commonModel'; export interface Resource { /** diff --git a/experimental/packages/configuration/src/models/tracerProviderModel.ts b/experimental/packages/configuration/src/models/tracerProviderModel.ts index 98255012ca4..1c8a289aaa1 100644 --- a/experimental/packages/configuration/src/models/tracerProviderModel.ts +++ b/experimental/packages/configuration/src/models/tracerProviderModel.ts @@ -4,7 +4,7 @@ */ 'use strict'; -import { +import type { ExperimentalOtlpFileExporter, OtlpGrpcExporter, OtlpHttpExporter, diff --git a/experimental/packages/configuration/src/utils.ts b/experimental/packages/configuration/src/utils.ts index 60a2ee3328f..3198df3fcda 100644 --- a/experimental/packages/configuration/src/utils.ts +++ b/experimental/packages/configuration/src/utils.ts @@ -5,7 +5,7 @@ import { diag } from '@opentelemetry/api'; import { getStringFromEnv } from '@opentelemetry/core'; import { inspect } from 'util'; -import { GrpcTls, HttpTls } from './models/commonModel'; +import type { GrpcTls, HttpTls } from './models/commonModel'; /** * Retrieves a boolean value from a configuration file parameter. diff --git a/experimental/packages/configuration/test/ConfigFactory.test.ts b/experimental/packages/configuration/test/ConfigFactory.test.ts index 6109c80e9a5..937b0c75717 100644 --- a/experimental/packages/configuration/test/ConfigFactory.test.ts +++ b/experimental/packages/configuration/test/ConfigFactory.test.ts @@ -5,18 +5,20 @@ import * as assert from 'assert'; import * as Sinon from 'sinon'; -import { ConfigurationModel } from '../src'; +import type { ConfigurationModel } from '../src'; import { diag, DiagLogLevel } from '@opentelemetry/api'; import { createConfigFactory } from '../src/ConfigFactory'; import { OtlpHttpEncoding, SeverityNumber } from '../src/models/commonModel'; +import type { + MeterProvider, + MetricReader, +} from '../src/models/meterProviderModel'; import { ExemplarFilter, ExperimentalPrometheusTranslationStrategy, ExporterDefaultHistogramAggregation, ExporterTemporalityPreference, InstrumentType, - MeterProvider, - MetricReader, } from '../src/models/meterProviderModel'; import { setAttributeLimits, @@ -33,7 +35,7 @@ import { getTemporalityPreference, getSeverity, } from '../src/FileConfigFactory'; -import { TracerProvider } from '../src/models/tracerProviderModel'; +import type { TracerProvider } from '../src/models/tracerProviderModel'; const defaultConfig: ConfigurationModel = { disabled: false, diff --git a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts index 5135b29e3b9..f98dc3e76d7 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts @@ -3,11 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { LogRecordExporter, ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import type { + LogRecordExporter, + ReadableLogRecord, +} from '@opentelemetry/sdk-logs'; +import type { OTLPGRPCExporterConfigNode } from '@opentelemetry/otlp-grpc-exporter-base'; import { convertLegacyOtlpGrpcOptions, createOtlpGrpcExportDelegate, - OTLPGRPCExporterConfigNode, } from '@opentelemetry/otlp-grpc-exporter-base'; import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts index 0a4c487521c..c05a485aeeb 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts @@ -8,7 +8,8 @@ import { SimpleLogRecordProcessor, } from '@opentelemetry/sdk-logs'; import { OTLPLogExporter } from '../src'; -import { ServerTestContext, startServer } from './utils'; +import type { ServerTestContext } from './utils'; +import { startServer } from './utils'; import * as assert from 'assert'; const testServiceDefinition = { diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts b/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts index 41e7e3a2371..c1f09e0037d 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts @@ -3,12 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Metadata, - Server, - ServerCredentials, - ServiceDefinition, -} from '@grpc/grpc-js'; +import type { Metadata, ServiceDefinition } from '@grpc/grpc-js'; +import { Server, ServerCredentials } from '@grpc/grpc-js'; export interface ExportedData { request: Buffer; diff --git a/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts index ad656bfacd3..545ca5f16ad 100644 --- a/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - OTLPExporterConfigBase, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import type { + ReadableLogRecord, + LogRecordExporter, +} from '@opentelemetry/sdk-logs'; import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; /** diff --git a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts index 57829872852..b6c808ddaca 100644 --- a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - OTLPExporterBase, - OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; import { convertLegacyHttpOptions, createOtlpHttpExportDelegate, } from '@opentelemetry/otlp-exporter-base/node-http'; -import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import type { + ReadableLogRecord, + LogRecordExporter, +} from '@opentelemetry/sdk-logs'; /** * OTLP Log Protobuf Exporter for Node.js diff --git a/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts index 24284fd406f..93357785ecc 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { OTLPGRPCExporterConfigNode } from '@opentelemetry/otlp-grpc-exporter-base'; import { convertLegacyOtlpGrpcOptions, createOtlpGrpcExportDelegate, - OTLPGRPCExporterConfigNode, } from '@opentelemetry/otlp-grpc-exporter-base'; import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts index aa962d6a7b6..fcba08fd353 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts @@ -4,7 +4,8 @@ */ import { OTLPTraceExporter } from '../src'; -import { ServerTestContext, startServer } from './utils'; +import type { ServerTestContext } from './utils'; +import { startServer } from './utils'; import * as assert from 'assert'; import { SimpleSpanProcessor, diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts b/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts index 41e7e3a2371..c1f09e0037d 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts @@ -3,12 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Metadata, - Server, - ServerCredentials, - ServiceDefinition, -} from '@grpc/grpc-js'; +import type { Metadata, ServiceDefinition } from '@grpc/grpc-js'; +import { Server, ServerCredentials } from '@grpc/grpc-js'; export interface ExportedData { request: Buffer; diff --git a/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts index b6b08121fa6..89965572c9f 100644 --- a/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts @@ -3,11 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { - OTLPExporterConfigBase, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { JsonTraceSerializer } from '@opentelemetry/otlp-transformer'; import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; diff --git a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts index 7adb3214c12..72bf19940be 100644 --- a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts @@ -3,11 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { - OTLPExporterNodeConfigBase, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { JsonTraceSerializer } from '@opentelemetry/otlp-transformer'; import { convertLegacyHttpOptions, diff --git a/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts index 65831e25ae3..bfdfd0ffbaf 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts @@ -3,11 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { - OTLPExporterConfigBase, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; diff --git a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts index c0e63cdcf56..ccff53c7c70 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts @@ -3,11 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { - OTLPExporterNodeConfigBase, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; import { createOtlpHttpExportDelegate, diff --git a/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts b/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts index f55b7774da3..867445688f7 100644 --- a/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts +++ b/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts @@ -3,14 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, diag } from '@opentelemetry/api'; -import { +import type { Attributes } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; +import type { DetectedResource, ResourceDetector, ResourceDetectionConfig, - emptyResource, } from '@opentelemetry/resources'; -import { BROWSER_ATTRIBUTES, UserAgentData } from './types'; +import { emptyResource } from '@opentelemetry/resources'; +import type { UserAgentData } from './types'; +import { BROWSER_ATTRIBUTES } from './types'; /** * BrowserDetector will be used to detect the resources related to browser. diff --git a/experimental/packages/opentelemetry-browser-detector/test/util.ts b/experimental/packages/opentelemetry-browser-detector/test/util.ts index 6dd8307f7d5..99722031e89 100644 --- a/experimental/packages/opentelemetry-browser-detector/test/util.ts +++ b/experimental/packages/opentelemetry-browser-detector/test/util.ts @@ -2,10 +2,10 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Suite } from 'mocha'; +import type { Suite } from 'mocha'; import * as assert from 'assert'; import { BROWSER_ATTRIBUTES } from '../src/types'; -import { DetectedResource } from '@opentelemetry/resources'; +import type { DetectedResource } from '@opentelemetry/resources'; const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts index 205253fcefe..d603f1006bb 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts @@ -3,14 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - OTLPMetricExporterBase, - OTLPMetricExporterOptions, -} from '@opentelemetry/exporter-metrics-otlp-http'; +import type { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; +import { OTLPMetricExporterBase } from '@opentelemetry/exporter-metrics-otlp-http'; +import type { OTLPGRPCExporterConfigNode } from '@opentelemetry/otlp-grpc-exporter-base'; import { convertLegacyOtlpGrpcOptions, createOtlpGrpcExportDelegate, - OTLPGRPCExporterConfigNode, } from '@opentelemetry/otlp-grpc-exporter-base'; import { ProtobufMetricsSerializer } from '@opentelemetry/otlp-transformer'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts index 71e18f93164..98a37e4e31e 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts @@ -4,7 +4,8 @@ */ import { OTLPMetricExporter } from '../src'; -import { ServerTestContext, startServer } from './utils'; +import type { ServerTestContext } from './utils'; +import { startServer } from './utils'; import * as assert from 'assert'; import { MeterProvider, diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts index 41e7e3a2371..c1f09e0037d 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts @@ -3,12 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Metadata, - Server, - ServerCredentials, - ServiceDefinition, -} from '@grpc/grpc-js'; +import type { Metadata, ServiceDefinition } from '@grpc/grpc-js'; +import { Server, ServerCredentials } from '@grpc/grpc-js'; export interface ExportedData { request: Buffer; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts index fa608c6a077..46165f02153 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -4,24 +4,22 @@ */ import { getStringFromEnv } from '@opentelemetry/core'; -import { - AggregationTemporality, +import type { AggregationTemporalitySelector, - InstrumentType, PushMetricExporter, ResourceMetrics, AggregationSelector, AggregationOption, - AggregationType, } from '@opentelemetry/sdk-metrics'; import { - AggregationTemporalityPreference, - OTLPMetricExporterOptions, -} from './OTLPMetricExporterOptions'; -import { - IOtlpExportDelegate, - OTLPExporterBase, -} from '@opentelemetry/otlp-exporter-base'; + AggregationTemporality, + InstrumentType, + AggregationType, +} from '@opentelemetry/sdk-metrics'; +import type { OTLPMetricExporterOptions } from './OTLPMetricExporterOptions'; +import { AggregationTemporalityPreference } from './OTLPMetricExporterOptions'; +import type { IOtlpExportDelegate } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { diag } from '@opentelemetry/api'; export const CumulativeTemporalitySelector: AggregationTemporalitySelector = diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts index c3c9563e11a..5c8b275e516 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { +import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import type { AggregationTemporality, AggregationSelector, } from '@opentelemetry/sdk-metrics'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts index ef5ada3cc2a..a3fa52c62eb 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; +import type { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; import { JsonMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts index c41f0aad2b5..d354fca03af 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; +import type { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; import { JsonMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { convertLegacyHttpOptions, diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts index 43226d86b9b..3d4b13e0248 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts @@ -4,8 +4,8 @@ */ import { AggregationTemporalityPreference } from '../../src'; +import type { AggregationOption } from '@opentelemetry/sdk-metrics'; import { - AggregationOption, AggregationTemporality, AggregationType, InstrumentType, diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts index b9db124465a..d7faf7b28d8 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts @@ -9,8 +9,8 @@ import * as sinon from 'sinon'; import { AggregationTemporalityPreference } from '../../src'; import { OTLPMetricExporter } from '../../src/platform/node'; +import type { AggregationOption } from '@opentelemetry/sdk-metrics'; import { - AggregationOption, AggregationTemporality, AggregationType, InstrumentType, diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/browser/OTLPMetricExporter.ts index 962f84c510f..ec9e7a2000b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/browser/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/browser/OTLPMetricExporter.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; +import type { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; import { OTLPMetricExporterBase } from '@opentelemetry/exporter-metrics-otlp-http'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/node/OTLPMetricExporter.ts index a1bac84e3f6..992e98df78a 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/node/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/node/OTLPMetricExporter.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; +import type { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; import { OTLPMetricExporterBase } from '@opentelemetry/exporter-metrics-otlp-http'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; import { ProtobufMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { convertLegacyHttpOptions, diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts index b23f3b092d4..1436b129524 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts @@ -10,8 +10,9 @@ import { AggregationType, MetricReader, } from '@opentelemetry/sdk-metrics'; -import { createServer, IncomingMessage, Server, ServerResponse } from 'http'; -import { ExporterConfig } from './export/types'; +import type { IncomingMessage, Server, ServerResponse } from 'http'; +import { createServer } from 'http'; +import type { ExporterConfig } from './export/types'; import { PrometheusSerializer } from './PrometheusSerializer'; /** Node.js v8.x compat */ import { URL } from 'url'; diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts index 1fd433d4227..763ebfc7e09 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts @@ -3,20 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { diag, Attributes, AttributeValue } from '@opentelemetry/api'; -import { +import type { Attributes, AttributeValue } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; +import type { ResourceMetrics, - DataPointType, ScopeMetrics, MetricData, DataPoint, Histogram, } from '@opentelemetry/sdk-metrics'; -import { - InstrumentationScope, - hrTimeToMilliseconds, -} from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +import { DataPointType } from '@opentelemetry/sdk-metrics'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import { hrTimeToMilliseconds } from '@opentelemetry/core'; +import type { Resource } from '@opentelemetry/resources'; import { ATTR_OTEL_SCOPE_NAME, ATTR_OTEL_SCOPE_VERSION, diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts index 59c13c090ac..bcb33bc124d 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { MetricProducer } from '@opentelemetry/sdk-metrics'; +import type { MetricProducer } from '@opentelemetry/sdk-metrics'; /** * Configuration interface for prometheus exporter diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts index 4705e845e00..f413710505e 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Counter, Meter, ObservableResult } from '@opentelemetry/api'; +import type { Counter, Meter, ObservableResult } from '@opentelemetry/api'; import { MeterProvider } from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; @@ -17,7 +17,7 @@ import { serviceName, mockedHrTimeMs, } from './util'; -import { SinonStubbedInstance } from 'sinon'; +import type { SinonStubbedInstance } from 'sinon'; const infoLine = `target_info{service_name="${serviceName}",telemetry_sdk_language="${sdkLanguage}",telemetry_sdk_name="${sdkName}",telemetry_sdk_version="${sdkVersion}"} 1`; diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts index 8f4027a3d64..e2fd8d222f3 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts @@ -4,12 +4,11 @@ */ import * as assert from 'assert'; -import { Attributes, UpDownCounter } from '@opentelemetry/api'; +import type { Attributes, UpDownCounter } from '@opentelemetry/api'; +import type { DataPoint, Histogram } from '@opentelemetry/sdk-metrics'; import { AggregationTemporality, - DataPoint, DataPointType, - Histogram, MeterProvider, MetricReader, } from '@opentelemetry/sdk-metrics'; diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index 9939dac186d..3285eccc9fb 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -11,12 +11,12 @@ import { trace, } from '@opentelemetry/api'; import type { Attributes, HrTime, Span } from '@opentelemetry/api'; +import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { SemconvStability, semconvStabilityFromStr, isWrapped, InstrumentationBase, - InstrumentationConfig, safeExecuteInTheMiddle, } from '@opentelemetry/instrumentation'; import * as core from '@opentelemetry/core'; @@ -41,7 +41,7 @@ import { ATTR_SERVER_PORT, ATTR_URL_FULL, } from '@opentelemetry/semantic-conventions'; -import { FetchError, FetchResponse, SpanData } from './types'; +import type { FetchError, FetchResponse, SpanData } from './types'; import { getFetchBodyLength, normalizeHttpRequestMethod, diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts index bcfdda6254c..b8e80feae7b 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts @@ -8,7 +8,7 @@ import { diag } from '@opentelemetry/api'; import { getStringListFromEnv } from '@opentelemetry/core'; -import { URLLike } from '@opentelemetry/sdk-trace-web'; +import type { URLLike } from '@opentelemetry/sdk-trace-web'; const DIAG_LOGGER = diag.createComponentLogger({ namespace: '@opentelemetry/opentelemetry-instrumentation-fetch/utils', diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts index c8a07122441..cf9bd75aa4e 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts @@ -26,11 +26,11 @@ import { } from '@opentelemetry/sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { +import type { FetchCustomAttributeFunction, - FetchInstrumentation, FetchInstrumentationConfig, } from '../src'; +import { FetchInstrumentation } from '../src'; import { AttributeNames } from '../src/enums/AttributeNames'; import { ATTR_HTTP_HOST, diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts index b8c2d5bbb76..e87e00f9f9e 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts @@ -30,14 +30,13 @@ import type { } from './internal-types'; import { type GrpcInstrumentationConfig } from './types'; +import type { SpanOptions, Span } from '@opentelemetry/api'; import { context, propagation, ROOT_CONTEXT, - SpanOptions, SpanKind, trace, - Span, type Attributes, } from '@opentelemetry/api'; import { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts index 1130e12576f..ee767bcc3a2 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentationConfig } from '@opentelemetry/instrumentation'; +import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; export type IgnoreMatcher = string | RegExp | ((str: string) => boolean); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts index 37d195ed15a..51779f04f46 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts @@ -19,21 +19,15 @@ import { import * as protoLoader from '@grpc/proto-loader'; import * as path from 'path'; import * as assert from 'assert'; -import { - context, - ContextManager, - propagation, - SpanKind, - trace, -} from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; +import { context, propagation, SpanKind, trace } from '@opentelemetry/api'; import { W3CTraceContextPropagator } from '@opentelemetry/core'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { startServer } from './helper'; +import type { SpanAssertionFunction, TestFunction } from './protobuf-ts-utils'; import { assertExportedSpans, assertNoSpansExported, - SpanAssertionFunction, - TestFunction, } from './protobuf-ts-utils'; const memoryExporter = new InMemorySpanExporter(); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index a9ecacfd377..70200ba2395 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -3,34 +3,31 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Attributes, - context, - propagation, - SpanKind, - trace, -} from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; +import { context, propagation, SpanKind, trace } from '@opentelemetry/api'; import { W3CTraceContextPropagator } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { ContextManager } from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { InMemorySpanExporter, - ReadableSpan, SimpleSpanProcessor, } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import * as protoLoader from '@grpc/proto-loader'; -import { - status as GrpcStatus, +import type { ServerUnaryCall, requestCallback, ServerReadableStream, ServerDuplexStream, ServerWritableStream, Client, - Metadata, ServiceError, +} from '@grpc/grpc-js'; +import { + status as GrpcStatus, + Metadata, Server, credentials, loadPackageDefinition, diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts index e7689e4d5f3..d60e8058b2f 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts @@ -2,10 +2,11 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Span, SpanKind } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; +import { SpanKind } from '@opentelemetry/api'; import * as assert from 'assert'; -import { +import type { InMemorySpanExporter, ReadableSpan, } from '@opentelemetry/sdk-trace-base'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts index daf279f9c98..3c240296b83 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts @@ -6,7 +6,7 @@ import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; import * as assert from 'assert'; import type { status as GrpcStatus } from '@grpc/grpc-js'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { hrTimeToMilliseconds, hrTimeToMicroseconds, diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index b615f4ab3b6..c650734d15b 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -3,36 +3,38 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { + HrTime, + Span, + SpanOptions, + SpanStatus, + Histogram, + Attributes, +} from '@opentelemetry/api'; import { context, - HrTime, INVALID_SPAN_CONTEXT, propagation, ROOT_CONTEXT, - Span, SpanKind, - SpanOptions, - SpanStatus, SpanStatusCode, trace, - Histogram, - Attributes, ValueType, } from '@opentelemetry/api'; +import type { RPCMetadata } from '@opentelemetry/core'; import { hrTime, hrTimeDuration, hrTimeToMilliseconds, suppressTracing, - RPCMetadata, RPCType, setRPCMetadata, } from '@opentelemetry/core'; import type * as http from 'http'; import type * as https from 'https'; -import { Socket } from 'net'; +import type { Socket } from 'net'; import * as url from 'url'; -import { HttpInstrumentationConfig } from './types'; +import type { HttpInstrumentationConfig } from './types'; import { VERSION } from './version'; import { InstrumentationBase, @@ -72,7 +74,7 @@ import { parseResponseStatus, setSpanWithError, } from './utils'; -import { Err, Func, Http, HttpRequestArgs, Https } from './internal-types'; +import type { Err, Func, Http, HttpRequestArgs, Https } from './internal-types'; /** * `node:http` and `node:https` instrumentation for OpenTelemetry diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/internal-types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/internal-types.ts index 7d77ff0ed3a..4534b0d25ea 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/internal-types.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/internal-types.ts @@ -5,8 +5,8 @@ import type * as http from 'http'; import type * as https from 'https'; -import { get, IncomingMessage, request } from 'http'; -import * as url from 'url'; +import type { get, IncomingMessage, request } from 'http'; +import type * as url from 'url'; export type IgnoreMatcher = string | RegExp | ((url: string) => boolean); export type HttpCallback = (res: IncomingMessage) => void; diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts index 2235854cd59..63f0119aae6 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts @@ -2,14 +2,14 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Span, Attributes } from '@opentelemetry/api'; -import { +import type { Span, Attributes } from '@opentelemetry/api'; +import type { ClientRequest, IncomingMessage, ServerResponse, RequestOptions, } from 'http'; -import { InstrumentationConfig } from '@opentelemetry/instrumentation'; +import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; export interface HttpCustomAttributeFunction { ( diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts index 7fcaa1d0016..411d19b2d00 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts @@ -2,15 +2,13 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Attributes, - SpanStatusCode, Span, - context, - SpanKind, DiagLogger, AttributeValue, } from '@opentelemetry/api'; +import { SpanStatusCode, context, SpanKind } from '@opentelemetry/api'; import { ATTR_CLIENT_ADDRESS, ATTR_ERROR_TYPE, @@ -57,7 +55,7 @@ import { USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT, USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST, } from './semconv'; -import { +import type { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeader, @@ -69,7 +67,11 @@ import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import { SemconvStability } from '@opentelemetry/instrumentation'; import * as url from 'url'; import { AttributeNames } from './enums/AttributeNames'; -import { Err, IgnoreMatcher, ParsedRequestOptions } from './internal-types'; +import type { + Err, + IgnoreMatcher, + ParsedRequestOptions, +} from './internal-types'; import { SYNTHETIC_BOT_NAMES, SYNTHETIC_TEST_NAMES } from './internal-types'; import { DEFAULT_QUERY_STRINGS_TO_REDACT, diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts index 9fdd9cc8f70..8d2344b5f7a 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; import { HttpInstrumentation } from '../../src/http'; -import { AddressInfo } from 'net'; +import type { AddressInfo } from 'net'; import * as nock from 'nock'; import * as sinon from 'sinon'; import { httpRequest } from '../utils/httpRequest'; @@ -15,11 +15,8 @@ instrumentation.enable(); instrumentation.disable(); import * as http from 'http'; -import { - trace, - TracerProvider, - INVALID_SPAN_CONTEXT, -} from '@opentelemetry/api'; +import type { TracerProvider } from '@opentelemetry/api'; +import { trace, INVALID_SPAN_CONTEXT } from '@opentelemetry/api'; describe('HttpInstrumentation', () => { let server: http.Server; 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 ab28c3dee4f..75fe29c275c 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 @@ -2,15 +2,14 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ +import type { Span as ISpan, Attributes } from '@opentelemetry/api'; import { SpanStatusCode, context, diag, propagation, - Span as ISpan, SpanKind, trace, - Attributes, DiagConsoleLogger, INVALID_SPAN_CONTEXT, } from '@opentelemetry/api'; @@ -57,11 +56,11 @@ import * as assert from 'assert'; import * as nock from 'nock'; import * as path from 'path'; import { HttpInstrumentation } from '../../src/http'; -import { HttpInstrumentationConfig } from '../../src/types'; +import type { HttpInstrumentationConfig } from '../../src/types'; import { assertSpan } from '../utils/assertSpan'; import { DummyPropagation } from '../utils/DummyPropagation'; import { httpRequest } from '../utils/httpRequest'; -import { ContextManager } from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import type { ClientRequest, diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts index a901221bc1b..fc32d814a0b 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts @@ -33,7 +33,8 @@ import * as assert from 'assert'; import { HttpInstrumentation } from '../../src/http'; import { httpRequest } from '../utils/httpRequest'; import { TestMetricReader } from '../utils/TestMetricReader'; -import { context, ContextManager } from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; +import { context } from '@opentelemetry/api'; import { SemconvStability } from '@opentelemetry/instrumentation'; const instrumentation = new HttpInstrumentation(); 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 89cedebc421..dd0dc23b338 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 @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { context, SpanKind, Span, propagation } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; +import { context, SpanKind, propagation } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { @@ -20,7 +21,7 @@ const instrumentation = new HttpInstrumentation(); instrumentation.enable(); instrumentation.disable(); -import * as http from 'http'; +import type * as http from 'http'; import * as superagent from 'superagent'; import * as nock from 'nock'; import * as axios from 'axios'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-sampler.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-sampler.test.ts index 7a320ce73a3..b5e861817eb 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-sampler.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-sampler.test.ts @@ -3,20 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Attributes, Context, ContextManager, Link, SpanKind, - context, } from '@opentelemetry/api'; +import { context } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; +import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base'; import { InMemorySpanExporter, - Sampler, SamplingDecision, - SamplingResult, SimpleSpanProcessor, } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts index d896274e85a..67f199b4fa2 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts @@ -17,11 +17,8 @@ instrumentation.disable(); import * as https from 'https'; import { httpsRequest } from '../utils/httpsRequest'; -import { - INVALID_SPAN_CONTEXT, - trace, - TracerProvider, -} from '@opentelemetry/api'; +import type { TracerProvider } from '@opentelemetry/api'; +import { INVALID_SPAN_CONTEXT, trace } from '@opentelemetry/api'; describe('HttpsInstrumentation', () => { let server: https.Server; 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 45682a5f62f..89c2fee1d71 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 @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { Span as ISpan } from '@opentelemetry/api'; import { SpanStatusCode, context, propagation, - Span as ISpan, SpanKind, trace, } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { ContextManager } from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; import { BasicTracerProvider, InMemorySpanExporter, 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 dd23284a333..7df39965a39 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 @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { context, SpanKind, propagation, Span } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; +import { context, SpanKind, propagation } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { @@ -20,7 +21,7 @@ const instrumentation = new HttpInstrumentation(); instrumentation.enable(); instrumentation.disable(); -import * as http from 'http'; +import type * as http from 'http'; import * as superagent from 'superagent'; import * as nock from 'nock'; import * as axios from 'axios'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts index d45f42c4170..60bc27aac00 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts @@ -2,21 +2,15 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { - Attributes, - SpanStatusCode, - SpanKind, - context, - Span, - diag, -} from '@opentelemetry/api'; +import type { Attributes, Span } from '@opentelemetry/api'; +import { SpanStatusCode, SpanKind, context, diag } from '@opentelemetry/api'; import { ATTR_HTTP_ROUTE, ATTR_USER_AGENT_ORIGINAL, } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; -import { IncomingMessage, ServerResponse } from 'http'; -import { Socket } from 'net'; +import type { IncomingMessage, ServerResponse } from 'http'; +import type { Socket } from 'net'; import * as sinon from 'sinon'; import * as url from 'url'; import { @@ -28,14 +22,17 @@ import { ATTR_USER_AGENT_SYNTHETIC_TYPE, USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT, } from '../../src/semconv'; -import { IgnoreMatcher, ParsedRequestOptions } from '../../src/internal-types'; +import type { + IgnoreMatcher, + ParsedRequestOptions, +} from '../../src/internal-types'; import * as utils from '../../src/utils'; import { RPCType, setRPCMetadata } from '@opentelemetry/core'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { SemconvStability } from '@opentelemetry/instrumentation'; import { extractHostnameAndPort } from '../../src/utils'; import { AttributeNames } from '../../src/enums/AttributeNames'; -import { ParsedUrlQuery } from 'node:querystring'; +import type { ParsedUrlQuery } from 'node:querystring'; describe('Utility', () => { describe('parseResponseStatus()', () => { diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts index 720f97f69bc..565c5a215b1 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanKind, Span, context, propagation } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; +import { SpanKind, context, propagation } from '@opentelemetry/api'; import { ATTR_HTTP_FLAVOR, ATTR_HTTP_HOST, @@ -30,7 +31,7 @@ instrumentation.disable(); import * as http from 'http'; import { httpRequest } from '../utils/httpRequest'; import { DummyPropagation } from '../utils/DummyPropagation'; -import { Socket } from 'net'; +import type { Socket } from 'net'; import { sendRequestTwice } from '../utils/rawRequest'; const protocol = 'http'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts index 485b1d0a5dd..9067f3da2a2 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanKind, Span, context, propagation } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; +import { SpanKind, context, propagation } from '@opentelemetry/api'; import { HTTP_FLAVOR_VALUE_HTTP_1_1, NET_TRANSPORT_VALUE_IP_TCP, @@ -11,10 +12,10 @@ import { ATTR_NET_TRANSPORT, } from '../../src/semconv'; import * as assert from 'assert'; -import * as http from 'http'; +import type * as http from 'http'; import * as fs from 'fs'; import * as path from 'path'; -import { Socket } from 'net'; +import type { Socket } from 'net'; import { assertSpan } from '../utils/assertSpan'; import { urlToHttpOptions } from 'url'; import * as utils from '../utils/utils'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts index 61cc536348a..9ef79cb74f4 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts @@ -2,12 +2,8 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { - Context, - TextMapPropagator, - trace, - TraceFlags, -} from '@opentelemetry/api'; +import type { Context, TextMapPropagator } from '@opentelemetry/api'; +import { trace, TraceFlags } from '@opentelemetry/api'; import type * as http from 'http'; export class DummyPropagation implements TextMapPropagator { diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/TestMetricReader.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/TestMetricReader.ts index 9353656f00d..525382b70c8 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/TestMetricReader.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/TestMetricReader.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { MetricReader, PushMetricExporter } from '@opentelemetry/sdk-metrics'; +import type { PushMetricExporter } from '@opentelemetry/sdk-metrics'; +import { MetricReader } from '@opentelemetry/sdk-metrics'; export class TestMetricReader extends MetricReader { private _exporter: PushMetricExporter; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts index 99ec3b982eb..7b43b04ac23 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts @@ -2,14 +2,10 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { - isValidSpanId, - SpanKind, - SpanStatus, - Exception, -} from '@opentelemetry/api'; +import type { SpanStatus, Exception } from '@opentelemetry/api'; +import { isValidSpanId, SpanKind } from '@opentelemetry/api'; import { hrTimeToNanoseconds } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { ATTR_HTTP_METHOD, ATTR_HTTP_REQUEST_CONTENT_LENGTH, @@ -29,7 +25,7 @@ import { ATTR_NET_PEER_PORT, } from '../../src/semconv'; import * as assert from 'assert'; -import * as http from 'http'; +import type * as http from 'http'; import * as utils from '../../src/utils'; import { DummyPropagation } from './DummyPropagation'; import { AttributeNames } from '../../src/enums/AttributeNames'; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts index 70899eed52e..eb22b908be3 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import * as http from 'http'; -import { URL } from 'url'; +import type { URL } from 'url'; type GetResult = Promise<{ data: string; diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts index 3b34218fd78..9a8956027a0 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as http from 'http'; +import type * as http from 'http'; import * as https from 'https'; -import { URL } from 'url'; +import type { URL } from 'url'; process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts index c2625da7254..2446f6ab7be 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as api from '@opentelemetry/api'; +import type * as api from '@opentelemetry/api'; /** * method "open" from XMLHttpRequest diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts index a613376ebb8..56f843b4d58 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts @@ -8,7 +8,7 @@ import * as api from '@opentelemetry/api'; import { getStringListFromEnv } from '@opentelemetry/core'; -import { URLLike } from '@opentelemetry/sdk-trace-web'; +import type { URLLike } from '@opentelemetry/sdk-trace-web'; const DIAG_LOGGER = api.diag.createComponentLogger({ namespace: diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index e1d453fa963..16d82a73100 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -4,12 +4,12 @@ */ import * as api from '@opentelemetry/api'; +import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { SemconvStability, semconvStabilityFromStr, isWrapped, InstrumentationBase, - InstrumentationConfig, safeExecuteInTheMiddle, } from '@opentelemetry/instrumentation'; import { hrTime, isUrlIgnored, otperformance } from '@opentelemetry/core'; @@ -40,7 +40,7 @@ import { ATTR_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, } from './semconv'; import { EventNames } from './enums/EventNames'; -import { +import type { OpenFunction, PropagateTraceHeaderCorsUrls, SendFunction, diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts index acc78f6b0de..4cba432880a 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts @@ -2,9 +2,12 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Span } from '@opentelemetry/api'; +import type { Span } from '@opentelemetry/api'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { ReadableSpan, SpanProcessor } from '@opentelemetry/sdk-trace-base'; +import type { + ReadableSpan, + SpanProcessor, +} from '@opentelemetry/sdk-trace-base'; import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { XMLHttpRequestInstrumentation } from '../src'; import * as assert from 'assert'; diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts index 72c6ea86308..b4b780741be 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts @@ -38,10 +38,8 @@ import { ATTR_HTTP_REQUEST_BODY_SIZE, } from '../src/semconv'; import { EventNames } from '../src/enums/EventNames'; -import { - XMLHttpRequestInstrumentation, - XMLHttpRequestInstrumentationConfig, -} from '../src/xhr'; +import type { XMLHttpRequestInstrumentationConfig } from '../src/xhr'; +import { XMLHttpRequestInstrumentation } from '../src/xhr'; import { AttributeNames } from '../src/enums/AttributeNames'; import { ATTR_ERROR_TYPE, diff --git a/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts index fa122ed22fd..bef6360e520 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts @@ -9,7 +9,7 @@ import { disableInstrumentations, enableInstrumentations, } from './autoLoaderUtils'; -import { AutoLoaderOptions } from './types_internal'; +import type { AutoLoaderOptions } from './types_internal'; /** * It will register instrumentations and plugins diff --git a/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts index f0b613af0f5..072514c9b45 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TracerProvider, MeterProvider } from '@opentelemetry/api'; -import { Instrumentation } from './types'; -import { LoggerProvider } from '@opentelemetry/api-logs'; +import type { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import type { Instrumentation } from './types'; +import type { LoggerProvider } from '@opentelemetry/api-logs'; /** * Enable instrumentations diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts index b9f4bce0e07..92b4ba413f2 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts @@ -3,20 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - diag, +import type { DiagLogger, - metrics, Meter, MeterProvider, - trace, Tracer, TracerProvider, Span, } from '@opentelemetry/api'; -import { Logger, LoggerProvider, logs } from '@opentelemetry/api-logs'; +import { diag, metrics, trace } from '@opentelemetry/api'; +import type { Logger, LoggerProvider } from '@opentelemetry/api-logs'; +import { logs } from '@opentelemetry/api-logs'; import * as shimmer from './shimmer'; -import { +import type { InstrumentationModuleDefinition, Instrumentation, InstrumentationConfig, diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts index 714b95fcd47..b0bfec7e2f6 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { InstrumentationModuleDefinition, InstrumentationModuleFile, } from './types'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts index 70ecb50fd60..7dd57ca7d27 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentationModuleFile } from './types'; +import type { InstrumentationModuleFile } from './types'; import { normalize } from './platform/index'; export class InstrumentationNodeModuleFile diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts index 40d3600ebbd..2db5d272706 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts @@ -4,8 +4,8 @@ */ import { InstrumentationAbstract } from '../../instrumentation'; -import * as types from '../../types'; -import { InstrumentationConfig } from '../../types'; +import type * as types from '../../types'; +import type { InstrumentationConfig } from '../../types'; /** * Base abstract class for instrumenting web plugins diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts index 74669366eff..352caea916d 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts @@ -3,19 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as types from '../../types'; +import type * as types from '../../types'; import * as path from 'path'; import { types as utilTypes } from 'util'; import { satisfies } from '../../semver'; -import { wrap, unwrap, massWrap, massUnwrap } from '../../shimmer'; +import type { massWrap, massUnwrap } from '../../shimmer'; +import { wrap, unwrap } from '../../shimmer'; import { InstrumentationAbstract } from '../../instrumentation'; -import { - RequireInTheMiddleSingleton, - Hooked, -} from './RequireInTheMiddleSingleton'; +import type { Hooked } from './RequireInTheMiddleSingleton'; +import { RequireInTheMiddleSingleton } from './RequireInTheMiddleSingleton'; import type { HookFn } from 'import-in-the-middle'; import { Hook as HookImport } from 'import-in-the-middle'; -import { +import type { InstrumentationConfig, InstrumentationModuleDefinition, } from '../../types'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/shimmer.ts b/experimental/packages/opentelemetry-instrumentation/src/shimmer.ts index ced18f1d843..da672399387 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/shimmer.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/shimmer.ts @@ -36,7 +36,7 @@ * - aligned with style-guide */ -import { ShimWrapped } from './types'; +import type { ShimWrapped } from './types'; // Default to complaining loudly when things don't go according to plan. // eslint-disable-next-line no-console diff --git a/experimental/packages/opentelemetry-instrumentation/src/types.ts b/experimental/packages/opentelemetry-instrumentation/src/types.ts index e21daad9b98..045dc2a4923 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/types.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TracerProvider, MeterProvider, Span } from '@opentelemetry/api'; -import { LoggerProvider } from '@opentelemetry/api-logs'; +import type { TracerProvider, MeterProvider, Span } from '@opentelemetry/api'; +import type { LoggerProvider } from '@opentelemetry/api-logs'; /** Interface Instrumentation to apply patch. */ export interface Instrumentation< diff --git a/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts b/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts index f88d4d2aeac..f3e5c662594 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TracerProvider, MeterProvider } from '@opentelemetry/api'; -import { Instrumentation } from './types'; -import { LoggerProvider } from '@opentelemetry/api-logs'; +import type { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import type { Instrumentation } from './types'; +import type { LoggerProvider } from '@opentelemetry/api-logs'; export interface AutoLoaderResult { instrumentations: Instrumentation[]; diff --git a/experimental/packages/opentelemetry-instrumentation/src/utils.ts b/experimental/packages/opentelemetry-instrumentation/src/utils.ts index 196d535145e..fec4816bc29 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/utils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ShimWrapped } from './types'; +import type { ShimWrapped } from './types'; /** * function to execute patched function and being able to catch errors diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts index 9682e4ef80a..9e6d74f915d 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts @@ -4,13 +4,13 @@ */ import * as assert from 'assert'; -import { +import type { Instrumentation, - InstrumentationBase, InstrumentationConfig, InstrumentationModuleDefinition, SpanCustomizationHook, } from '../../src'; +import { InstrumentationBase } from '../../src'; import { MeterProvider } from '@opentelemetry/sdk-metrics'; import { LoggerProvider } from '@opentelemetry/sdk-logs'; diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts index 3f3019f9312..508ebe8e6a7 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Tracer, TracerProvider, Meter, @@ -13,7 +13,11 @@ import { import * as assert from 'assert'; import * as sinon from 'sinon'; import { InstrumentationBase, registerInstrumentations } from '../../src'; -import { Logger, LoggerOptions, LoggerProvider } from '@opentelemetry/api-logs'; +import type { + Logger, + LoggerOptions, + LoggerProvider, +} from '@opentelemetry/api-logs'; class DummyTracerProvider implements TracerProvider { getTracer(name: string, version?: string): Tracer { diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/semver.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/semver.test.ts index d103f82d034..ac2b88cb23c 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/semver.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/semver.test.ts @@ -27,7 +27,8 @@ import * as assert from 'assert'; -import { satisfies, SatisfiesOptions } from '../../src/semver'; +import type { SatisfiesOptions } from '../../src/semver'; +import { satisfies } from '../../src/semver'; const rangeInclude = require('./third-party/node-semver/range-include.js'); const rangeExclude = require('./third-party/node-semver/range-exclude.js'); diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/shimmer.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/shimmer.test.ts index 4194d412ae5..bc4f4ed826a 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/shimmer.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/shimmer.test.ts @@ -40,7 +40,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import shimmer from '../../src/shimmer'; -import { ShimWrapped } from '../../src'; +import type { ShimWrapped } from '../../src'; describe('Shimmer', function () { describe('init', function () { diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts index 1b54e0b5677..616c078f36c 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts @@ -7,9 +7,9 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import * as path from 'path'; import { InstrumentationBase } from '../../src'; +import type { InstrumentationModuleDefinition } from '../../src/'; import { InstrumentationNodeModuleDefinition, - InstrumentationModuleDefinition, InstrumentationNodeModuleFile, } from '../../src/'; diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts index 82e1ce5c736..525b5d31eae 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; -import { Hooked } from '../../src/platform/node/RequireInTheMiddleSingleton'; +import type { Hooked } from '../../src/platform/node/RequireInTheMiddleSingleton'; import { ModuleNameTrie } from '../../src/platform/node/ModuleNameTrie'; describe('ModuleNameTrie', function () { diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts index 00fd47e005d..1d77f914a7f 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts @@ -5,9 +5,9 @@ import * as assert from 'assert'; +import type { InstrumentationConfig } from '../../src'; import { InstrumentationBase, - InstrumentationConfig, InstrumentationNodeModuleDefinition, InstrumentationNodeModuleFile, } from '../../src'; diff --git a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts index 44300054328..d58fe5be5f6 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts @@ -5,49 +5,46 @@ import { metrics, trace, diag, DiagConsoleLogger } from '@opentelemetry/api'; import { logs } from '@opentelemetry/api-logs'; -import { - Instrumentation, - registerInstrumentations, -} from '@opentelemetry/instrumentation'; +import type { Instrumentation } from '@opentelemetry/instrumentation'; +import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import type { + Resource, + ResourceDetectionConfig, + ResourceDetector, +} from '@opentelemetry/resources'; import { defaultResource, detectResources, envDetector, hostDetector, - Resource, processDetector, - ResourceDetectionConfig, - ResourceDetector, resourceFromAttributes, } from '@opentelemetry/resources'; -import { +import type { LogRecordProcessor, + LogRecordExporter, +} from '@opentelemetry/sdk-logs'; +import { LoggerProvider, ConsoleLogRecordExporter, - LogRecordExporter, SimpleLogRecordProcessor, } from '@opentelemetry/sdk-logs'; import { OTLPLogExporter as OTLPHttpLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; import { OTLPLogExporter as OTLPGrpcLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc'; import { OTLPLogExporter as OTLPProtoLogExporter } from '@opentelemetry/exporter-logs-otlp-proto'; import { PrometheusExporter as PrometheusMetricExporter } from '@opentelemetry/exporter-prometheus'; +import type { IMetricReader, ViewOptions } from '@opentelemetry/sdk-metrics'; import { MeterProvider, - IMetricReader, - ViewOptions, ConsoleMetricExporter, PeriodicExportingMetricReader, } from '@opentelemetry/sdk-metrics'; -import { - BatchSpanProcessor, - SpanProcessor, -} from '@opentelemetry/sdk-trace-base'; -import { - NodeTracerConfig, - NodeTracerProvider, -} from '@opentelemetry/sdk-trace-node'; +import type { SpanProcessor } from '@opentelemetry/sdk-trace-base'; +import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'; +import type { NodeTracerConfig } from '@opentelemetry/sdk-trace-node'; +import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; -import { NodeSDKConfiguration } from './types'; +import type { NodeSDKConfiguration } from './types'; import { getBooleanFromEnv, getStringFromEnv, diff --git a/experimental/packages/opentelemetry-sdk-node/src/start.ts b/experimental/packages/opentelemetry-sdk-node/src/start.ts index 28706f6e128..e49db71f07a 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/start.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/start.ts @@ -2,11 +2,11 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { ConfigFactory, ConfigurationModel, - createConfigFactory, } from '@opentelemetry/configuration'; +import { createConfigFactory } from '@opentelemetry/configuration'; import { context, diag, @@ -24,12 +24,14 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation'; import type { SDKComponents, SDKOptions } from './types'; import { LoggerProvider } from '@opentelemetry/sdk-logs'; import { logs } from '@opentelemetry/api-logs'; -import { - defaultResource, - detectResources, +import type { Resource, ResourceDetectionConfig, ResourceDetector, +} from '@opentelemetry/resources'; +import { + defaultResource, + detectResources, resourceFromAttributes, } from '@opentelemetry/resources'; import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'; diff --git a/experimental/packages/opentelemetry-sdk-node/src/types.ts b/experimental/packages/opentelemetry-sdk-node/src/types.ts index 84f6f186240..9a6973c2d45 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/types.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/types.ts @@ -4,12 +4,15 @@ */ import type { ContextManager } from '@opentelemetry/api'; -import { TextMapPropagator } from '@opentelemetry/api'; -import { Instrumentation } from '@opentelemetry/instrumentation'; -import { Resource, ResourceDetector } from '@opentelemetry/resources'; -import { LoggerProvider, LogRecordProcessor } from '@opentelemetry/sdk-logs'; -import { IMetricReader, ViewOptions } from '@opentelemetry/sdk-metrics'; -import { +import type { TextMapPropagator } from '@opentelemetry/api'; +import type { Instrumentation } from '@opentelemetry/instrumentation'; +import type { Resource, ResourceDetector } from '@opentelemetry/resources'; +import type { + LoggerProvider, + LogRecordProcessor, +} from '@opentelemetry/sdk-logs'; +import type { IMetricReader, ViewOptions } from '@opentelemetry/sdk-metrics'; +import type { Sampler, SpanExporter, SpanLimits, diff --git a/experimental/packages/opentelemetry-sdk-node/src/utils.ts b/experimental/packages/opentelemetry-sdk-node/src/utils.ts index 80f182a7246..12852aa25e6 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/utils.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/utils.ts @@ -3,13 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - context, - ContextManager, - diag, - propagation, - TextMapPropagator, -} from '@opentelemetry/api'; +import type { ContextManager, TextMapPropagator } from '@opentelemetry/api'; +import { context, diag, propagation } from '@opentelemetry/api'; import { CompositePropagator, getNumberFromEnv, @@ -22,23 +17,27 @@ import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/expo import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; import { OTLPTraceExporter as OTLPGrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; -import { +import type { DetectedResourceAttributes, + Resource, + ResourceDetector, +} from '@opentelemetry/resources'; +import { envDetector, hostDetector, osDetector, processDetector, - Resource, - ResourceDetector, resourceFromAttributes, serviceInstanceIdDetector, } from '@opentelemetry/resources'; +import type { + SpanExporter, + SpanProcessor, +} from '@opentelemetry/sdk-trace-base'; import { BatchSpanProcessor, ConsoleSpanExporter, SimpleSpanProcessor, - SpanExporter, - SpanProcessor, } from '@opentelemetry/sdk-trace-base'; import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3'; import { JaegerPropagator } from '@opentelemetry/propagator-jaeger'; @@ -47,25 +46,27 @@ import { OTLPLogExporter as OTLPHttpLogExporter } from '@opentelemetry/exporter- import { OTLPLogExporter as OTLPGrpcLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc'; import { OTLPLogExporter as OTLPProtoLogExporter } from '@opentelemetry/exporter-logs-otlp-proto'; import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; -import { +import type { ConfigurationModel, LogRecordExporterModel, } from '@opentelemetry/configuration'; -import { +import type { IMetricReader, - PeriodicExportingMetricReader, PushMetricExporter, } from '@opentelemetry/sdk-metrics'; +import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; import { OTLPMetricExporter as OTLPGrpcMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc'; import { OTLPMetricExporter as OTLPHttpMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; import { OTLPMetricExporter as OTLPProtoMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto'; -import { - BatchLogRecordProcessor, +import type { BufferConfig, - ConsoleLogRecordExporter, LogRecordExporter, LoggerProviderConfig, LogRecordProcessor, +} from '@opentelemetry/sdk-logs'; +import { + BatchLogRecordProcessor, + ConsoleLogRecordExporter, SimpleLogRecordProcessor, } from '@opentelemetry/sdk-logs'; diff --git a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts index 6e9d9b4cea6..260501f0ab0 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts @@ -34,24 +34,23 @@ import { assertServiceInstanceIdIsUUID, assertServiceResource, } from './util/resource-assertions'; +import type { IdGenerator, SpanProcessor } from '@opentelemetry/sdk-trace-base'; import { ConsoleSpanExporter, SimpleSpanProcessor, BatchSpanProcessor, NoopSpanProcessor, - IdGenerator, AlwaysOffSampler, - SpanProcessor, } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import * as Sinon from 'sinon'; import { NodeSDK } from '../src'; +import type { DetectedResource } from '@opentelemetry/resources'; import { envDetector, processDetector, hostDetector, serviceInstanceIdDetector, - DetectedResource, defaultResource, } from '@opentelemetry/resources'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; diff --git a/experimental/packages/opentelemetry-sdk-node/test/start.test.ts b/experimental/packages/opentelemetry-sdk-node/test/start.test.ts index c0988fd97f2..6fb92f72cbe 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/start.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/start.test.ts @@ -21,12 +21,12 @@ import { assertServiceInstanceIdIsUUID, assertServiceResource, } from './util/resource-assertions'; +import type { DetectedResource } from '@opentelemetry/resources'; import { envDetector, processDetector, hostDetector, serviceInstanceIdDetector, - DetectedResource, } from '@opentelemetry/resources'; import { logs } from '@opentelemetry/api-logs'; import { @@ -34,11 +34,11 @@ import { ConsoleLogRecordExporter, BatchLogRecordProcessor, } from '@opentelemetry/sdk-logs'; -import { +import type { ConfigFactory, - createConfigFactory, LogRecordExporterModel, } from '@opentelemetry/configuration'; +import { createConfigFactory } from '@opentelemetry/configuration'; import { OTLPLogExporter as OTLPProtoLogExporter } from '@opentelemetry/exporter-logs-otlp-proto'; import { OTLPLogExporter as OTLPHttpLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; import { OTLPLogExporter as OTLPGrpcLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc'; diff --git a/experimental/packages/opentelemetry-sdk-node/test/util/resource-assertions.ts b/experimental/packages/opentelemetry-sdk-node/test/util/resource-assertions.ts index 4c8865e5973..6f9e9e47d32 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/util/resource-assertions.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/util/resource-assertions.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; -import { Resource } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, diff --git a/experimental/packages/opentelemetry-sdk-node/test/utils.test.ts b/experimental/packages/opentelemetry-sdk-node/test/utils.test.ts index dbe0a913828..cd68f0bc50d 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/utils.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/utils.test.ts @@ -13,8 +13,8 @@ import { import * as assert from 'assert'; import * as sinon from 'sinon'; import { diag } from '@opentelemetry/api'; -import { ConfigurationModel } from '@opentelemetry/configuration'; -import { LoggerProviderConfig } from '@opentelemetry/sdk-logs'; +import type { ConfigurationModel } from '@opentelemetry/configuration'; +import type { LoggerProviderConfig } from '@opentelemetry/sdk-logs'; describe('getPropagatorFromEnv', function () { afterEach(() => { diff --git a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts index 11ef50e2d1a..082360c02d2 100644 --- a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts +++ b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; -import { IOtlpExportDelegate } from './otlp-export-delegate'; +import type { ExportResult } from '@opentelemetry/core'; +import type { IOtlpExportDelegate } from './otlp-export-delegate'; export class OTLPExporterBase { private _delegate: IOtlpExportDelegate; diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts index 0f3751ea50d..d17c5b6a443 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts @@ -2,12 +2,12 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ +import type { OtlpHttpConfiguration } from './otlp-http-configuration'; import { getHttpConfigurationDefaults, mergeOtlpHttpConfigurationWithDefaults, - OtlpHttpConfiguration, } from './otlp-http-configuration'; -import { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; +import type { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; import { convertLegacyHeaders } from './convert-legacy-http-options'; /** diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-http-options.ts index bf3b4b7827d..189224e66dd 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-http-options.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-http-options.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPExporterConfigBase } from './legacy-base-configuration'; +import type { OTLPExporterConfigBase } from './legacy-base-configuration'; import { wrapStaticHeadersInFunction } from './shared-configuration'; -import { HeadersFactory } from './otlp-http-configuration'; +import type { HeadersFactory } from './otlp-http-configuration'; export function convertLegacyHeaders( config: OTLPExporterConfigBase diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts index 6f55ac679e4..e205e9660cf 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts @@ -2,13 +2,15 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; +import type { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; import { diag } from '@opentelemetry/api'; +import type { + HttpAgentFactory, + OtlpNodeHttpConfiguration, +} from './otlp-node-http-configuration'; import { getNodeHttpConfigurationDefaults, - HttpAgentFactory, mergeOtlpNodeHttpConfigurationWithDefaults, - OtlpNodeHttpConfiguration, } from './otlp-node-http-configuration'; import { httpAgentFactoryFromOptions } from '../index-node-http'; import { getNodeHttpConfigurationFromEnvironment } from './otlp-node-http-env-configuration'; diff --git a/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts b/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts index f9a05e67a2a..69ee0940011 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts @@ -2,11 +2,11 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; import { createOtlpFetchExportDelegate } from '../otlp-browser-http-export-delegate'; import { convertLegacyBrowserHttpOptions } from './convert-legacy-browser-http-options'; -import { IOtlpExportDelegate } from '../otlp-export-delegate'; -import { OTLPExporterConfigBase } from './legacy-base-configuration'; +import type { IOtlpExportDelegate } from '../otlp-export-delegate'; +import type { OTLPExporterConfigBase } from './legacy-base-configuration'; /** * @deprecated diff --git a/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts index bb175badac4..65eab904173 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { HeadersFactory } from './otlp-http-configuration'; +import type { HeadersFactory } from './otlp-http-configuration'; export interface OTLPExporterConfigBase { /** diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts index 0cb65a6d839..5e72c4d856b 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { OtlpSharedConfiguration } from './shared-configuration'; import { getSharedConfigurationDefaults, mergeOtlpSharedConfigurationWithDefaults, - OtlpSharedConfiguration, } from './shared-configuration'; import { validateAndNormalizeHeaders } from '../util'; diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts index b9095547aae..922b18f9dc0 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-configuration.ts @@ -2,10 +2,10 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ +import type { OtlpHttpConfiguration } from './otlp-http-configuration'; import { getHttpConfigurationDefaults, mergeOtlpHttpConfigurationWithDefaults, - OtlpHttpConfiguration, } from './otlp-http-configuration'; // NOTE: do not change these imports to be actual imports, otherwise they WILL break `@opentelemetry/instrumentation-http` diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-env-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-env-configuration.ts index f27b9ee2384..7dd85bcd0d7 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-env-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-node-http-env-configuration.ts @@ -8,10 +8,8 @@ import { getStringFromEnv, parseKeyPairsIntoRecord } from '@opentelemetry/core'; import { diag } from '@opentelemetry/api'; import { getSharedConfigurationFromEnvironment } from './shared-env-configuration'; import { wrapStaticHeadersInFunction } from './shared-configuration'; -import { - OtlpNodeHttpConfiguration, - httpAgentFactoryFromOptions, -} from './otlp-node-http-configuration'; +import type { OtlpNodeHttpConfiguration } from './otlp-node-http-configuration'; +import { httpAgentFactoryFromOptions } from './otlp-node-http-configuration'; function getStaticHeadersFromEnv( signalIdentifier: string diff --git a/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts index 4e74bb1b5ca..6a4ce499660 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HeadersFactory } from './otlp-http-configuration'; +import type { HeadersFactory } from './otlp-http-configuration'; /** * Configuration shared across all OTLP exporters diff --git a/experimental/packages/otlp-exporter-base/src/configuration/shared-env-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/shared-env-configuration.ts index d745cf2a367..7fa81bc3141 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/shared-env-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/shared-env-configuration.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import { getNumberFromEnv, getStringFromEnv } from '@opentelemetry/core'; -import { OtlpSharedConfiguration } from './shared-configuration'; +import type { OtlpSharedConfiguration } from './shared-configuration'; import { diag } from '@opentelemetry/api'; function parseAndValidateTimeoutFromEnv( diff --git a/experimental/packages/otlp-exporter-base/src/exporter-transport.ts b/experimental/packages/otlp-exporter-base/src/exporter-transport.ts index 2c6668db18f..37d726267a1 100644 --- a/experimental/packages/otlp-exporter-base/src/exporter-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/exporter-transport.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResponse } from './export-response'; +import type { ExportResponse } from './export-response'; export interface IExporterTransport { send(data: Uint8Array, timeoutMillis: number): Promise; diff --git a/experimental/packages/otlp-exporter-base/src/logging-response-handler.ts b/experimental/packages/otlp-exporter-base/src/logging-response-handler.ts index 458423637db..4c6b64d750e 100644 --- a/experimental/packages/otlp-exporter-base/src/logging-response-handler.ts +++ b/experimental/packages/otlp-exporter-base/src/logging-response-handler.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import { diag } from '@opentelemetry/api'; -import { IOtlpResponseHandler } from './response-handler'; +import type { IOtlpResponseHandler } from './response-handler'; function isPartialSuccessResponse( response: unknown diff --git a/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts index 787333927ba..1d2eef0c898 100644 --- a/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts @@ -2,9 +2,9 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { OtlpHttpConfiguration } from './configuration/otlp-http-configuration'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IOtlpExportDelegate } from './otlp-export-delegate'; +import type { OtlpHttpConfiguration } from './configuration/otlp-http-configuration'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { IOtlpExportDelegate } from './otlp-export-delegate'; import { createRetryingTransport } from './retrying-transport'; import { createOtlpNetworkExportDelegate } from './otlp-network-export-delegate'; import { createFetchTransport } from './transport/fetch-transport'; diff --git a/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts index afa55fb2735..c7734e4da55 100644 --- a/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts @@ -3,14 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; -import { IExporterTransport } from './exporter-transport'; -import { IExportPromiseHandler } from './bounded-queue-export-promise-handler'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; +import type { IExporterTransport } from './exporter-transport'; +import type { IExportPromiseHandler } from './bounded-queue-export-promise-handler'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; import { OTLPExporterError } from './types'; -import { IOtlpResponseHandler } from './response-handler'; +import type { IOtlpResponseHandler } from './response-handler'; import { createLoggingPartialSuccessResponseHandler } from './logging-response-handler'; -import { diag, DiagLogger } from '@opentelemetry/api'; +import type { DiagLogger } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; /** * Internally shared export logic for OTLP. diff --git a/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts index f8835f96119..1832a132494 100644 --- a/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts @@ -2,15 +2,13 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { - createOtlpExportDelegate, - IOtlpExportDelegate, -} from './otlp-export-delegate'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { IOtlpExportDelegate } from './otlp-export-delegate'; +import { createOtlpExportDelegate } from './otlp-export-delegate'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; import { createHttpExporterTransport } from './transport/http-exporter-transport'; import { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler'; import { createRetryingTransport } from './retrying-transport'; -import { OtlpNodeHttpConfiguration } from './configuration/otlp-node-http-configuration'; +import type { OtlpNodeHttpConfiguration } from './configuration/otlp-node-http-configuration'; export function createOtlpHttpExportDelegate( options: OtlpNodeHttpConfiguration, diff --git a/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts index 5cd1e7bef23..eea25fe6a98 100644 --- a/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts +++ b/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts @@ -4,13 +4,11 @@ */ import { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler'; -import { OtlpSharedConfiguration } from './configuration/shared-configuration'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IExporterTransport } from './exporter-transport'; -import { - createOtlpExportDelegate, - IOtlpExportDelegate, -} from './otlp-export-delegate'; +import type { OtlpSharedConfiguration } from './configuration/shared-configuration'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { IExporterTransport } from './exporter-transport'; +import type { IOtlpExportDelegate } from './otlp-export-delegate'; +import { createOtlpExportDelegate } from './otlp-export-delegate'; export function createOtlpNetworkExportDelegate( options: OtlpSharedConfiguration, diff --git a/experimental/packages/otlp-exporter-base/src/retrying-transport.ts b/experimental/packages/otlp-exporter-base/src/retrying-transport.ts index 55f469caabe..22f8f71d9f3 100644 --- a/experimental/packages/otlp-exporter-base/src/retrying-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/retrying-transport.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { IExporterTransport } from './exporter-transport'; -import { ExportResponse } from './export-response'; +import type { IExporterTransport } from './exporter-transport'; +import type { ExportResponse } from './export-response'; import { diag } from '@opentelemetry/api'; const MAX_ATTEMPTS = 5; diff --git a/experimental/packages/otlp-exporter-base/src/transport/fetch-transport.ts b/experimental/packages/otlp-exporter-base/src/transport/fetch-transport.ts index dd11726661c..dbfe1a79448 100644 --- a/experimental/packages/otlp-exporter-base/src/transport/fetch-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/fetch-transport.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { IExporterTransport } from '../exporter-transport'; -import { ExportResponse } from '../export-response'; +import type { IExporterTransport } from '../exporter-transport'; +import type { ExportResponse } from '../export-response'; import { diag } from '@opentelemetry/api'; import { isExportHTTPErrorRetryable, parseRetryAfterToMills, } from '../is-export-retryable'; -import { HeadersFactory } from '../configuration/otlp-http-configuration'; +import type { HeadersFactory } from '../configuration/otlp-http-configuration'; /** * Maximum total body size for concurrent keepalive requests. diff --git a/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts b/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts index 9a2694074cd..9952c6e15c3 100644 --- a/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts @@ -7,10 +7,10 @@ // as they'd be imported before the http/https modules can be wrapped. import type * as https from 'https'; import type * as http from 'http'; -import { ExportResponse } from '../export-response'; -import { IExporterTransport } from '../exporter-transport'; +import type { ExportResponse } from '../export-response'; +import type { IExporterTransport } from '../exporter-transport'; import { sendWithHttp } from './http-transport-utils'; -import { NodeHttpRequestParameters } from './node-http-transport-types'; +import type { NodeHttpRequestParameters } from './node-http-transport-types'; interface Utils { agent: http.Agent | https.Agent; diff --git a/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts b/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts index 2abbae2a203..b62833accc5 100644 --- a/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HeadersFactory } from '../configuration/otlp-http-configuration'; +import type { HeadersFactory } from '../configuration/otlp-http-configuration'; export interface HttpRequestParameters { url: string; diff --git a/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts b/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts index 6f5c8729ab1..932ee05c2b2 100644 --- a/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts @@ -6,7 +6,7 @@ import type * as http from 'http'; import type * as https from 'https'; import * as zlib from 'zlib'; import { Readable } from 'stream'; -import { ExportResponse } from '../export-response'; +import type { ExportResponse } from '../export-response'; import { isExportHTTPErrorRetryable, parseRetryAfterToMills, diff --git a/experimental/packages/otlp-exporter-base/src/transport/node-http-transport-types.ts b/experimental/packages/otlp-exporter-base/src/transport/node-http-transport-types.ts index 0cd20ccae29..e4a82fc9c76 100644 --- a/experimental/packages/otlp-exporter-base/src/transport/node-http-transport-types.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/node-http-transport-types.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HttpAgentFactory } from '../configuration/otlp-node-http-configuration'; -import { HttpRequestParameters } from './http-transport-types'; +import type { HttpAgentFactory } from '../configuration/otlp-node-http-configuration'; +import type { HttpRequestParameters } from './http-transport-types'; export interface NodeHttpRequestParameters extends HttpRequestParameters { agentFactory: HttpAgentFactory; diff --git a/experimental/packages/otlp-exporter-base/test/browser/fetch-transport.test.ts b/experimental/packages/otlp-exporter-base/test/browser/fetch-transport.test.ts index 7dbfdf37bd0..da7a8debfde 100644 --- a/experimental/packages/otlp-exporter-base/test/browser/fetch-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/browser/fetch-transport.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { createFetchTransport } from '../../src/transport/fetch-transport'; import { createRetryingTransport } from '../../src/retrying-transport'; import { registerMockDiagLogger } from '../common/test-utils'; -import { +import type { ExportResponseRetryable, ExportResponseFailure, ExportResponseSuccess, diff --git a/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts b/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts index 19518addc75..bcc1949b05a 100644 --- a/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts @@ -2,7 +2,8 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { IOtlpExportDelegate, OTLPExporterBase } from '../../src'; +import type { IOtlpExportDelegate } from '../../src'; +import { OTLPExporterBase } from '../../src'; import * as sinon from 'sinon'; diff --git a/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts index 9fce8aafccf..40802a193a8 100644 --- a/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts @@ -3,10 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - mergeOtlpHttpConfigurationWithDefaults, - OtlpHttpConfiguration, -} from '../../../src/configuration/otlp-http-configuration'; +import type { OtlpHttpConfiguration } from '../../../src/configuration/otlp-http-configuration'; +import { mergeOtlpHttpConfigurationWithDefaults } from '../../../src/configuration/otlp-http-configuration'; import * as assert from 'assert'; import { testSharedConfigBehavior } from './shared-configuration.test'; diff --git a/experimental/packages/otlp-exporter-base/test/common/configuration/shared-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/common/configuration/shared-configuration.test.ts index a7fc20382b4..e89c3536682 100644 --- a/experimental/packages/otlp-exporter-base/test/common/configuration/shared-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/configuration/shared-configuration.test.ts @@ -4,10 +4,8 @@ */ import * as assert from 'assert'; -import { - mergeOtlpSharedConfigurationWithDefaults, - OtlpSharedConfiguration, -} from '../../../src'; +import type { OtlpSharedConfiguration } from '../../../src'; +import { mergeOtlpSharedConfigurationWithDefaults } from '../../../src'; import { validateTimeoutMillis } from '../../../src/configuration/shared-configuration'; export function testSharedConfigBehavior( diff --git a/experimental/packages/otlp-exporter-base/test/common/logging-response-handler.test.ts b/experimental/packages/otlp-exporter-base/test/common/logging-response-handler.test.ts index 49fcbaf489f..98847673ba4 100644 --- a/experimental/packages/otlp-exporter-base/test/common/logging-response-handler.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/logging-response-handler.test.ts @@ -4,7 +4,7 @@ */ import { createLoggingPartialSuccessResponseHandler } from '../../src/logging-response-handler'; import * as sinon from 'sinon'; -import { IExportTraceServiceResponse } from '@opentelemetry/otlp-transformer'; +import type { IExportTraceServiceResponse } from '@opentelemetry/otlp-transformer'; import { registerMockDiagLogger } from './test-utils'; describe('loggingResponseHandler', function () { diff --git a/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts b/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts index 2f80c780dbc..a9d6df28c8e 100644 --- a/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts @@ -5,12 +5,12 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { IExporterTransport } from '../../src'; +import type { IExporterTransport } from '../../src'; import { ExportResultCode } from '@opentelemetry/core'; import { createOtlpExportDelegate } from '../../src/otlp-export-delegate'; -import { ExportResponse } from '../../src'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IExportPromiseHandler } from '../../src/bounded-queue-export-promise-handler'; +import type { ExportResponse } from '../../src'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { IExportPromiseHandler } from '../../src/bounded-queue-export-promise-handler'; import { registerMockDiagLogger } from './test-utils'; interface FakeInternalRepresentation { diff --git a/experimental/packages/otlp-exporter-base/test/common/retrying-transport.test.ts b/experimental/packages/otlp-exporter-base/test/common/retrying-transport.test.ts index 7cc966a5aef..da9eed45ba9 100644 --- a/experimental/packages/otlp-exporter-base/test/common/retrying-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/retrying-transport.test.ts @@ -5,9 +5,9 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { IExporterTransport } from '../../src'; +import type { IExporterTransport } from '../../src'; import { createRetryingTransport } from '../../src/retrying-transport'; -import { ExportResponse } from '../../src'; +import type { ExportResponse } from '../../src'; const timeoutMillis = 1000000; diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts index 9b9a2888c7a..9532a4c1427 100644 --- a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-configuration.test.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; import { mergeOtlpNodeHttpConfigurationWithDefaults } from '../../../src/configuration/otlp-node-http-configuration'; -import { OtlpNodeHttpConfiguration } from '../../../src/configuration/otlp-node-http-configuration'; +import type { OtlpNodeHttpConfiguration } from '../../../src/configuration/otlp-node-http-configuration'; import { VERSION } from '../../../src/version'; describe('mergeOtlpNodeHttpConfigurationWithDefaults', function () { diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts index ff0823c904a..70b40bc74b5 100644 --- a/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { diag } from '@opentelemetry/api'; import * as process from 'process'; -import { OtlpSharedConfiguration } from '../../../src'; +import type { OtlpSharedConfiguration } from '../../../src'; import { getSharedConfigurationFromEnvironment } from '../../../src/index-node-http'; export function testSharedConfigurationFromEnvironment( diff --git a/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts b/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts index 1ea59b9346f..3a52fb258c6 100644 --- a/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts @@ -7,14 +7,15 @@ import { createHttpExporterTransport } from '../../src/transport/http-exporter-t import * as http from 'http'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { +import type { ExportResponseRetryable, ExportResponseFailure, ExportResponseSuccess, OTLPExporterError, } from '../../src'; import * as zlib from 'zlib'; -import { createConnection, TcpNetConnectOpts } from 'net'; +import type { TcpNetConnectOpts } from 'net'; +import { createConnection } from 'net'; const sampleRequestData = new Uint8Array([1, 2, 3]); diff --git a/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts b/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts index ddb30f7bdc8..b7eafe83138 100644 --- a/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import { createOtlpHttpExportDelegate } from '../../src/otlp-http-export-delegate'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; import { ExportResultCode } from '@opentelemetry/core'; import * as sinon from 'sinon'; diff --git a/experimental/packages/otlp-exporter-base/test/testHelper.ts b/experimental/packages/otlp-exporter-base/test/testHelper.ts index a104495bf92..0c49ff13d80 100644 --- a/experimental/packages/otlp-exporter-base/test/testHelper.ts +++ b/experimental/packages/otlp-exporter-base/test/testHelper.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; import * as assert from 'assert'; export interface SimpleTestObject { diff --git a/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts b/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts index 621acd7cb95..02d87778121 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts @@ -2,12 +2,12 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { OTLPGRPCExporterConfigNode } from '../types'; +import type { OTLPGRPCExporterConfigNode } from '../types'; import { diag } from '@opentelemetry/api'; +import type { OtlpGrpcConfiguration } from './otlp-grpc-configuration'; import { getOtlpGrpcDefaultConfiguration, mergeOtlpGrpcConfigurationWithDefaults, - OtlpGrpcConfiguration, } from './otlp-grpc-configuration'; import { createEmptyMetadata } from '../grpc-exporter-transport'; import { getOtlpGrpcConfigurationFromEnv } from './otlp-grpc-env-configuration'; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-configuration.ts b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-configuration.ts index 8faad575a6e..a54e5aaff4a 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-configuration.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-configuration.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { OtlpSharedConfiguration } from '@opentelemetry/otlp-exporter-base'; import { getSharedConfigurationDefaults, mergeOtlpSharedConfigurationWithDefaults, - OtlpSharedConfiguration, } from '@opentelemetry/otlp-exporter-base'; import { createEmptyMetadata, diff --git a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts index b6bbb29e69e..ceb6710be3c 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { UnresolvedOtlpGrpcConfiguration } from './otlp-grpc-configuration'; +import type { UnresolvedOtlpGrpcConfiguration } from './otlp-grpc-configuration'; import type { ChannelCredentials, Metadata } from '@grpc/grpc-js'; import { parseKeyPairsIntoRecord } from '@opentelemetry/core'; import { diff --git a/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts b/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts index 18625c1f703..413a7c60a68 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts @@ -12,7 +12,7 @@ import type { Client, ServiceClientConstructor, } from '@grpc/grpc-js'; -import { +import type { ExportResponse, IExporterTransport, } from '@opentelemetry/otlp-exporter-base'; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts b/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts index 38a9b0cc568..549c39fa433 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts @@ -3,12 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - createOtlpNetworkExportDelegate, - IOtlpExportDelegate, -} from '@opentelemetry/otlp-exporter-base'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { OtlpGrpcConfiguration } from './configuration/otlp-grpc-configuration'; +import type { IOtlpExportDelegate } from '@opentelemetry/otlp-exporter-base'; +import { createOtlpNetworkExportDelegate } from '@opentelemetry/otlp-exporter-base'; +import type { ISerializer } from '@opentelemetry/otlp-transformer'; +import type { OtlpGrpcConfiguration } from './configuration/otlp-grpc-configuration'; import { createOtlpGrpcExporterTransport } from './grpc-exporter-transport'; export function createOtlpGrpcExportDelegate( diff --git a/experimental/packages/otlp-grpc-exporter-base/src/types.ts b/experimental/packages/otlp-grpc-exporter-base/src/types.ts index ccc5ee74a09..ea2d86c18d6 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/types.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/types.ts @@ -5,7 +5,7 @@ import type { ChannelCredentials, Metadata } from '@grpc/grpc-js'; -import { +import type { CompressionAlgorithm, OTLPExporterConfigBase, } from '@opentelemetry/otlp-exporter-base'; diff --git a/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts b/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts index a0c7676d501..cde877c4f2b 100644 --- a/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts +++ b/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts @@ -2,27 +2,27 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ +import type { GrpcExporterTransportParameters } from '../src/grpc-exporter-transport'; import { createEmptyMetadata, createInsecureCredentials, createOtlpGrpcExporterTransport, createSslCredentials, GrpcExporterTransport, - GrpcExporterTransportParameters, } from '../src/grpc-exporter-transport'; import { VERSION } from '../src/version'; import * as assert from 'assert'; import * as crypto from 'crypto'; import * as fs from 'fs'; import * as sinon from 'sinon'; +import type { Metadata } from '@grpc/grpc-js'; import { - Metadata, Server, ServerCredentials, ServerInterceptingCall, } from '@grpc/grpc-js'; import { types } from 'util'; -import { +import type { ExportResponseFailure, ExportResponseSuccess, } from '@opentelemetry/otlp-exporter-base'; diff --git a/experimental/packages/otlp-transformer/src/common/internal.ts b/experimental/packages/otlp-transformer/src/common/internal.ts index 4cd7c77c1fd..a2bc5064020 100644 --- a/experimental/packages/otlp-transformer/src/common/internal.ts +++ b/experimental/packages/otlp-transformer/src/common/internal.ts @@ -8,9 +8,9 @@ import type { IKeyValue, Resource, } from './internal-types'; -import { Attributes } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource as ISdkResource } from '@opentelemetry/resources'; +import type { Attributes } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { Resource as ISdkResource } from '@opentelemetry/resources'; import type { Encoder } from './utils'; export function createResource( diff --git a/experimental/packages/otlp-transformer/src/common/protobuf/protobuf-export-type.ts b/experimental/packages/otlp-transformer/src/common/protobuf/protobuf-export-type.ts index d9b0c6561d2..696b13b07b7 100644 --- a/experimental/packages/otlp-transformer/src/common/protobuf/protobuf-export-type.ts +++ b/experimental/packages/otlp-transformer/src/common/protobuf/protobuf-export-type.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as protobuf from 'protobufjs'; +import type * as protobuf from 'protobufjs'; export interface ExportType unknown }> { encode(message: T, writer?: protobuf.Writer): protobuf.Writer; diff --git a/experimental/packages/otlp-transformer/src/common/utils.ts b/experimental/packages/otlp-transformer/src/common/utils.ts index 89a1e4a2a59..643b26d28e6 100644 --- a/experimental/packages/otlp-transformer/src/common/utils.ts +++ b/experimental/packages/otlp-transformer/src/common/utils.ts @@ -4,7 +4,7 @@ */ import type { Fixed64, LongBits } from './internal-types'; -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; import { hrTimeToNanoseconds } from '@opentelemetry/core'; import { hexToBinary } from './hex-to-binary'; diff --git a/experimental/packages/otlp-transformer/src/logs/internal.ts b/experimental/packages/otlp-transformer/src/logs/internal.ts index 8d80b206c25..d4d229247c3 100644 --- a/experimental/packages/otlp-transformer/src/logs/internal.ts +++ b/experimental/packages/otlp-transformer/src/logs/internal.ts @@ -4,23 +4,23 @@ */ import type { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { +import type { ESeverityNumber, IExportLogsServiceRequest, ILogRecord, IResourceLogs, } from './internal-types'; -import { Resource } from '@opentelemetry/resources'; -import { Encoder } from '../common/utils'; +import type { Resource } from '@opentelemetry/resources'; +import type { Encoder } from '../common/utils'; import { createInstrumentationScope, createResource, toAnyValue, toKeyValue, } from '../common/internal'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { IKeyValue } from '../common/internal-types'; -import { LogAttributes } from '@opentelemetry/api-logs'; +import type { SeverityNumber } from '@opentelemetry/api-logs'; +import type { IKeyValue } from '../common/internal-types'; +import type { LogAttributes } from '@opentelemetry/api-logs'; export function createExportLogsServiceRequest( logRecords: ReadableLogRecord[], diff --git a/experimental/packages/otlp-transformer/src/logs/json/logs.ts b/experimental/packages/otlp-transformer/src/logs/json/logs.ts index 79e746d4bec..4ecc1c12652 100644 --- a/experimental/packages/otlp-transformer/src/logs/json/logs.ts +++ b/experimental/packages/otlp-transformer/src/logs/json/logs.ts @@ -2,10 +2,10 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { ISerializer } from '../../i-serializer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import type { ISerializer } from '../../i-serializer'; +import type { ReadableLogRecord } from '@opentelemetry/sdk-logs'; import { createExportLogsServiceRequest } from '../internal'; -import { IExportLogsServiceResponse } from '../export-response'; +import type { IExportLogsServiceResponse } from '../export-response'; import { JSON_ENCODER } from '../../common/utils'; /* diff --git a/experimental/packages/otlp-transformer/src/logs/protobuf/logs.ts b/experimental/packages/otlp-transformer/src/logs/protobuf/logs.ts index e3ec21777d0..2d0d2c0a788 100644 --- a/experimental/packages/otlp-transformer/src/logs/protobuf/logs.ts +++ b/experimental/packages/otlp-transformer/src/logs/protobuf/logs.ts @@ -4,13 +4,13 @@ */ import * as root from '../../generated/root'; -import { IExportLogsServiceRequest } from '../internal-types'; -import { IExportLogsServiceResponse } from '../export-response'; +import type { IExportLogsServiceRequest } from '../internal-types'; +import type { IExportLogsServiceResponse } from '../export-response'; import { createExportLogsServiceRequest } from '../internal'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { ExportType } from '../../common/protobuf/protobuf-export-type'; -import { ISerializer } from '../../i-serializer'; +import type { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import type { ExportType } from '../../common/protobuf/protobuf-export-type'; +import type { ISerializer } from '../../i-serializer'; import { PROTOBUF_ENCODER } from '../../common/utils'; const logsResponseType = root.opentelemetry.proto.collector.logs.v1 diff --git a/experimental/packages/otlp-transformer/src/metrics/internal-types.ts b/experimental/packages/otlp-transformer/src/metrics/internal-types.ts index b80d12654f7..ff9d37663e6 100644 --- a/experimental/packages/otlp-transformer/src/metrics/internal-types.ts +++ b/experimental/packages/otlp-transformer/src/metrics/internal-types.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Fixed64, IInstrumentationScope, IKeyValue, diff --git a/experimental/packages/otlp-transformer/src/metrics/internal.ts b/experimental/packages/otlp-transformer/src/metrics/internal.ts index 4542c077f53..929de975ec6 100644 --- a/experimental/packages/otlp-transformer/src/metrics/internal.ts +++ b/experimental/packages/otlp-transformer/src/metrics/internal.ts @@ -3,10 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ import { ValueType } from '@opentelemetry/api'; -import { - AggregationTemporality, +import type { DataPoint, - DataPointType, ExponentialHistogram, Histogram, MetricData, @@ -14,7 +12,10 @@ import { ScopeMetrics, } from '@opentelemetry/sdk-metrics'; import { - EAggregationTemporality, + AggregationTemporality, + DataPointType, +} from '@opentelemetry/sdk-metrics'; +import type { IExponentialHistogramDataPoint, IExportMetricsServiceRequest, IHistogramDataPoint, @@ -23,7 +24,8 @@ import { IResourceMetrics, IScopeMetrics, } from './internal-types'; -import { Encoder } from '../common/utils'; +import { EAggregationTemporality } from './internal-types'; +import type { Encoder } from '../common/utils'; import { createInstrumentationScope, createResource, diff --git a/experimental/packages/otlp-transformer/src/metrics/json/metrics.ts b/experimental/packages/otlp-transformer/src/metrics/json/metrics.ts index cf09b426b7f..409c675bb72 100644 --- a/experimental/packages/otlp-transformer/src/metrics/json/metrics.ts +++ b/experimental/packages/otlp-transformer/src/metrics/json/metrics.ts @@ -2,10 +2,10 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { ISerializer } from '../../i-serializer'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; +import type { ISerializer } from '../../i-serializer'; +import type { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { createExportMetricsServiceRequest } from '../internal'; -import { IExportMetricsServiceResponse } from '../export-response'; +import type { IExportMetricsServiceResponse } from '../export-response'; import { JSON_ENCODER } from '../../common/utils'; export const JsonMetricsSerializer: ISerializer< diff --git a/experimental/packages/otlp-transformer/src/metrics/protobuf/metrics.ts b/experimental/packages/otlp-transformer/src/metrics/protobuf/metrics.ts index 2d07facac64..c34f846f819 100644 --- a/experimental/packages/otlp-transformer/src/metrics/protobuf/metrics.ts +++ b/experimental/packages/otlp-transformer/src/metrics/protobuf/metrics.ts @@ -4,12 +4,12 @@ */ import * as root from '../../generated/root'; -import { ISerializer } from '../../i-serializer'; -import { IExportMetricsServiceRequest } from '../internal-types'; -import { ExportType } from '../../common/protobuf/protobuf-export-type'; +import type { ISerializer } from '../../i-serializer'; +import type { IExportMetricsServiceRequest } from '../internal-types'; +import type { ExportType } from '../../common/protobuf/protobuf-export-type'; import { createExportMetricsServiceRequest } from '../internal'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import { IExportMetricsServiceResponse } from '../export-response'; +import type { ResourceMetrics } from '@opentelemetry/sdk-metrics'; +import type { IExportMetricsServiceResponse } from '../export-response'; import { PROTOBUF_ENCODER } from '../../common/utils'; const metricsResponseType = root.opentelemetry.proto.collector.metrics.v1 diff --git a/experimental/packages/otlp-transformer/src/trace/internal-types.ts b/experimental/packages/otlp-transformer/src/trace/internal-types.ts index a01a744c00a..53303c60e10 100644 --- a/experimental/packages/otlp-transformer/src/trace/internal-types.ts +++ b/experimental/packages/otlp-transformer/src/trace/internal-types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Fixed64, IInstrumentationScope, IKeyValue, diff --git a/experimental/packages/otlp-transformer/src/trace/internal.ts b/experimental/packages/otlp-transformer/src/trace/internal.ts index e1d1ae8b8ad..d5052ded2a1 100644 --- a/experimental/packages/otlp-transformer/src/trace/internal.ts +++ b/experimental/packages/otlp-transformer/src/trace/internal.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import type { Link } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base'; import type { Encoder } from '../common/utils'; import { @@ -11,7 +11,7 @@ import { createResource, toAttributes, } from '../common/internal'; -import { +import type { EStatusCode, IEvent, IExportTraceServiceRequest, diff --git a/experimental/packages/otlp-transformer/src/trace/json/trace.ts b/experimental/packages/otlp-transformer/src/trace/json/trace.ts index 3ef61305e67..c6a40d552c2 100644 --- a/experimental/packages/otlp-transformer/src/trace/json/trace.ts +++ b/experimental/packages/otlp-transformer/src/trace/json/trace.ts @@ -2,9 +2,9 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { ISerializer } from '../../i-serializer'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import { IExportTraceServiceResponse } from '../export-response'; +import type { ISerializer } from '../../i-serializer'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { IExportTraceServiceResponse } from '../export-response'; import { createExportTraceServiceRequest } from '../internal'; import { JSON_ENCODER } from '../../common/utils'; diff --git a/experimental/packages/otlp-transformer/src/trace/protobuf/trace.ts b/experimental/packages/otlp-transformer/src/trace/protobuf/trace.ts index c30725541fa..74a63831686 100644 --- a/experimental/packages/otlp-transformer/src/trace/protobuf/trace.ts +++ b/experimental/packages/otlp-transformer/src/trace/protobuf/trace.ts @@ -4,12 +4,12 @@ */ import * as root from '../../generated/root'; -import { ISerializer } from '../../i-serializer'; -import { ExportType } from '../../common/protobuf/protobuf-export-type'; -import { IExportTraceServiceRequest } from '../internal-types'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ISerializer } from '../../i-serializer'; +import type { ExportType } from '../../common/protobuf/protobuf-export-type'; +import type { IExportTraceServiceRequest } from '../internal-types'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { createExportTraceServiceRequest } from '../internal'; -import { IExportTraceServiceResponse } from '../export-response'; +import type { IExportTraceServiceResponse } from '../export-response'; import { PROTOBUF_ENCODER } from '../../common/utils'; const traceResponseType = root.opentelemetry.proto.collector.trace.v1 diff --git a/experimental/packages/otlp-transformer/test/logs.test.ts b/experimental/packages/otlp-transformer/test/logs.test.ts index 01a307902fe..e71c8221b39 100644 --- a/experimental/packages/otlp-transformer/test/logs.test.ts +++ b/experimental/packages/otlp-transformer/test/logs.test.ts @@ -2,19 +2,20 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource, resourceFromAttributes } from '@opentelemetry/resources'; +import type { HrTime } from '@opentelemetry/api'; +import { TraceFlags } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { Resource } from '@opentelemetry/resources'; +import { resourceFromAttributes } from '@opentelemetry/resources'; import * as assert from 'assert'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import type { ReadableLogRecord } from '@opentelemetry/sdk-logs'; import { SeverityNumber } from '@opentelemetry/api-logs'; -import { JSON_ENCODER, PROTOBUF_ENCODER, Encoder } from '../src/common/utils'; +import type { Encoder } from '../src/common/utils'; +import { JSON_ENCODER, PROTOBUF_ENCODER } from '../src/common/utils'; import { toBase64 } from './utils'; import * as root from '../src/generated/root'; -import { - ESeverityNumber, - IExportLogsServiceRequest, -} from '../src/logs/internal-types'; +import type { IExportLogsServiceRequest } from '../src/logs/internal-types'; +import { ESeverityNumber } from '../src/logs/internal-types'; import { createExportLogsServiceRequest } from '../src/logs/internal'; import { ProtobufLogsSerializer } from '../src/logs/protobuf'; import { JsonLogsSerializer } from '../src/logs/json'; diff --git a/experimental/packages/otlp-transformer/test/metrics.test.ts b/experimental/packages/otlp-transformer/test/metrics.test.ts index 53ec3e63e59..04e39b88405 100644 --- a/experimental/packages/otlp-transformer/test/metrics.test.ts +++ b/experimental/packages/otlp-transformer/test/metrics.test.ts @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ import { ValueType } from '@opentelemetry/api'; -import { Resource, resourceFromAttributes } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; +import { resourceFromAttributes } from '@opentelemetry/resources'; +import type { MetricData, ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { AggregationTemporality, DataPointType, - MetricData, - ResourceMetrics, } from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; import { createExportMetricsServiceRequest } from '../src/metrics/internal'; diff --git a/experimental/packages/otlp-transformer/test/trace.test.ts b/experimental/packages/otlp-transformer/test/trace.test.ts index 91acfef50ad..ab45295f41d 100644 --- a/experimental/packages/otlp-transformer/test/trace.test.ts +++ b/experimental/packages/otlp-transformer/test/trace.test.ts @@ -5,17 +5,18 @@ import * as root from '../src/generated/root'; import { SpanKind, SpanStatusCode, TraceFlags } from '@opentelemetry/api'; import { TraceState } from '@opentelemetry/core'; -import { Resource, resourceFromAttributes } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { Resource } from '@opentelemetry/resources'; +import { resourceFromAttributes } from '@opentelemetry/resources'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import { toBase64 } from './utils'; -import { OtlpEncodingOptions } from '../src/common/internal-types'; +import type { OtlpEncodingOptions } from '../src/common/internal-types'; import { ESpanKind, EStatusCode } from '../src/trace/internal-types'; import { createExportTraceServiceRequest } from '../src/trace/internal'; import { ProtobufTraceSerializer } from '../src/trace/protobuf'; import { JsonTraceSerializer } from '../src/trace/json'; import { hexToBinary } from '../src/common/hex-to-binary'; -import { ISpan } from '../src/trace/internal-types'; +import type { ISpan } from '../src/trace/internal-types'; import { JSON_ENCODER, PROTOBUF_ENCODER } from '../src/common/utils'; function createExpectedSpanJson(options: OtlpEncodingOptions) { diff --git a/experimental/packages/sampler-composite/src/annotating.ts b/experimental/packages/sampler-composite/src/annotating.ts index f6d1e06df23..2116ac22f3f 100644 --- a/experimental/packages/sampler-composite/src/annotating.ts +++ b/experimental/packages/sampler-composite/src/annotating.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, Context, Link, SpanKind } from '@opentelemetry/api'; +import type { Attributes, Context, Link, SpanKind } from '@opentelemetry/api'; import type { ComposableSampler, SamplingIntent } from './types'; class ComposableAnnotatingSampler implements ComposableSampler { diff --git a/experimental/packages/sampler-composite/src/composite.ts b/experimental/packages/sampler-composite/src/composite.ts index 1b4064dcc57..e9d0b894715 100644 --- a/experimental/packages/sampler-composite/src/composite.ts +++ b/experimental/packages/sampler-composite/src/composite.ts @@ -2,21 +2,18 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, SpanKind, Attributes, Link, TraceState, - trace, } from '@opentelemetry/api'; +import { trace } from '@opentelemetry/api'; import { TraceState as CoreTraceState } from '@opentelemetry/core'; -import { - Sampler, - SamplingDecision, - SamplingResult, -} from '@opentelemetry/sdk-trace-base'; -import { ComposableSampler } from './types'; +import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base'; +import { SamplingDecision } from '@opentelemetry/sdk-trace-base'; +import type { ComposableSampler } from './types'; import { parseOtelTraceState, serializeTraceState } from './tracestate'; import { INVALID_THRESHOLD, diff --git a/experimental/packages/sampler-composite/src/parentthreshold.ts b/experimental/packages/sampler-composite/src/parentthreshold.ts index 33df23bc5d6..2df492f8e38 100644 --- a/experimental/packages/sampler-composite/src/parentthreshold.ts +++ b/experimental/packages/sampler-composite/src/parentthreshold.ts @@ -3,16 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Attributes, - Context, - isSpanContextValid, - Link, - SpanKind, - TraceFlags, - trace, -} from '@opentelemetry/api'; -import { ComposableSampler, SamplingIntent } from './types'; +import type { Attributes, Context, Link, SpanKind } from '@opentelemetry/api'; +import { isSpanContextValid, TraceFlags, trace } from '@opentelemetry/api'; +import type { ComposableSampler, SamplingIntent } from './types'; import { parseOtelTraceState } from './tracestate'; import { INVALID_THRESHOLD, isValidThreshold, MIN_THRESHOLD } from './util'; diff --git a/experimental/packages/sampler-composite/src/rulebased.ts b/experimental/packages/sampler-composite/src/rulebased.ts index 88f187e205f..9fdc403b0b8 100644 --- a/experimental/packages/sampler-composite/src/rulebased.ts +++ b/experimental/packages/sampler-composite/src/rulebased.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, Context, Link, SpanKind } from '@opentelemetry/api'; +import type { Attributes, Context, Link, SpanKind } from '@opentelemetry/api'; import type { ComposableSampler, SamplingIntent, SamplingRule } from './types'; import { INVALID_THRESHOLD } from './util'; diff --git a/experimental/packages/sampler-composite/src/traceidratio.ts b/experimental/packages/sampler-composite/src/traceidratio.ts index dcff407e642..658e3ef95f2 100644 --- a/experimental/packages/sampler-composite/src/traceidratio.ts +++ b/experimental/packages/sampler-composite/src/traceidratio.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ComposableSampler, SamplingIntent } from './types'; +import type { ComposableSampler, SamplingIntent } from './types'; import { INVALID_THRESHOLD, MAX_THRESHOLD } from './util'; import { serializeTh } from './tracestate'; diff --git a/experimental/packages/sampler-composite/src/tracestate.ts b/experimental/packages/sampler-composite/src/tracestate.ts index 3ad919b1e29..6ea13c1c814 100644 --- a/experimental/packages/sampler-composite/src/tracestate.ts +++ b/experimental/packages/sampler-composite/src/tracestate.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TraceState } from '@opentelemetry/api'; +import type { TraceState } from '@opentelemetry/api'; import { INVALID_RANDOM_VALUE, INVALID_THRESHOLD, diff --git a/experimental/packages/sampler-composite/src/types.ts b/experimental/packages/sampler-composite/src/types.ts index 6709118888f..e35fd9e35f7 100644 --- a/experimental/packages/sampler-composite/src/types.ts +++ b/experimental/packages/sampler-composite/src/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, TraceState } from '@opentelemetry/api'; +import type { Attributes, TraceState } from '@opentelemetry/api'; import { type Sampler } from '@opentelemetry/sdk-trace-base'; /** Information to make a sampling decision. */ diff --git a/experimental/packages/sampler-composite/test/sampler.test.ts b/experimental/packages/sampler-composite/test/sampler.test.ts index 2893d9851e8..708ff1ea303 100644 --- a/experimental/packages/sampler-composite/test/sampler.test.ts +++ b/experimental/packages/sampler-composite/test/sampler.test.ts @@ -5,13 +5,8 @@ import * as assert from 'assert'; -import { - context, - SpanContext, - SpanKind, - TraceFlags, - trace, -} from '@opentelemetry/api'; +import type { SpanContext } from '@opentelemetry/api'; +import { context, SpanKind, TraceFlags, trace } from '@opentelemetry/api'; import { SamplingDecision } from '@opentelemetry/sdk-trace-base'; import { diff --git a/experimental/packages/sampler-jaeger-remote/src/JaegerRemoteSampler.ts b/experimental/packages/sampler-jaeger-remote/src/JaegerRemoteSampler.ts index cd41544773e..9a076600a54 100644 --- a/experimental/packages/sampler-jaeger-remote/src/JaegerRemoteSampler.ts +++ b/experimental/packages/sampler-jaeger-remote/src/JaegerRemoteSampler.ts @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Link, SpanKind, Attributes, diag, Context } from '@opentelemetry/api'; +import type { Link, SpanKind, Attributes, Context } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; +import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base'; import { - Sampler, - SamplingResult, ParentBasedSampler, TraceIdRatioBasedSampler, } from '@opentelemetry/sdk-trace-base'; import * as axios from 'axios'; import { PerOperationSampler } from './PerOperationSampler'; -import { SamplingStrategyResponse, StrategyType } from './types'; +import type { SamplingStrategyResponse } from './types'; +import { StrategyType } from './types'; interface JaegerRemoteSamplerOptions { /** Address of a service that implements the Remote Sampling API, such as Jaeger Collector or OpenTelemetry Collector */ diff --git a/experimental/packages/sampler-jaeger-remote/src/PerOperationSampler.ts b/experimental/packages/sampler-jaeger-remote/src/PerOperationSampler.ts index 8acc7f6a5d3..1da28444478 100644 --- a/experimental/packages/sampler-jaeger-remote/src/PerOperationSampler.ts +++ b/experimental/packages/sampler-jaeger-remote/src/PerOperationSampler.ts @@ -3,13 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, SpanKind, Link, SpanAttributes } from '@opentelemetry/api'; -import { - Sampler, - SamplingResult, - TraceIdRatioBasedSampler, -} from '@opentelemetry/sdk-trace-base'; -import { PerOperationStrategy } from './types'; +import type { + Context, + SpanKind, + Link, + SpanAttributes, +} from '@opentelemetry/api'; +import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base'; +import { TraceIdRatioBasedSampler } from '@opentelemetry/sdk-trace-base'; +import type { PerOperationStrategy } from './types'; interface PerOperationSamplerOptions { /** The default sampler to use in case span does not have a custom strategy. */ diff --git a/experimental/packages/sampler-jaeger-remote/test/JaegerRemoteSampler.test.ts b/experimental/packages/sampler-jaeger-remote/test/JaegerRemoteSampler.test.ts index 738d529480d..8a2f8a2aa07 100644 --- a/experimental/packages/sampler-jaeger-remote/test/JaegerRemoteSampler.test.ts +++ b/experimental/packages/sampler-jaeger-remote/test/JaegerRemoteSampler.test.ts @@ -15,7 +15,8 @@ import { JaegerRemoteSampler } from '../src'; import * as sinon from 'sinon'; import * as assert from 'assert'; import { SpanKind } from '@opentelemetry/api'; -import { SamplingStrategyResponse, StrategyType } from '../src/types'; +import type { SamplingStrategyResponse } from '../src/types'; +import { StrategyType } from '../src/types'; import { PerOperationSampler } from '../src/PerOperationSampler'; import { randomSamplingProability } from './utils'; import * as axios from 'axios'; diff --git a/experimental/packages/sdk-logs/src/LogRecordImpl.ts b/experimental/packages/sdk-logs/src/LogRecordImpl.ts index 3482c010985..95671f87033 100644 --- a/experimental/packages/sdk-logs/src/LogRecordImpl.ts +++ b/experimental/packages/sdk-logs/src/LogRecordImpl.ts @@ -11,7 +11,8 @@ import type { SeverityNumber, } from '@opentelemetry/api-logs'; import * as api from '@opentelemetry/api'; -import { timeInputToHrTime, InstrumentationScope } from '@opentelemetry/core'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import { timeInputToHrTime } from '@opentelemetry/core'; import type { Resource } from '@opentelemetry/resources'; import { ATTR_EXCEPTION_MESSAGE, @@ -21,7 +22,7 @@ import { import type { ReadableLogRecord } from './export/ReadableLogRecord'; import type { LogRecordLimits } from './types'; import { isLogAttributeValue } from './utils/validation'; -import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState'; +import type { LoggerProviderSharedState } from './internal/LoggerProviderSharedState'; export class LogRecordImpl implements ReadableLogRecord { readonly hrTime: api.HrTime; diff --git a/experimental/packages/sdk-logs/src/LogRecordProcessor.ts b/experimental/packages/sdk-logs/src/LogRecordProcessor.ts index be8c4a0e33d..11baf578be1 100644 --- a/experimental/packages/sdk-logs/src/LogRecordProcessor.ts +++ b/experimental/packages/sdk-logs/src/LogRecordProcessor.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; -import { SdkLogRecord } from './export/SdkLogRecord'; +import type { SdkLogRecord } from './export/SdkLogRecord'; export interface LogRecordProcessor { /** diff --git a/experimental/packages/sdk-logs/src/Logger.ts b/experimental/packages/sdk-logs/src/Logger.ts index c0cc0ce6e65..ab5abb0e898 100644 --- a/experimental/packages/sdk-logs/src/Logger.ts +++ b/experimental/packages/sdk-logs/src/Logger.ts @@ -14,8 +14,8 @@ import { } from '@opentelemetry/api'; import { LogRecordImpl } from './LogRecordImpl'; -import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState'; -import { LoggerConfig } from './types'; +import type { LoggerProviderSharedState } from './internal/LoggerProviderSharedState'; +import type { LoggerConfig } from './types'; export class Logger implements logsAPI.Logger { public readonly instrumentationScope: InstrumentationScope; diff --git a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts index a2a3ef4016c..61a0b3c35ff 100644 --- a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts +++ b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts @@ -4,8 +4,8 @@ */ import { diag } from '@opentelemetry/api'; +import type { ExportResult } from '@opentelemetry/core'; import { - ExportResult, ExportResultCode, globalErrorHandler, BindOnceFuture, diff --git a/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts b/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts index 6c4908a2561..3e299874b9c 100644 --- a/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts +++ b/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts @@ -3,11 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - ExportResultCode, - ExportResult, - hrTimeToMicroseconds, -} from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode, hrTimeToMicroseconds } from '@opentelemetry/core'; import type { ReadableLogRecord } from './ReadableLogRecord'; import type { LogRecordExporter } from './LogRecordExporter'; diff --git a/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts b/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts index 2e70fc738c5..4e014e77161 100644 --- a/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts +++ b/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; -import { LogRecordProcessor } from '../LogRecordProcessor'; -import { ReadableLogRecord } from './ReadableLogRecord'; +import type { Context } from '@opentelemetry/api'; +import type { LogRecordProcessor } from '../LogRecordProcessor'; +import type { ReadableLogRecord } from './ReadableLogRecord'; export class NoopLogRecordProcessor implements LogRecordProcessor { forceFlush(): Promise { diff --git a/experimental/packages/sdk-logs/src/export/SdkLogRecord.ts b/experimental/packages/sdk-logs/src/export/SdkLogRecord.ts index 66f34546da6..c1356671b2e 100644 --- a/experimental/packages/sdk-logs/src/export/SdkLogRecord.ts +++ b/experimental/packages/sdk-logs/src/export/SdkLogRecord.ts @@ -4,7 +4,7 @@ */ import type { HrTime, SpanContext } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; +import type { InstrumentationScope } from '@opentelemetry/core'; import type { AnyValue, LogBody, diff --git a/experimental/packages/sdk-logs/src/internal/LoggerProviderSharedState.ts b/experimental/packages/sdk-logs/src/internal/LoggerProviderSharedState.ts index 713f5dfa456..16a6b3644e8 100644 --- a/experimental/packages/sdk-logs/src/internal/LoggerProviderSharedState.ts +++ b/experimental/packages/sdk-logs/src/internal/LoggerProviderSharedState.ts @@ -3,12 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Logger } from '@opentelemetry/api-logs'; +import type { Logger } from '@opentelemetry/api-logs'; import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; import type { InstrumentationScope } from '@opentelemetry/core'; -import { LogRecordProcessor } from '../LogRecordProcessor'; -import { LogRecordLimits, LoggerConfig, LoggerConfigurator } from '../types'; +import type { LogRecordProcessor } from '../LogRecordProcessor'; +import type { + LogRecordLimits, + LoggerConfig, + LoggerConfigurator, +} from '../types'; import { NoopLogRecordProcessor } from '../export/NoopLogRecordProcessor'; import { MultiLogRecordProcessor } from '../MultiLogRecordProcessor'; import { getInstrumentationScopeKey } from './utils'; diff --git a/experimental/packages/sdk-logs/src/types.ts b/experimental/packages/sdk-logs/src/types.ts index 445c4d6d76b..c8da449a2e7 100644 --- a/experimental/packages/sdk-logs/src/types.ts +++ b/experimental/packages/sdk-logs/src/types.ts @@ -6,7 +6,7 @@ import type { Resource } from '@opentelemetry/resources'; import type { SeverityNumber } from '@opentelemetry/api-logs'; import type { InstrumentationScope } from '@opentelemetry/core'; -import { LogRecordProcessor } from './LogRecordProcessor'; +import type { LogRecordProcessor } from './LogRecordProcessor'; /** * A LoggerConfig defines various configurable aspects of a Logger's behavior. diff --git a/experimental/packages/sdk-logs/src/utils/validation.ts b/experimental/packages/sdk-logs/src/utils/validation.ts index 0392ceacc3c..9e8e402e898 100644 --- a/experimental/packages/sdk-logs/src/utils/validation.ts +++ b/experimental/packages/sdk-logs/src/utils/validation.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { AnyValue } from '@opentelemetry/api-logs'; +import type { AnyValue } from '@opentelemetry/api-logs'; /** * Validates if a value is a valid AnyValue for Log Attributes according to OpenTelemetry spec. diff --git a/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts index eaf0a6404ca..16051464f87 100644 --- a/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { LogRecordExporter } from '../../../src'; +import type { LogRecordExporter } from '../../../src'; import { BatchLogRecordProcessor } from '../../../src/platform/browser/export/BatchLogRecordProcessor'; import { InMemoryLogRecordExporter } from './../../../src/export/InMemoryLogRecordExporter'; diff --git a/experimental/packages/sdk-logs/test/common/LogRecord.test.ts b/experimental/packages/sdk-logs/test/common/LogRecord.test.ts index edaea9885d3..2e1e6b039f8 100644 --- a/experimental/packages/sdk-logs/test/common/LogRecord.test.ts +++ b/experimental/packages/sdk-logs/test/common/LogRecord.test.ts @@ -5,17 +5,10 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { - Attributes, - AttributeValue, - diag, - ROOT_CONTEXT, - trace, - TraceFlags, -} from '@opentelemetry/api'; +import { diag, ROOT_CONTEXT, trace, TraceFlags } from '@opentelemetry/api'; import * as logsAPI from '@opentelemetry/api-logs'; -import { AnyValue } from '@opentelemetry/api-logs'; -import type { HrTime } from '@opentelemetry/api'; +import type { AnyValue } from '@opentelemetry/api-logs'; +import type { HrTime, Attributes, AttributeValue } from '@opentelemetry/api'; import { hrTimeToMilliseconds, timeInputToHrTime } from '@opentelemetry/core'; import { defaultResource } from '@opentelemetry/resources'; import { @@ -24,11 +17,8 @@ import { ATTR_EXCEPTION_TYPE, } from '@opentelemetry/semantic-conventions'; -import { - LogRecordLimits, - LogRecordProcessor, - LoggerProvider, -} from './../../src'; +import type { LogRecordLimits, LogRecordProcessor } from './../../src'; +import { LoggerProvider } from './../../src'; import { invalidAttributes, validAttributes } from './utils'; import { LoggerProviderSharedState } from '../../src/internal/LoggerProviderSharedState'; import { LogRecordImpl } from '../../src/LogRecordImpl'; diff --git a/experimental/packages/sdk-logs/test/common/Logger.test.ts b/experimental/packages/sdk-logs/test/common/Logger.test.ts index b58fa48b172..c247014ee43 100644 --- a/experimental/packages/sdk-logs/test/common/Logger.test.ts +++ b/experimental/packages/sdk-logs/test/common/Logger.test.ts @@ -9,10 +9,8 @@ import { LoggerProvider, createLoggerConfigurator } from '../../src'; import { NoopLogRecordProcessor } from '../../src/export/NoopLogRecordProcessor'; import { LogRecordImpl } from '../../src/LogRecordImpl'; import { ROOT_CONTEXT, TraceFlags, context, trace } from '@opentelemetry/api'; -import { - LogRecord as ApiLogRecord, - SeverityNumber, -} from '@opentelemetry/api-logs'; +import type { LogRecord as ApiLogRecord } from '@opentelemetry/api-logs'; +import { SeverityNumber } from '@opentelemetry/api-logs'; import { Logger } from '../../src/Logger'; import { InMemoryLogRecordExporter } from '../../src/export/InMemoryLogRecordExporter'; import { SimpleLogRecordProcessor } from '../../src/export/SimpleLogRecordProcessor'; diff --git a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts index 87149e28fe9..c8ea4c4dc9c 100644 --- a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts @@ -5,25 +5,25 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; +import type { ExportResult } from '@opentelemetry/core'; import { - ExportResult, ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, } from '@opentelemetry/core'; -import { +import type { BufferConfig, LogRecordLimits, SdkLogRecord, - InMemoryLogRecordExporter, LogRecordExporter, } from '../../../src'; +import { InMemoryLogRecordExporter } from '../../../src'; import { BatchLogRecordProcessorBase } from '../../../src/export/BatchLogRecordProcessorBase'; import { LoggerProviderSharedState } from '../../../src/internal/LoggerProviderSharedState'; +import type { Resource } from '@opentelemetry/resources'; import { defaultResource, - Resource, resourceFromAttributes, } from '@opentelemetry/resources'; import { LogRecordImpl } from '../../../src/LogRecordImpl'; diff --git a/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts b/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts index 12cd1d2ae97..2547c179c9a 100644 --- a/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts @@ -5,7 +5,8 @@ import * as assert from 'assert'; import { SeverityNumber } from '@opentelemetry/api-logs'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; import { LoggerProvider, diff --git a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts index 886a42f760a..878f2e8d15f 100644 --- a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts @@ -10,15 +10,15 @@ import { loggingErrorHandler, setGlobalErrorHandler, } from '@opentelemetry/core'; +import type { Resource } from '@opentelemetry/resources'; import { defaultResource, - Resource, resourceFromAttributes, } from '@opentelemetry/resources'; +import type { LogRecordExporter } from './../../../src'; import { InMemoryLogRecordExporter, - LogRecordExporter, SimpleLogRecordProcessor, } from './../../../src'; import { LoggerProviderSharedState } from '../../../src/internal/LoggerProviderSharedState'; diff --git a/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts b/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts index 03f6ed7738f..4b9b43d9a67 100644 --- a/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts +++ b/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; -import { InMemoryLogRecordExporter, ReadableLogRecord } from '../../../src'; +import type { ExportResult } from '@opentelemetry/core'; +import type { ReadableLogRecord } from '../../../src'; +import { InMemoryLogRecordExporter } from '../../../src'; /** * A test-only exporter that delays during export to mimic a real exporter. diff --git a/experimental/packages/shim-opencensus/src/OpenCensusMetricProducer.ts b/experimental/packages/shim-opencensus/src/OpenCensusMetricProducer.ts index d449bc9f777..8de58b63342 100644 --- a/experimental/packages/shim-opencensus/src/OpenCensusMetricProducer.ts +++ b/experimental/packages/shim-opencensus/src/OpenCensusMetricProducer.ts @@ -17,7 +17,7 @@ import * as oc from '@opencensus/core'; import { emptyResource } from '@opentelemetry/resources'; -import { +import type { CollectionResult, MetricData, MetricProducer, diff --git a/experimental/packages/shim-opencensus/src/ShimSpan.ts b/experimental/packages/shim-opencensus/src/ShimSpan.ts index 18afa46d8da..6bb9d770c75 100644 --- a/experimental/packages/shim-opencensus/src/ShimSpan.ts +++ b/experimental/packages/shim-opencensus/src/ShimSpan.ts @@ -4,8 +4,9 @@ */ import * as oc from '@opencensus/core'; -import { ShimTracer } from './ShimTracer'; -import { AttributeValue, Span, SpanStatusCode, diag } from '@opentelemetry/api'; +import type { ShimTracer } from './ShimTracer'; +import type { AttributeValue, Span } from '@opentelemetry/api'; +import { SpanStatusCode, diag } from '@opentelemetry/api'; import { mapMessageEvent, reverseMapSpanContext } from './trace-transform'; // Copied from diff --git a/experimental/packages/shim-opencensus/src/ShimTracer.ts b/experimental/packages/shim-opencensus/src/ShimTracer.ts index bd30ed89ca6..13f7178e198 100644 --- a/experimental/packages/shim-opencensus/src/ShimTracer.ts +++ b/experimental/packages/shim-opencensus/src/ShimTracer.ts @@ -5,14 +5,13 @@ import * as oc from '@opencensus/core'; +import type { Context, Tracer } from '@opentelemetry/api'; import { - Context, context, createContextKey, diag, INVALID_SPAN_CONTEXT, trace, - Tracer, } from '@opentelemetry/api'; import { DEFAULT_SPAN_NAME, ShimSpan } from './ShimSpan'; import { mapSpanContext, mapSpanKind } from './trace-transform'; diff --git a/experimental/packages/shim-opencensus/src/metric-transform.ts b/experimental/packages/shim-opencensus/src/metric-transform.ts index 450641e667d..b688d7bbac2 100644 --- a/experimental/packages/shim-opencensus/src/metric-transform.ts +++ b/experimental/packages/shim-opencensus/src/metric-transform.ts @@ -4,16 +4,19 @@ */ import * as oc from '@opencensus/core'; -import { Attributes, HrTime, ValueType, diag } from '@opentelemetry/api'; -import { - AggregationTemporality, +import type { Attributes, HrTime } from '@opentelemetry/api'; +import { ValueType, diag } from '@opentelemetry/api'; +import type { DataPoint, - DataPointType, GaugeMetricData, HistogramMetricData, MetricData, SumMetricData, } from '@opentelemetry/sdk-metrics'; +import { + AggregationTemporality, + DataPointType, +} from '@opentelemetry/sdk-metrics'; type BaseMetric = Omit; interface MappedType { diff --git a/experimental/packages/shim-opencensus/src/propagation.ts b/experimental/packages/shim-opencensus/src/propagation.ts index e76ebf12a54..657798c77d7 100644 --- a/experimental/packages/shim-opencensus/src/propagation.ts +++ b/experimental/packages/shim-opencensus/src/propagation.ts @@ -3,15 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as oc from '@opencensus/core'; +import type * as oc from '@opencensus/core'; -import { - context, - propagation, - trace, - TextMapGetter, - TextMapSetter, -} from '@opentelemetry/api'; +import type { TextMapGetter, TextMapSetter } from '@opentelemetry/api'; +import { context, propagation, trace } from '@opentelemetry/api'; import { mapSpanContext, reverseMapSpanContext } from './trace-transform'; class Getter implements TextMapGetter { diff --git a/experimental/packages/shim-opencensus/src/shim.ts b/experimental/packages/shim-opencensus/src/shim.ts index 99a538486a0..23cf292dafe 100644 --- a/experimental/packages/shim-opencensus/src/shim.ts +++ b/experimental/packages/shim-opencensus/src/shim.ts @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { diag, trace, Tracer } from '@opentelemetry/api'; +import type { Tracer } from '@opentelemetry/api'; +import { diag, trace } from '@opentelemetry/api'; import { Hook } from 'require-in-the-middle'; -import * as oc from '@opencensus/core'; +import type * as oc from '@opencensus/core'; import { ShimTracer } from './ShimTracer'; import { VERSION } from './version'; diff --git a/experimental/packages/shim-opencensus/src/trace-transform.ts b/experimental/packages/shim-opencensus/src/trace-transform.ts index a108f879229..4590d713e2d 100644 --- a/experimental/packages/shim-opencensus/src/trace-transform.ts +++ b/experimental/packages/shim-opencensus/src/trace-transform.ts @@ -4,13 +4,8 @@ */ import * as oc from '@opencensus/core'; -import { - Attributes, - SpanContext, - SpanKind, - TimeInput, - diag, -} from '@opentelemetry/api'; +import type { Attributes, SpanContext, TimeInput } from '@opentelemetry/api'; +import { SpanKind, diag } from '@opentelemetry/api'; import { TraceState } from '@opentelemetry/core'; function exhaust(value: never) { diff --git a/experimental/packages/shim-opencensus/test/OpenCensusMetricProducer.test.ts b/experimental/packages/shim-opencensus/test/OpenCensusMetricProducer.test.ts index 468931e163c..e9730814756 100644 --- a/experimental/packages/shim-opencensus/test/OpenCensusMetricProducer.test.ts +++ b/experimental/packages/shim-opencensus/test/OpenCensusMetricProducer.test.ts @@ -6,10 +6,10 @@ import * as oc from '@opencensus/core'; import { ValueType } from '@opentelemetry/api'; import { emptyResource } from '@opentelemetry/resources'; +import type { SumMetricData } from '@opentelemetry/sdk-metrics'; import { AggregationTemporality, DataPointType, - SumMetricData, } from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; diff --git a/experimental/packages/shim-opencensus/test/ShimSpan.test.ts b/experimental/packages/shim-opencensus/test/ShimSpan.test.ts index 7f1ea7f3ee2..73a03089162 100644 --- a/experimental/packages/shim-opencensus/test/ShimSpan.test.ts +++ b/experimental/packages/shim-opencensus/test/ShimSpan.test.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as oc from '@opencensus/core'; import * as assert from 'assert'; import { withTestTracer, setupNodeContextManager } from './util'; -import { ShimSpan } from '../src/ShimSpan'; +import type { ShimSpan } from '../src/ShimSpan'; async function withTestSpan( func: (span: ShimSpan) => void | Promise diff --git a/experimental/packages/shim-opencensus/test/ShimTracer.test.ts b/experimental/packages/shim-opencensus/test/ShimTracer.test.ts index 21fb033e29c..24e73bb9d2d 100644 --- a/experimental/packages/shim-opencensus/test/ShimTracer.test.ts +++ b/experimental/packages/shim-opencensus/test/ShimTracer.test.ts @@ -7,13 +7,13 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import * as oc from '@opencensus/core'; import { ShimTracer, getRootSpan } from '../src/ShimTracer'; +import type { Tracer } from '@opentelemetry/api'; import { INVALID_SPANID, INVALID_TRACEID, SpanKind, context, createContextKey, - Tracer, } from '@opentelemetry/api'; import { withTestTracer, setupNodeContextManager } from './util'; diff --git a/experimental/packages/shim-opencensus/test/metric-transform.test.ts b/experimental/packages/shim-opencensus/test/metric-transform.test.ts index e8c0a769d3c..1ccb44ce266 100644 --- a/experimental/packages/shim-opencensus/test/metric-transform.test.ts +++ b/experimental/packages/shim-opencensus/test/metric-transform.test.ts @@ -7,13 +7,15 @@ import { mapOcMetric } from '../src/metric-transform'; import * as oc from '@opencensus/core'; import { ValueType } from '@opentelemetry/api'; -import { - AggregationTemporality, - DataPointType, +import type { GaugeMetricData, HistogramMetricData, SumMetricData, } from '@opentelemetry/sdk-metrics'; +import { + AggregationTemporality, + DataPointType, +} from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; describe('metric-transform', () => { diff --git a/experimental/packages/shim-opencensus/test/propagation.test.ts b/experimental/packages/shim-opencensus/test/propagation.test.ts index bf263a27faa..9218e779599 100644 --- a/experimental/packages/shim-opencensus/test/propagation.test.ts +++ b/experimental/packages/shim-opencensus/test/propagation.test.ts @@ -5,7 +5,7 @@ import { shimPropagation } from '../src/propagation'; -import * as oc from '@opencensus/core'; +import type * as oc from '@opencensus/core'; import { propagation } from '@opentelemetry/api'; import { W3CTraceContextPropagator } from '@opentelemetry/core'; import * as assert from 'assert'; diff --git a/experimental/packages/shim-opencensus/test/util.ts b/experimental/packages/shim-opencensus/test/util.ts index d1b5c656ec8..f490c4214f8 100644 --- a/experimental/packages/shim-opencensus/test/util.ts +++ b/experimental/packages/shim-opencensus/test/util.ts @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { AlwaysOnSampler, BasicTracerProvider, InMemorySpanExporter, - ReadableSpan, SimpleSpanProcessor, } from '@opentelemetry/sdk-trace-base'; import { ShimTracer } from '../src/ShimTracer'; import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'; -import { Tracer, TracerProvider, context } from '@opentelemetry/api'; +import type { Tracer, TracerProvider } from '@opentelemetry/api'; +import { context } from '@opentelemetry/api'; export async function withTestTracer( func: (shimTracer: ShimTracer, otelTracer: Tracer) => void | Promise diff --git a/experimental/packages/web-common/src/DefaultIdGenerator.ts b/experimental/packages/web-common/src/DefaultIdGenerator.ts index 019b5a8114c..f3c59bbc691 100644 --- a/experimental/packages/web-common/src/DefaultIdGenerator.ts +++ b/experimental/packages/web-common/src/DefaultIdGenerator.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SessionIdGenerator } from './types/SessionIdGenerator'; +import type { SessionIdGenerator } from './types/SessionIdGenerator'; export class DefaultIdGenerator implements SessionIdGenerator { generateSessionId = getIdGenerator(16); diff --git a/experimental/packages/web-common/src/LocalStorageSessionStore.ts b/experimental/packages/web-common/src/LocalStorageSessionStore.ts index 4e5d60f1da4..ce240b0eff2 100644 --- a/experimental/packages/web-common/src/LocalStorageSessionStore.ts +++ b/experimental/packages/web-common/src/LocalStorageSessionStore.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Session } from './types/Session'; -import { SessionStore } from './types/SessionStore'; +import type { Session } from './types/Session'; +import type { SessionStore } from './types/SessionStore'; const SESSION_STORAGE_KEY = 'opentelemetry-session'; diff --git a/experimental/packages/web-common/src/SessionLogRecordProcessor.ts b/experimental/packages/web-common/src/SessionLogRecordProcessor.ts index 19079839bbb..8c53b72f8db 100644 --- a/experimental/packages/web-common/src/SessionLogRecordProcessor.ts +++ b/experimental/packages/web-common/src/SessionLogRecordProcessor.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; -import { SdkLogRecord, LogRecordProcessor } from '@opentelemetry/sdk-logs'; +import type { Context } from '@opentelemetry/api'; +import type { SdkLogRecord, LogRecordProcessor } from '@opentelemetry/sdk-logs'; import { ATTR_SESSION_ID } from './semconv'; -import { SessionProvider } from './types/SessionProvider'; +import type { SessionProvider } from './types/SessionProvider'; /** * SessionLogRecordProcessor is a {@link SpanProcessor} adds the session.id attribute diff --git a/experimental/packages/web-common/src/SessionManager.ts b/experimental/packages/web-common/src/SessionManager.ts index 88c492d6ea4..16c84f8dd2a 100644 --- a/experimental/packages/web-common/src/SessionManager.ts +++ b/experimental/packages/web-common/src/SessionManager.ts @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SessionIdGenerator } from './types/SessionIdGenerator'; -import { Session } from './types/Session'; -import { SessionProvider } from './types/SessionProvider'; -import { SessionObserver } from './types/SessionObserver'; -import { SessionStore } from './types/SessionStore'; -import { SessionPublisher } from './types/SessionPublisher'; +import type { SessionIdGenerator } from './types/SessionIdGenerator'; +import type { Session } from './types/Session'; +import type { SessionProvider } from './types/SessionProvider'; +import type { SessionObserver } from './types/SessionObserver'; +import type { SessionStore } from './types/SessionStore'; +import type { SessionPublisher } from './types/SessionPublisher'; export interface SessionManagerConfig { /** Class responsible for generating a session ID */ diff --git a/experimental/packages/web-common/src/SessionSpanProcessor.ts b/experimental/packages/web-common/src/SessionSpanProcessor.ts index 24b61d4fcce..9f45f24c46d 100644 --- a/experimental/packages/web-common/src/SessionSpanProcessor.ts +++ b/experimental/packages/web-common/src/SessionSpanProcessor.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; -import { +import type { Context } from '@opentelemetry/api'; +import type { SpanProcessor, Span, ReadableSpan, } from '@opentelemetry/sdk-trace-base'; import { ATTR_SESSION_ID } from './semconv'; -import { SessionProvider } from './types/SessionProvider'; +import type { SessionProvider } from './types/SessionProvider'; /** * SessionSpanProcessor is a {@link SpanProcessor} that adds the session.id attribute diff --git a/experimental/packages/web-common/src/types/SessionObserver.ts b/experimental/packages/web-common/src/types/SessionObserver.ts index ee6a7f510ee..c814ac41898 100644 --- a/experimental/packages/web-common/src/types/SessionObserver.ts +++ b/experimental/packages/web-common/src/types/SessionObserver.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Session } from './Session'; +import type { Session } from './Session'; export interface SessionObserver { onSessionStarted(newSession: Session, previousSession?: Session): void; diff --git a/experimental/packages/web-common/src/types/SessionPublisher.ts b/experimental/packages/web-common/src/types/SessionPublisher.ts index 42c5dc463ac..4fb48e6edb3 100644 --- a/experimental/packages/web-common/src/types/SessionPublisher.ts +++ b/experimental/packages/web-common/src/types/SessionPublisher.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SessionObserver } from './SessionObserver'; +import type { SessionObserver } from './SessionObserver'; export interface SessionPublisher { addObserver(observer: SessionObserver): void; diff --git a/experimental/packages/web-common/src/types/SessionStore.ts b/experimental/packages/web-common/src/types/SessionStore.ts index 645d1b3e3dd..7f9692685d3 100644 --- a/experimental/packages/web-common/src/types/SessionStore.ts +++ b/experimental/packages/web-common/src/types/SessionStore.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Session } from './Session'; +import type { Session } from './Session'; export interface SessionStore { save(session: Session): Promise; diff --git a/experimental/packages/web-common/src/utils.ts b/experimental/packages/web-common/src/utils.ts index 51ba0a60751..ecd006d4389 100644 --- a/experimental/packages/web-common/src/utils.ts +++ b/experimental/packages/web-common/src/utils.ts @@ -3,15 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SessionProvider } from './types/SessionProvider'; -import { SpanProcessor } from '@opentelemetry/sdk-trace-base'; +import type { SessionProvider } from './types/SessionProvider'; +import type { SpanProcessor } from '@opentelemetry/sdk-trace-base'; import { SessionSpanProcessor } from './SessionSpanProcessor'; -import { LogRecordProcessor } from '@opentelemetry/sdk-logs'; +import type { LogRecordProcessor } from '@opentelemetry/sdk-logs'; import { SessionLogRecordProcessor } from './SessionLogRecordProcessor'; -import { SessionManager, SessionManagerConfig } from './SessionManager'; -import { SessionIdGenerator } from './types/SessionIdGenerator'; +import type { SessionManagerConfig } from './SessionManager'; +import { SessionManager } from './SessionManager'; +import type { SessionIdGenerator } from './types/SessionIdGenerator'; import { DefaultIdGenerator } from './DefaultIdGenerator'; -import { SessionStore } from './types/SessionStore'; +import type { SessionStore } from './types/SessionStore'; import { LocalStorageSessionStore } from './LocalStorageSessionStore'; export function createSessionSpanProcessor( diff --git a/experimental/packages/web-common/test/LocalStorageSessionStore.test.ts b/experimental/packages/web-common/test/LocalStorageSessionStore.test.ts index a560f2a3307..1e254aa2679 100644 --- a/experimental/packages/web-common/test/LocalStorageSessionStore.test.ts +++ b/experimental/packages/web-common/test/LocalStorageSessionStore.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { LocalStorageSessionStore } from '../src/LocalStorageSessionStore'; -import { Session } from '../src/types/Session'; +import type { Session } from '../src/types/Session'; describe('LocalStorageSessionStore', () => { let store: LocalStorageSessionStore; diff --git a/experimental/packages/web-common/test/SessionManager.test.ts b/experimental/packages/web-common/test/SessionManager.test.ts index 64e57b029ca..ff7ea695e86 100644 --- a/experimental/packages/web-common/test/SessionManager.test.ts +++ b/experimental/packages/web-common/test/SessionManager.test.ts @@ -5,11 +5,12 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { SessionManager, SessionManagerConfig } from '../src/SessionManager'; -import { SessionIdGenerator } from '../src/types/SessionIdGenerator'; -import { SessionStore } from '../src/types/SessionStore'; -import { SessionObserver } from '../src/types/SessionObserver'; -import { Session } from '../src/types/Session'; +import type { SessionManagerConfig } from '../src/SessionManager'; +import { SessionManager } from '../src/SessionManager'; +import type { SessionIdGenerator } from '../src/types/SessionIdGenerator'; +import type { SessionStore } from '../src/types/SessionStore'; +import type { SessionObserver } from '../src/types/SessionObserver'; +import type { Session } from '../src/types/Session'; class MockSessionIdGenerator implements SessionIdGenerator { private _id = 0; diff --git a/experimental/packages/web-common/test/SessionSpanProcessor.test.ts b/experimental/packages/web-common/test/SessionSpanProcessor.test.ts index 7bc880f257e..d96340f4a22 100644 --- a/experimental/packages/web-common/test/SessionSpanProcessor.test.ts +++ b/experimental/packages/web-common/test/SessionSpanProcessor.test.ts @@ -4,7 +4,8 @@ */ import * as assert from 'assert'; -import { BasicTracerProvider, Span } from '@opentelemetry/sdk-trace-base'; +import type { Span } from '@opentelemetry/sdk-trace-base'; +import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; import { SessionSpanProcessor } from '../src/SessionSpanProcessor'; import { ROOT_CONTEXT } from '@opentelemetry/api'; diff --git a/experimental/packages/web-common/test/utils.test.ts b/experimental/packages/web-common/test/utils.test.ts index b2050fdabdd..6962c7576c2 100644 --- a/experimental/packages/web-common/test/utils.test.ts +++ b/experimental/packages/web-common/test/utils.test.ts @@ -10,10 +10,10 @@ import { createDefaultSessionIdGenerator, createLocalStorageSessionStore, } from '../src/utils'; -import { SessionSpanProcessor } from '../src/SessionSpanProcessor'; -import { SessionLogRecordProcessor } from '../src/SessionLogRecordProcessor'; -import { SessionIdGenerator } from '../src/types/SessionIdGenerator'; -import { SessionStore } from '../src/types/SessionStore'; +import type { SessionSpanProcessor } from '../src/SessionSpanProcessor'; +import type { SessionLogRecordProcessor } from '../src/SessionLogRecordProcessor'; +import type { SessionIdGenerator } from '../src/types/SessionIdGenerator'; +import type { SessionStore } from '../src/types/SessionStore'; describe('createSessionSpanProcessor', function () { it('returns an instance of a SessionSpanProcessor', function () { diff --git a/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts b/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts index 928cdf967d4..d6fa3dabc31 100644 --- a/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts +++ b/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ContextManager, Context } from '@opentelemetry/api'; +import type { ContextManager, Context } from '@opentelemetry/api'; import { EventEmitter } from 'events'; type Func = (...args: unknown[]) => T; diff --git a/packages/opentelemetry-context-async-hooks/src/AsyncHooksContextManager.ts b/packages/opentelemetry-context-async-hooks/src/AsyncHooksContextManager.ts index 2797feb5de0..477506cb545 100644 --- a/packages/opentelemetry-context-async-hooks/src/AsyncHooksContextManager.ts +++ b/packages/opentelemetry-context-async-hooks/src/AsyncHooksContextManager.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; import * as asyncHooks from 'async_hooks'; import { AbstractAsyncHooksContextManager } from './AbstractAsyncHooksContextManager'; diff --git a/packages/opentelemetry-context-async-hooks/src/AsyncLocalStorageContextManager.ts b/packages/opentelemetry-context-async-hooks/src/AsyncLocalStorageContextManager.ts index c86ce7a5333..2007caf0de9 100644 --- a/packages/opentelemetry-context-async-hooks/src/AsyncLocalStorageContextManager.ts +++ b/packages/opentelemetry-context-async-hooks/src/AsyncLocalStorageContextManager.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; import { AsyncLocalStorage } from 'async_hooks'; import { AbstractAsyncHooksContextManager } from './AbstractAsyncHooksContextManager'; diff --git a/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts b/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts index 26bb1d5bd5b..a26cae111fc 100644 --- a/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts +++ b/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts @@ -4,8 +4,9 @@ */ /// -import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api'; -import { TargetWithEvents } from './types'; +import type { Context, ContextManager } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; +import type { TargetWithEvents } from './types'; import { isListenerObject } from './util'; /* Key name to be used to save a context reference in Zone */ diff --git a/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts b/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts index f313691b91e..1ea3aa57644 100644 --- a/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts +++ b/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { BaggageEntry, Context, - propagation, TextMapGetter, TextMapPropagator, TextMapSetter, } from '@opentelemetry/api'; +import { propagation } from '@opentelemetry/api'; import { isTracingSuppressed } from '../../trace/suppress-tracing'; import { diff --git a/packages/opentelemetry-core/src/baggage/utils.ts b/packages/opentelemetry-core/src/baggage/utils.ts index ef8710a2f3d..3dcd71b876e 100644 --- a/packages/opentelemetry-core/src/baggage/utils.ts +++ b/packages/opentelemetry-core/src/baggage/utils.ts @@ -2,11 +2,8 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { - Baggage, - BaggageEntryMetadata, - baggageEntryMetadataFromString, -} from '@opentelemetry/api'; +import type { Baggage, BaggageEntryMetadata } from '@opentelemetry/api'; +import { baggageEntryMetadataFromString } from '@opentelemetry/api'; import { BAGGAGE_ITEMS_SEPARATOR, BAGGAGE_PROPERTIES_SEPARATOR, diff --git a/packages/opentelemetry-core/src/common/attributes.ts b/packages/opentelemetry-core/src/common/attributes.ts index cc5050c0bed..03fbff3e410 100644 --- a/packages/opentelemetry-core/src/common/attributes.ts +++ b/packages/opentelemetry-core/src/common/attributes.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { diag, AttributeValue, Attributes } from '@opentelemetry/api'; +import type { AttributeValue, Attributes } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; export function sanitizeAttributes(attributes: unknown): Attributes { const out: Attributes = {}; diff --git a/packages/opentelemetry-core/src/common/global-error-handler.ts b/packages/opentelemetry-core/src/common/global-error-handler.ts index 5ef0c733388..a1034960f3d 100644 --- a/packages/opentelemetry-core/src/common/global-error-handler.ts +++ b/packages/opentelemetry-core/src/common/global-error-handler.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Exception } from '@opentelemetry/api'; +import type { Exception } from '@opentelemetry/api'; import { loggingErrorHandler } from './logging-error-handler'; -import { ErrorHandler } from './types'; +import type { ErrorHandler } from './types'; /** The global error handler delegate */ let delegateHandler = loggingErrorHandler(); diff --git a/packages/opentelemetry-core/src/common/logging-error-handler.ts b/packages/opentelemetry-core/src/common/logging-error-handler.ts index 813b07e4fd7..a9570db4aec 100644 --- a/packages/opentelemetry-core/src/common/logging-error-handler.ts +++ b/packages/opentelemetry-core/src/common/logging-error-handler.ts @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { diag, Exception } from '@opentelemetry/api'; -import { ErrorHandler } from './types'; +import type { Exception } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; +import type { ErrorHandler } from './types'; /** * Returns a function that logs an error using the provided logger, or a diff --git a/packages/opentelemetry-core/src/common/time.ts b/packages/opentelemetry-core/src/common/time.ts index 7b188d94a92..21402c319a9 100644 --- a/packages/opentelemetry-core/src/common/time.ts +++ b/packages/opentelemetry-core/src/common/time.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as api from '@opentelemetry/api'; +import type * as api from '@opentelemetry/api'; import { otperformance as performance } from '../platform'; const NANOSECOND_DIGITS = 9; diff --git a/packages/opentelemetry-core/src/common/types.ts b/packages/opentelemetry-core/src/common/types.ts index 62169e802fa..dacb477f694 100644 --- a/packages/opentelemetry-core/src/common/types.ts +++ b/packages/opentelemetry-core/src/common/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Exception } from '@opentelemetry/api'; +import type { Exception } from '@opentelemetry/api'; /** * This interface defines the params that are be added to the wrapped function diff --git a/packages/opentelemetry-core/src/internal/exporter.ts b/packages/opentelemetry-core/src/internal/exporter.ts index 29b60ff51a1..0124bba161e 100644 --- a/packages/opentelemetry-core/src/internal/exporter.ts +++ b/packages/opentelemetry-core/src/internal/exporter.ts @@ -4,7 +4,7 @@ */ import { context } from '@opentelemetry/api'; -import { ExportResult } from '../ExportResult'; +import type { ExportResult } from '../ExportResult'; import { suppressTracing } from '../trace/suppress-tracing'; export interface Exporter { diff --git a/packages/opentelemetry-core/src/propagation/composite.ts b/packages/opentelemetry-core/src/propagation/composite.ts index 022362b2d8c..569c5d832e6 100644 --- a/packages/opentelemetry-core/src/propagation/composite.ts +++ b/packages/opentelemetry-core/src/propagation/composite.ts @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, TextMapGetter, TextMapPropagator, - diag, TextMapSetter, } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; /** Configuration object for composite propagator */ export interface CompositePropagatorConfig { diff --git a/packages/opentelemetry-core/src/trace/TraceState.ts b/packages/opentelemetry-core/src/trace/TraceState.ts index 085fbaf05c0..341613a2281 100644 --- a/packages/opentelemetry-core/src/trace/TraceState.ts +++ b/packages/opentelemetry-core/src/trace/TraceState.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as api from '@opentelemetry/api'; +import type * as api from '@opentelemetry/api'; import { validateKey, validateValue } from '../internal/validators'; const MAX_TRACE_STATE_ITEMS = 32; diff --git a/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts b/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts index d83e04bfffe..d2c38844e6f 100644 --- a/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts +++ b/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts @@ -3,16 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, - isSpanContextValid, SpanContext, TextMapGetter, TextMapPropagator, TextMapSetter, - trace, - TraceFlags, } from '@opentelemetry/api'; +import { isSpanContextValid, trace, TraceFlags } from '@opentelemetry/api'; import { isTracingSuppressed } from './suppress-tracing'; import { TraceState } from './TraceState'; diff --git a/packages/opentelemetry-core/src/trace/rpc-metadata.ts b/packages/opentelemetry-core/src/trace/rpc-metadata.ts index ae239681ce3..7cd70755db9 100644 --- a/packages/opentelemetry-core/src/trace/rpc-metadata.ts +++ b/packages/opentelemetry-core/src/trace/rpc-metadata.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, createContextKey, Span } from '@opentelemetry/api'; +import type { Context, Span } from '@opentelemetry/api'; +import { createContextKey } from '@opentelemetry/api'; const RPC_METADATA_KEY = createContextKey( 'OpenTelemetry SDK Context Key RPC_METADATA' diff --git a/packages/opentelemetry-core/src/trace/suppress-tracing.ts b/packages/opentelemetry-core/src/trace/suppress-tracing.ts index 90dadef14e5..c4e5ceabcef 100644 --- a/packages/opentelemetry-core/src/trace/suppress-tracing.ts +++ b/packages/opentelemetry-core/src/trace/suppress-tracing.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, createContextKey } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { createContextKey } from '@opentelemetry/api'; const SUPPRESS_TRACING_KEY = createContextKey( 'OpenTelemetry SDK Context Key SUPPRESS_TRACING' diff --git a/packages/opentelemetry-core/test/common/baggage/W3CBaggagePropagator.test.ts b/packages/opentelemetry-core/test/common/baggage/W3CBaggagePropagator.test.ts index 863a55959d6..ab4f21d00da 100644 --- a/packages/opentelemetry-core/test/common/baggage/W3CBaggagePropagator.test.ts +++ b/packages/opentelemetry-core/test/common/baggage/W3CBaggagePropagator.test.ts @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { Baggage, BaggageEntry } from '@opentelemetry/api'; import { - Baggage, - BaggageEntry, defaultTextMapGetter, defaultTextMapSetter, propagation, diff --git a/packages/opentelemetry-core/test/common/global-error-handler.test.ts b/packages/opentelemetry-core/test/common/global-error-handler.test.ts index 47c0d703bb8..45a9ec8e88c 100644 --- a/packages/opentelemetry-core/test/common/global-error-handler.test.ts +++ b/packages/opentelemetry-core/test/common/global-error-handler.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { globalErrorHandler, setGlobalErrorHandler } from '../../src'; -import { Exception } from '@opentelemetry/api'; +import type { Exception } from '@opentelemetry/api'; describe('globalErrorHandler', () => { let defaultHandler: sinon.SinonSpy; diff --git a/packages/opentelemetry-core/test/common/internal/exporter.test.ts b/packages/opentelemetry-core/test/common/internal/exporter.test.ts index 38e78fac2bd..e1ad15e153e 100644 --- a/packages/opentelemetry-core/test/common/internal/exporter.test.ts +++ b/packages/opentelemetry-core/test/common/internal/exporter.test.ts @@ -5,7 +5,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { ExportResult, ExportResultCode } from '../../../src'; +import type { ExportResult } from '../../../src'; +import { ExportResultCode } from '../../../src'; import * as suppress from '../../../src/trace/suppress-tracing'; import { _export } from '../../../src/internal/exporter'; diff --git a/packages/opentelemetry-core/test/common/logging-error-handler.test.ts b/packages/opentelemetry-core/test/common/logging-error-handler.test.ts index 1dfc7e3bff3..a7db1ad1f48 100644 --- a/packages/opentelemetry-core/test/common/logging-error-handler.test.ts +++ b/packages/opentelemetry-core/test/common/logging-error-handler.test.ts @@ -6,7 +6,8 @@ import { diag } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { ErrorHandler, loggingErrorHandler } from '../../src'; +import type { ErrorHandler } from '../../src'; +import { loggingErrorHandler } from '../../src'; describe('loggingErrorHandler', () => { let handler: ErrorHandler; diff --git a/packages/opentelemetry-core/test/common/propagation/composite.test.ts b/packages/opentelemetry-core/test/common/propagation/composite.test.ts index fab409b0e09..ed135cb92ff 100644 --- a/packages/opentelemetry-core/test/common/propagation/composite.test.ts +++ b/packages/opentelemetry-core/test/common/propagation/composite.test.ts @@ -3,16 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - defaultTextMapGetter, - defaultTextMapSetter, +import type { TextMapPropagator, SpanContext, TextMapGetter, TextMapSetter, +} from '@opentelemetry/api'; +import { + defaultTextMapGetter, + defaultTextMapSetter, trace, } from '@opentelemetry/api'; -import { Context, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; import * as assert from 'assert'; import { CompositePropagator, W3CTraceContextPropagator } from '../../../src'; import { diff --git a/packages/opentelemetry-core/test/common/time.test.ts b/packages/opentelemetry-core/test/common/time.test.ts index 922d7eb7e91..ca8ff353c28 100644 --- a/packages/opentelemetry-core/test/common/time.test.ts +++ b/packages/opentelemetry-core/test/common/time.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { otperformance as performance } from '../../src/platform'; import * as sinon from 'sinon'; -import * as api from '@opentelemetry/api'; +import type * as api from '@opentelemetry/api'; import { getTimeOrigin, hrTime, diff --git a/packages/opentelemetry-core/test/common/trace/W3CTraceContextPropagator.test.ts b/packages/opentelemetry-core/test/common/trace/W3CTraceContextPropagator.test.ts index d82184366e3..0699d6f711d 100644 --- a/packages/opentelemetry-core/test/common/trace/W3CTraceContextPropagator.test.ts +++ b/packages/opentelemetry-core/test/common/trace/W3CTraceContextPropagator.test.ts @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { defaultTextMapGetter, defaultTextMapSetter, INVALID_SPANID, INVALID_TRACEID, ROOT_CONTEXT, - SpanContext, trace, TraceFlags, } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts index 14c90a10dff..fee0ff67ac6 100644 --- a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts +++ b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts @@ -4,14 +4,14 @@ */ import { diag } from '@opentelemetry/api'; +import type { ExportResult } from '@opentelemetry/core'; import { BindOnceFuture, - ExportResult, ExportResultCode, getNumberFromEnv, getStringFromEnv, } from '@opentelemetry/core'; -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; import { Socket } from 'dgram'; import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; import { spanToThrift } from './transform'; diff --git a/packages/opentelemetry-exporter-jaeger/src/transform.ts b/packages/opentelemetry-exporter-jaeger/src/transform.ts index 0fe6774dfa8..fef3dee0de6 100644 --- a/packages/opentelemetry-exporter-jaeger/src/transform.ts +++ b/packages/opentelemetry-exporter-jaeger/src/transform.ts @@ -3,24 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Link, SpanStatusCode, SpanKind } from '@opentelemetry/api'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { Link } from '@opentelemetry/api'; +import { SpanStatusCode, SpanKind } from '@opentelemetry/api'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { hrTimeToMilliseconds, hrTimeToMicroseconds, } from '@opentelemetry/core'; -import { +import type { ThriftSpan, Tag, Log, ThriftTag, ThriftLog, - ThriftUtils, - Utils, ThriftReference, TagValue, - ThriftReferenceType, } from './types'; +import { ThriftUtils, Utils, ThriftReferenceType } from './types'; const DEFAULT_FLAGS = 0x1; diff --git a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts index 5d33aba7537..f1df5312bd5 100644 --- a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts +++ b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts @@ -5,10 +5,11 @@ import * as assert from 'assert'; import { JaegerExporter } from '../src'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; import * as api from '@opentelemetry/api'; -import { ThriftProcess } from '../src/types'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ThriftProcess } from '../src/types'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { TraceFlags } from '@opentelemetry/api'; import { resourceFromAttributes } from '@opentelemetry/resources'; import * as nock from 'nock'; diff --git a/packages/opentelemetry-exporter-jaeger/test/transform.test.ts b/packages/opentelemetry-exporter-jaeger/test/transform.test.ts index 0c324571101..40c50bf1520 100644 --- a/packages/opentelemetry-exporter-jaeger/test/transform.test.ts +++ b/packages/opentelemetry-exporter-jaeger/test/transform.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { spanToThrift } from '../src/transform'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { emptyResource, resourceFromAttributes, diff --git a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts index a74219cb2c7..af95c7ccd84 100644 --- a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts +++ b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts @@ -4,12 +4,9 @@ */ import { diag } from '@opentelemetry/api'; -import { - ExportResult, - ExportResultCode, - globalErrorHandler, -} from '@opentelemetry/core'; -import * as zipkinTypes from '../../types'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode, globalErrorHandler } from '@opentelemetry/core'; +import type * as zipkinTypes from '../../types'; /** * Prepares send function that will send spans to the remote Zipkin service. diff --git a/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts b/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts index 5fd4d20f85f..ad85e3b94cd 100644 --- a/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts +++ b/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts @@ -4,10 +4,11 @@ */ import { diag } from '@opentelemetry/api'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; import * as http from 'http'; import * as https from 'https'; -import * as zipkinTypes from '../../types'; +import type * as zipkinTypes from '../../types'; /** * Prepares send function that will send spans to the remote Zipkin service. diff --git a/packages/opentelemetry-exporter-zipkin/src/transform.ts b/packages/opentelemetry-exporter-zipkin/src/transform.ts index 0a84ffc8f26..1b93c723786 100644 --- a/packages/opentelemetry-exporter-zipkin/src/transform.ts +++ b/packages/opentelemetry-exporter-zipkin/src/transform.ts @@ -4,7 +4,7 @@ */ import * as api from '@opentelemetry/api'; -import { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base'; import { hrTimeToMicroseconds } from '@opentelemetry/core'; import * as zipkinTypes from './types'; diff --git a/packages/opentelemetry-exporter-zipkin/src/types.ts b/packages/opentelemetry-exporter-zipkin/src/types.ts index 03c4bb3e6cd..186d9a04d11 100644 --- a/packages/opentelemetry-exporter-zipkin/src/types.ts +++ b/packages/opentelemetry-exporter-zipkin/src/types.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; /** * Exporter config diff --git a/packages/opentelemetry-exporter-zipkin/src/utils.ts b/packages/opentelemetry-exporter-zipkin/src/utils.ts index 8b2e758f129..572d4399de5 100644 --- a/packages/opentelemetry-exporter-zipkin/src/utils.ts +++ b/packages/opentelemetry-exporter-zipkin/src/utils.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { GetHeaders } from './types'; +import type { GetHeaders } from './types'; export function prepareGetHeaders( getExportRequestHeaders: GetHeaders diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts index 7bf1228db08..38a19befd1c 100644 --- a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts +++ b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts @@ -4,14 +4,11 @@ */ import { diag } from '@opentelemetry/api'; -import { - ExportResult, - ExportResultCode, - getStringFromEnv, -} from '@opentelemetry/core'; -import { SpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode, getStringFromEnv } from '@opentelemetry/core'; +import type { SpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { prepareSend } from './platform/index'; -import * as zipkinTypes from './types'; +import type * as zipkinTypes from './types'; import { toZipkinSpan, defaultStatusCodeTagName, diff --git a/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts index f76e237b2bb..23f402947f1 100644 --- a/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts @@ -7,11 +7,11 @@ import { setGlobalErrorHandler, loggingErrorHandler, } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { ZipkinExporter } from '../../src'; -import * as zipkinTypes from '../../src/types'; +import type * as zipkinTypes from '../../src/types'; import { ensureHeadersContain, ensureSpanIsCorrect, diff --git a/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts b/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts index 7b7f3903f9c..7565e1e90c9 100644 --- a/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts @@ -10,8 +10,8 @@ import { hrTimeToMicroseconds, millisToHrTime, } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { Resource } from '@opentelemetry/resources'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; import { @@ -21,7 +21,7 @@ import { _toZipkinAnnotations, _toZipkinTags, } from '../../src/transform'; -import * as zipkinTypes from '../../src/types'; +import type * as zipkinTypes from '../../src/types'; import { VERSION } from '../../src/version'; const resource = { diff --git a/packages/opentelemetry-exporter-zipkin/test/helper.ts b/packages/opentelemetry-exporter-zipkin/test/helper.ts index 142e0cb65a7..7025733c5ff 100644 --- a/packages/opentelemetry-exporter-zipkin/test/helper.ts +++ b/packages/opentelemetry-exporter-zipkin/test/helper.ts @@ -4,9 +4,9 @@ */ import { TraceFlags, SpanStatusCode } from '@opentelemetry/api'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; -import { Span } from '../src/types'; +import type { Span } from '../src/types'; import { resourceFromAttributes } from '@opentelemetry/resources'; export const mockedReadableSpan: ReadableSpan = { diff --git a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts index 04e1c08171a..7d256f1f761 100644 --- a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts @@ -5,19 +5,16 @@ import * as assert from 'assert'; import * as nock from 'nock'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import { - ExportResult, - hrTimeToMicroseconds, - ExportResultCode, -} from '@opentelemetry/core'; +import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { ExportResult } from '@opentelemetry/core'; +import { hrTimeToMicroseconds, ExportResultCode } from '@opentelemetry/core'; import * as api from '@opentelemetry/api'; import { emptyResource, resourceFromAttributes, } from '@opentelemetry/resources'; import { ZipkinExporter } from '../../src'; -import * as zipkinTypes from '../../src/types'; +import type * as zipkinTypes from '../../src/types'; import { TraceFlags } from '@opentelemetry/api'; import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; diff --git a/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts b/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts index abb4daf56ab..78d83f3ee1c 100644 --- a/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts @@ -3,15 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, + TextMapGetter, + TextMapPropagator, + TextMapSetter, +} from '@opentelemetry/api'; +import { isSpanContextValid, isValidSpanId, isValidTraceId, trace, - TextMapGetter, - TextMapPropagator, - TextMapSetter, TraceFlags, } from '@opentelemetry/api'; import { isTracingSuppressed } from '@opentelemetry/core'; diff --git a/packages/opentelemetry-propagator-b3/src/B3Propagator.ts b/packages/opentelemetry-propagator-b3/src/B3Propagator.ts index 2b7163c5cc3..de055f49257 100644 --- a/packages/opentelemetry-propagator-b3/src/B3Propagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3Propagator.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, TextMapGetter, TextMapPropagator, @@ -13,7 +13,8 @@ import { isTracingSuppressed } from '@opentelemetry/core'; import { B3MultiPropagator } from './B3MultiPropagator'; import { B3SinglePropagator } from './B3SinglePropagator'; import { B3_CONTEXT_HEADER } from './constants'; -import { B3InjectEncoding, B3PropagatorConfig } from './types'; +import type { B3PropagatorConfig } from './types'; +import { B3InjectEncoding } from './types'; /** * Propagator that extracts B3 context in both single and multi-header variants, diff --git a/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts b/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts index c51f2374d9a..6e59f186e1e 100644 --- a/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts @@ -3,14 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, - isSpanContextValid, - isValidSpanId, - isValidTraceId, TextMapGetter, TextMapPropagator, TextMapSetter, +} from '@opentelemetry/api'; +import { + isSpanContextValid, + isValidSpanId, + isValidTraceId, trace, TraceFlags, } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts b/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts index acc1f0fd4bf..4ff1168275b 100644 --- a/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts +++ b/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { defaultTextMapGetter, defaultTextMapSetter, - SpanContext, trace, TraceFlags, } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts b/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts index 051cc67acdb..ce584933c21 100644 --- a/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts +++ b/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { defaultTextMapGetter, defaultTextMapSetter, - SpanContext, TraceFlags, ROOT_CONTEXT, trace, diff --git a/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts b/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts index dd0690177bb..1d74ccb3238 100644 --- a/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts +++ b/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { defaultTextMapGetter, defaultTextMapSetter, INVALID_SPANID, INVALID_TRACEID, ROOT_CONTEXT, - SpanContext, TraceFlags, trace, } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts b/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts index 789468f8ac7..dc81cccf45c 100644 --- a/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts +++ b/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts @@ -3,18 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, SpanContext, TextMapGetter, TextMapPropagator, TextMapSetter, - propagation, - trace, - TraceFlags, } from '@opentelemetry/api'; +import { propagation, trace, TraceFlags } from '@opentelemetry/api'; import { isTracingSuppressed } from '@opentelemetry/core'; -import { JaegerPropagatorConfig } from './types'; +import type { JaegerPropagatorConfig } from './types'; export const UBER_TRACE_ID_HEADER = 'uber-trace-id'; export const UBER_BAGGAGE_HEADER_PREFIX = 'uberctx'; diff --git a/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts b/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts index 88247fdcb0b..76fe58cf38d 100644 --- a/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts +++ b/packages/opentelemetry-propagator-jaeger/test/JaegerPropagator.test.ts @@ -3,13 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext, TextMapGetter } from '@opentelemetry/api'; import { defaultTextMapGetter, defaultTextMapSetter, propagation, ROOT_CONTEXT, - SpanContext, - TextMapGetter, trace, TraceFlags, } from '@opentelemetry/api'; diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts index cb54b163e77..ddee3eb6407 100644 --- a/packages/opentelemetry-resources/src/Resource.ts +++ b/packages/opentelemetry-resources/src/Resource.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes } from '@opentelemetry/api'; -import { RawResourceAttribute } from './types'; +import type { Attributes } from '@opentelemetry/api'; +import type { RawResourceAttribute } from './types'; /** * An interface that represents a resource. A Resource describes the entity for which signals (metrics or trace) are diff --git a/packages/opentelemetry-resources/src/ResourceImpl.ts b/packages/opentelemetry-resources/src/ResourceImpl.ts index 2f95b810a0a..bd8abc566d8 100644 --- a/packages/opentelemetry-resources/src/ResourceImpl.ts +++ b/packages/opentelemetry-resources/src/ResourceImpl.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, AttributeValue, diag } from '@opentelemetry/api'; +import type { Attributes, AttributeValue } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; import { SDK_INFO } from '@opentelemetry/core'; import { ATTR_SERVICE_NAME, @@ -11,9 +12,9 @@ import { ATTR_TELEMETRY_SDK_NAME, ATTR_TELEMETRY_SDK_VERSION, } from '@opentelemetry/semantic-conventions'; -import { Resource } from './Resource'; +import type { Resource } from './Resource'; import { defaultServiceName } from './default-service-name'; -import { +import type { DetectedResource, DetectedResourceAttributes, MaybePromise, diff --git a/packages/opentelemetry-resources/src/detect-resources.ts b/packages/opentelemetry-resources/src/detect-resources.ts index ceeac51a185..45bd159288f 100644 --- a/packages/opentelemetry-resources/src/detect-resources.ts +++ b/packages/opentelemetry-resources/src/detect-resources.ts @@ -4,9 +4,9 @@ */ import { diag } from '@opentelemetry/api'; -import { Resource } from './Resource'; +import type { Resource } from './Resource'; import { emptyResource, resourceFromDetectedResource } from './ResourceImpl'; -import { ResourceDetectionConfig } from './config'; +import type { ResourceDetectionConfig } from './config'; /** * Runs all resource detectors and returns the results merged into a single Resource. diff --git a/packages/opentelemetry-resources/src/detectors/EnvDetector.ts b/packages/opentelemetry-resources/src/detectors/EnvDetector.ts index dce43858acc..0b3a1c2632f 100644 --- a/packages/opentelemetry-resources/src/detectors/EnvDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/EnvDetector.ts @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, diag } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; -import { ResourceDetectionConfig } from '../config'; -import { DetectedResource, ResourceDetector } from '../types'; +import type { ResourceDetectionConfig } from '../config'; +import type { DetectedResource, ResourceDetector } from '../types'; import { getStringFromEnv } from '@opentelemetry/core'; /** diff --git a/packages/opentelemetry-resources/src/detectors/NoopDetector.ts b/packages/opentelemetry-resources/src/detectors/NoopDetector.ts index 53662bad617..49004bf494c 100644 --- a/packages/opentelemetry-resources/src/detectors/NoopDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/NoopDetector.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { DetectedResource, ResourceDetector } from '../types'; +import type { DetectedResource, ResourceDetector } from '../types'; export class NoopDetector implements ResourceDetector { detect(): DetectedResource { diff --git a/packages/opentelemetry-resources/src/detectors/platform/node/HostDetector.ts b/packages/opentelemetry-resources/src/detectors/platform/node/HostDetector.ts index 83cf0d5d6de..c30455aa2a6 100644 --- a/packages/opentelemetry-resources/src/detectors/platform/node/HostDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/platform/node/HostDetector.ts @@ -5,8 +5,8 @@ import { ATTR_HOST_ARCH, ATTR_HOST_ID, ATTR_HOST_NAME } from '../../../semconv'; import { arch, hostname } from 'os'; -import { ResourceDetectionConfig } from '../../../config'; -import { +import type { ResourceDetectionConfig } from '../../../config'; +import type { DetectedResource, DetectedResourceAttributes, ResourceDetector, diff --git a/packages/opentelemetry-resources/src/detectors/platform/node/OSDetector.ts b/packages/opentelemetry-resources/src/detectors/platform/node/OSDetector.ts index d3730563680..5bcf70c5df4 100644 --- a/packages/opentelemetry-resources/src/detectors/platform/node/OSDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/platform/node/OSDetector.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; import { ATTR_OS_TYPE, ATTR_OS_VERSION } from '../../../semconv'; import { platform, release } from 'os'; -import { ResourceDetectionConfig } from '../../../config'; -import { DetectedResource, ResourceDetector } from '../../../types'; +import type { ResourceDetectionConfig } from '../../../config'; +import type { DetectedResource, ResourceDetector } from '../../../types'; import { normalizeType } from './utils'; /** diff --git a/packages/opentelemetry-resources/src/detectors/platform/node/ProcessDetector.ts b/packages/opentelemetry-resources/src/detectors/platform/node/ProcessDetector.ts index 4c2a04cae1d..f0dd514697a 100644 --- a/packages/opentelemetry-resources/src/detectors/platform/node/ProcessDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/platform/node/ProcessDetector.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes, diag } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; import { ATTR_PROCESS_COMMAND, ATTR_PROCESS_COMMAND_ARGS, @@ -16,8 +17,8 @@ import { ATTR_PROCESS_RUNTIME_VERSION, } from '../../../semconv'; import * as os from 'os'; -import { ResourceDetectionConfig } from '../../../config'; -import { DetectedResource, ResourceDetector } from '../../../types'; +import type { ResourceDetectionConfig } from '../../../config'; +import type { DetectedResource, ResourceDetector } from '../../../types'; /** * ProcessDetector will be used to detect the resources related current process running diff --git a/packages/opentelemetry-resources/src/detectors/platform/node/ServiceInstanceIdDetector.ts b/packages/opentelemetry-resources/src/detectors/platform/node/ServiceInstanceIdDetector.ts index bee7f1092f6..1f868a6e043 100644 --- a/packages/opentelemetry-resources/src/detectors/platform/node/ServiceInstanceIdDetector.ts +++ b/packages/opentelemetry-resources/src/detectors/platform/node/ServiceInstanceIdDetector.ts @@ -5,8 +5,8 @@ import { ATTR_SERVICE_INSTANCE_ID } from '../../../semconv'; import { randomUUID } from 'crypto'; -import { ResourceDetectionConfig } from '../../../config'; -import { DetectedResource, ResourceDetector } from '../../../types'; +import type { ResourceDetectionConfig } from '../../../config'; +import type { DetectedResource, ResourceDetector } from '../../../types'; /** * ServiceInstanceIdDetector detects the resources related to the service instance ID. diff --git a/packages/opentelemetry-resources/src/types.ts b/packages/opentelemetry-resources/src/types.ts index ebb28963567..41a09b2476f 100644 --- a/packages/opentelemetry-resources/src/types.ts +++ b/packages/opentelemetry-resources/src/types.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { AttributeValue } from '@opentelemetry/api'; -import { ResourceDetectionConfig } from './config'; +import type { AttributeValue } from '@opentelemetry/api'; +import type { ResourceDetectionConfig } from './config'; /** * Interface for a Resource Detector. diff --git a/packages/opentelemetry-resources/test/detect-resources.test.ts b/packages/opentelemetry-resources/test/detect-resources.test.ts index 57d8407c343..6a10cf9da06 100644 --- a/packages/opentelemetry-resources/test/detect-resources.test.ts +++ b/packages/opentelemetry-resources/test/detect-resources.test.ts @@ -6,7 +6,8 @@ import { diag } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { detectResources, ResourceDetector } from '../src'; +import type { ResourceDetector } from '../src'; +import { detectResources } from '../src'; import { isPromiseLike } from '../src/utils'; import { describeNode } from './util'; diff --git a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts index e8d63d571b2..cd76b532304 100644 --- a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts +++ b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts @@ -6,7 +6,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; import { promises as fs } from 'fs'; -import { PromiseWithChild } from 'child_process'; +import type { PromiseWithChild } from 'child_process'; import * as util from '../../../../src/detectors/platform/node/machine-id/execAsync'; import { getMachineId } from '../../../../src/detectors/platform/node/machine-id/getMachineId-bsd'; diff --git a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts index 32014ee7678..caff20e3528 100644 --- a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts +++ b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts @@ -5,7 +5,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { PromiseWithChild } from 'child_process'; +import type { PromiseWithChild } from 'child_process'; import * as util from '../../../../src/detectors/platform/node/machine-id/execAsync'; import { getMachineId } from '../../../../src/detectors/platform/node/machine-id/getMachineId-darwin'; diff --git a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts index fe564b35565..8f21fd33af5 100644 --- a/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts +++ b/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts @@ -5,7 +5,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { PromiseWithChild } from 'child_process'; +import type { PromiseWithChild } from 'child_process'; import * as util from '../../../../src/detectors/platform/node/machine-id/execAsync'; import { getMachineId } from '../../../../src/detectors/platform/node/machine-id/getMachineId-win'; diff --git a/packages/opentelemetry-resources/test/util/resource-assertions.ts b/packages/opentelemetry-resources/test/util/resource-assertions.ts index bb0c1551fd2..56fcec51aa8 100644 --- a/packages/opentelemetry-resources/test/util/resource-assertions.ts +++ b/packages/opentelemetry-resources/test/util/resource-assertions.ts @@ -48,7 +48,7 @@ import { ATTR_WEBENGINE_NAME, ATTR_WEBENGINE_VERSION, } from '../../src/semconv'; -import { DetectedResource } from '../../src/types'; +import type { DetectedResource } from '../../src/types'; /** * Test utility method to validate a cloud resource diff --git a/packages/opentelemetry-resources/test/util/sample-detector.ts b/packages/opentelemetry-resources/test/util/sample-detector.ts index a6f70da07c5..0e2d8108e99 100644 --- a/packages/opentelemetry-resources/test/util/sample-detector.ts +++ b/packages/opentelemetry-resources/test/util/sample-detector.ts @@ -11,8 +11,8 @@ import { ATTR_HOST_ID, ATTR_HOST_TYPE, } from '../../src/semconv'; -import { ResourceDetector } from '../../src'; -import { DetectedResource } from '../../src/types'; +import type { ResourceDetector } from '../../src'; +import type { DetectedResource } from '../../src/types'; class SampleDetector implements ResourceDetector { detect(): DetectedResource { diff --git a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts index bebbb594b23..d8a8ac22e62 100644 --- a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts @@ -3,14 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TracerProvider, Tracer as ApiTracer } from '@opentelemetry/api'; +import type { TracerProvider, Tracer as ApiTracer } from '@opentelemetry/api'; import { merge } from '@opentelemetry/core'; -import { defaultResource, Resource } from '@opentelemetry/resources'; -import { SpanProcessor } from './SpanProcessor'; +import type { Resource } from '@opentelemetry/resources'; +import { defaultResource } from '@opentelemetry/resources'; +import type { SpanProcessor } from './SpanProcessor'; import { Tracer } from './Tracer'; import { loadDefaultConfig } from './config'; import { MultiSpanProcessor } from './MultiSpanProcessor'; -import { TracerConfig } from './types'; +import type { TracerConfig } from './types'; import { reconfigureLimits } from './utility'; export enum ForceFlushState { diff --git a/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts index c5795d6a17c..7d7247bc317 100644 --- a/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; import { globalErrorHandler } from '@opentelemetry/core'; -import { ReadableSpan } from './export/ReadableSpan'; -import { Span } from './Span'; -import { SpanProcessor } from './SpanProcessor'; +import type { ReadableSpan } from './export/ReadableSpan'; +import type { Span } from './Span'; +import type { SpanProcessor } from './SpanProcessor'; /** * Implementation of the {@link SpanProcessor} that simply forwards all diff --git a/packages/opentelemetry-sdk-trace-base/src/Sampler.ts b/packages/opentelemetry-sdk-trace-base/src/Sampler.ts index 622bacaab68..68bdab8214e 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Sampler.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Sampler.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, Link, Attributes, diff --git a/packages/opentelemetry-sdk-trace-base/src/Span.ts b/packages/opentelemetry-sdk-trace-base/src/Span.ts index b9796aac302..f276f1ceb34 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Span.ts @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, - diag, Exception, HrTime, Link, @@ -15,32 +14,32 @@ import { SpanContext, SpanKind, SpanStatus, - SpanStatusCode, TimeInput, } from '@opentelemetry/api'; +import { diag, SpanStatusCode } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; import { addHrTimes, millisToHrTime, hrTime, hrTimeDuration, - InstrumentationScope, isAttributeValue, isTimeInput, isTimeInputHrTime, otperformance, sanitizeAttributes, } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; import { ATTR_EXCEPTION_MESSAGE, ATTR_EXCEPTION_STACKTRACE, ATTR_EXCEPTION_TYPE, } from '@opentelemetry/semantic-conventions'; -import { ReadableSpan } from './export/ReadableSpan'; +import type { ReadableSpan } from './export/ReadableSpan'; import { ExceptionEventName } from './enums'; -import { SpanProcessor } from './SpanProcessor'; -import { TimedEvent } from './TimedEvent'; -import { SpanLimits } from './types'; +import type { SpanProcessor } from './SpanProcessor'; +import type { TimedEvent } from './TimedEvent'; +import type { SpanLimits } from './types'; /** * This type provides the properties of @link{ReadableSpan} at the same time diff --git a/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts index ee0e26580c7..4d3b715b00a 100644 --- a/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; -import { ReadableSpan } from './export/ReadableSpan'; -import { Span } from './Span'; +import type { Context } from '@opentelemetry/api'; +import type { ReadableSpan } from './export/ReadableSpan'; +import type { Span } from './Span'; /** * SpanProcessor is the interface Tracer SDK uses to allow synchronous hooks diff --git a/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts b/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts index 20e65e5b51d..0913a7412c4 100644 --- a/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts +++ b/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, Attributes } from '@opentelemetry/api'; +import type { HrTime, Attributes } from '@opentelemetry/api'; /** * Represents a timed event. diff --git a/packages/opentelemetry-sdk-trace-base/src/Tracer.ts b/packages/opentelemetry-sdk-trace-base/src/Tracer.ts index 7b64c401475..1c6a4c2a98f 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Tracer.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Tracer.ts @@ -4,19 +4,16 @@ */ import * as api from '@opentelemetry/api'; -import { - InstrumentationScope, - sanitizeAttributes, - isTracingSuppressed, -} from '@opentelemetry/core'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import { sanitizeAttributes, isTracingSuppressed } from '@opentelemetry/core'; import { SpanImpl } from './Span'; -import { GeneralLimits, SpanLimits, TracerConfig } from './types'; +import type { GeneralLimits, SpanLimits, TracerConfig } from './types'; import { mergeConfig } from './utility'; -import { SpanProcessor } from './SpanProcessor'; -import { Sampler } from './Sampler'; -import { IdGenerator } from './IdGenerator'; +import type { SpanProcessor } from './SpanProcessor'; +import type { Sampler } from './Sampler'; +import type { IdGenerator } from './IdGenerator'; import { RandomIdGenerator } from './platform'; -import { Resource } from '@opentelemetry/resources'; +import type { Resource } from '@opentelemetry/resources'; import { TracerMetrics } from './TracerMetrics'; import { VERSION } from './version'; diff --git a/packages/opentelemetry-sdk-trace-base/src/TracerMetrics.ts b/packages/opentelemetry-sdk-trace-base/src/TracerMetrics.ts index baa8b26f5c3..b6b07dcc555 100644 --- a/packages/opentelemetry-sdk-trace-base/src/TracerMetrics.ts +++ b/packages/opentelemetry-sdk-trace-base/src/TracerMetrics.ts @@ -2,7 +2,12 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { Counter, Meter, SpanContext, UpDownCounter } from '@opentelemetry/api'; +import type { + Counter, + Meter, + SpanContext, + UpDownCounter, +} from '@opentelemetry/api'; import { SamplingDecision } from './Sampler'; import { ATTR_OTEL_SPAN_PARENT_ORIGIN, diff --git a/packages/opentelemetry-sdk-trace-base/src/config.ts b/packages/opentelemetry-sdk-trace-base/src/config.ts index 066b211a383..270c2129d8c 100644 --- a/packages/opentelemetry-sdk-trace-base/src/config.ts +++ b/packages/opentelemetry-sdk-trace-base/src/config.ts @@ -5,7 +5,7 @@ import { diag } from '@opentelemetry/api'; import { getNumberFromEnv, getStringFromEnv } from '@opentelemetry/core'; -import { Sampler } from './Sampler'; +import type { Sampler } from './Sampler'; import { AlwaysOffSampler } from './sampler/AlwaysOffSampler'; import { AlwaysOnSampler } from './sampler/AlwaysOnSampler'; import { ParentBasedSampler } from './sampler/ParentBasedSampler'; diff --git a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts index 5e20f0509c3..d05ee3aa86e 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { context, Context, diag, TraceFlags } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { context, diag, TraceFlags } from '@opentelemetry/api'; import { BindOnceFuture, ExportResultCode, @@ -11,11 +12,11 @@ import { globalErrorHandler, suppressTracing, } from '@opentelemetry/core'; -import { Span } from '../Span'; -import { SpanProcessor } from '../SpanProcessor'; -import { BufferConfig } from '../types'; -import { ReadableSpan } from './ReadableSpan'; -import { SpanExporter } from './SpanExporter'; +import type { Span } from '../Span'; +import type { SpanProcessor } from '../SpanProcessor'; +import type { BufferConfig } from '../types'; +import type { ReadableSpan } from './ReadableSpan'; +import type { SpanExporter } from './SpanExporter'; /** * Implementation of the {@link SpanProcessor} that batches spans exported by diff --git a/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts b/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts index 2aefb98f276..a513f62e901 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts @@ -3,13 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanExporter } from './SpanExporter'; -import { ReadableSpan } from './ReadableSpan'; -import { - ExportResult, - ExportResultCode, - hrTimeToMicroseconds, -} from '@opentelemetry/core'; +import type { SpanExporter } from './SpanExporter'; +import type { ReadableSpan } from './ReadableSpan'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode, hrTimeToMicroseconds } from '@opentelemetry/core'; /** * This is implementation of {@link SpanExporter} that prints spans to the diff --git a/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts b/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts index 297a65ead27..5211155db0a 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanExporter } from './SpanExporter'; -import { ReadableSpan } from './ReadableSpan'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import type { SpanExporter } from './SpanExporter'; +import type { ReadableSpan } from './ReadableSpan'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; /** * This class can be used for testing purposes. It stores the exported spans diff --git a/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts index 215026da44d..a732f694ad6 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context } from '@opentelemetry/api'; -import { ReadableSpan } from './ReadableSpan'; -import { Span } from '../Span'; -import { SpanProcessor } from '../SpanProcessor'; +import type { Context } from '@opentelemetry/api'; +import type { ReadableSpan } from './ReadableSpan'; +import type { Span } from '../Span'; +import type { SpanProcessor } from '../SpanProcessor'; /** No-op implementation of SpanProcessor */ export class NoopSpanProcessor implements SpanProcessor { diff --git a/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts b/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts index 56f22d41cf0..224ac633c97 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { SpanKind, SpanStatus, Attributes, @@ -11,9 +11,9 @@ import { Link, SpanContext, } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { TimedEvent } from '../TimedEvent'; +import type { Resource } from '@opentelemetry/resources'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { TimedEvent } from '../TimedEvent'; export interface ReadableSpan { readonly name: string; diff --git a/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts index 9334527898b..dceca3be24b 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts @@ -3,17 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, TraceFlags } from '@opentelemetry/api'; +import type { Context } from '@opentelemetry/api'; +import { TraceFlags } from '@opentelemetry/api'; import { internal, ExportResultCode, globalErrorHandler, BindOnceFuture, } from '@opentelemetry/core'; -import { Span } from '../Span'; -import { SpanProcessor } from '../SpanProcessor'; -import { ReadableSpan } from './ReadableSpan'; -import { SpanExporter } from './SpanExporter'; +import type { Span } from '../Span'; +import type { SpanProcessor } from '../SpanProcessor'; +import type { ReadableSpan } from './ReadableSpan'; +import type { SpanExporter } from './SpanExporter'; /** * An implementation of the {@link SpanProcessor} that converts the {@link Span} diff --git a/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts b/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts index 7302856a62e..64f268df829 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; -import { ReadableSpan } from './ReadableSpan'; +import type { ExportResult } from '@opentelemetry/core'; +import type { ReadableSpan } from './ReadableSpan'; /** * An interface that allows different tracing services to export recorded data diff --git a/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts b/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts index cf8783346b2..c6494645ca7 100644 --- a/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts +++ b/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { IdGenerator } from '../../IdGenerator'; +import type { IdGenerator } from '../../IdGenerator'; const TRACE_ID_BYTES = 16; const SPAN_ID_BYTES = 8; diff --git a/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts index cb8ef609636..f22424e256e 100644 --- a/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts @@ -4,8 +4,8 @@ */ import { BatchSpanProcessorBase } from '../../../export/BatchSpanProcessorBase'; -import { SpanExporter } from '../../../export/SpanExporter'; -import { BatchSpanProcessorBrowserConfig } from '../../../types'; +import type { SpanExporter } from '../../../export/SpanExporter'; +import type { BatchSpanProcessorBrowserConfig } from '../../../types'; import { globalErrorHandler } from '@opentelemetry/core'; export class BatchSpanProcessor extends BatchSpanProcessorBase { diff --git a/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts b/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts index 76151e7c57c..9d8ec69de1a 100644 --- a/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts +++ b/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { IdGenerator } from '../../IdGenerator'; +import type { IdGenerator } from '../../IdGenerator'; const SPAN_ID_BYTES = 8; const TRACE_ID_BYTES = 16; diff --git a/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts index 3129191aa00..1a272f30a59 100644 --- a/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts @@ -4,7 +4,7 @@ */ import { BatchSpanProcessorBase } from '../../../export/BatchSpanProcessorBase'; -import { BufferConfig } from '../../../types'; +import type { BufferConfig } from '../../../types'; export class BatchSpanProcessor extends BatchSpanProcessorBase { protected onShutdown(): void {} diff --git a/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts b/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts index 964b743fa6a..fcad5df5513 100644 --- a/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts +++ b/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Sampler, SamplingDecision, SamplingResult } from '../Sampler'; +import type { Sampler, SamplingResult } from '../Sampler'; +import { SamplingDecision } from '../Sampler'; /** Sampler that samples no traces. */ export class AlwaysOffSampler implements Sampler { diff --git a/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts b/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts index 8524cfc8c9c..550973fca78 100644 --- a/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts +++ b/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Sampler, SamplingDecision, SamplingResult } from '../Sampler'; +import type { Sampler, SamplingResult } from '../Sampler'; +import { SamplingDecision } from '../Sampler'; /** Sampler that samples all traces. */ export class AlwaysOnSampler implements Sampler { diff --git a/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts b/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts index 1e7c5170d35..7b2f7f8805c 100644 --- a/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts +++ b/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts @@ -3,19 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Context, - isSpanContextValid, - Link, - Attributes, - SpanKind, - TraceFlags, - trace, -} from '@opentelemetry/api'; +import type { Context, Link, Attributes, SpanKind } from '@opentelemetry/api'; +import { isSpanContextValid, TraceFlags, trace } from '@opentelemetry/api'; import { globalErrorHandler } from '@opentelemetry/core'; import { AlwaysOffSampler } from './AlwaysOffSampler'; import { AlwaysOnSampler } from './AlwaysOnSampler'; -import { Sampler, SamplingResult } from '../Sampler'; +import type { Sampler, SamplingResult } from '../Sampler'; /** * A composite sampler that either respects the parent span's sampling decision diff --git a/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts b/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts index 2e1fa011a0b..22527c9e959 100644 --- a/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts +++ b/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts @@ -4,7 +4,8 @@ */ import { isValidTraceId } from '@opentelemetry/api'; -import { Sampler, SamplingDecision, SamplingResult } from '../Sampler'; +import type { Sampler, SamplingResult } from '../Sampler'; +import { SamplingDecision } from '../Sampler'; /** Sampler that samples a given fraction of traces based of trace id deterministically. */ export class TraceIdRatioBasedSampler implements Sampler { diff --git a/packages/opentelemetry-sdk-trace-base/src/utility.ts b/packages/opentelemetry-sdk-trace-base/src/utility.ts index f0f4d13d20e..d01fed69cb3 100644 --- a/packages/opentelemetry-sdk-trace-base/src/utility.ts +++ b/packages/opentelemetry-sdk-trace-base/src/utility.ts @@ -4,8 +4,8 @@ */ import { buildSamplerFromEnv, loadDefaultConfig } from './config'; -import { Sampler } from './Sampler'; -import { SpanLimits, TracerConfig, GeneralLimits } from './types'; +import type { Sampler } from './Sampler'; +import type { SpanLimits, TracerConfig, GeneralLimits } from './types'; import { getNumberFromEnv } from '@opentelemetry/core'; export const DEFAULT_ATTRIBUTE_COUNT_LIMIT = 128; diff --git a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.bench.ts b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.bench.ts index 230614fde54..cb5b2e981a6 100644 --- a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.bench.ts +++ b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.bench.ts @@ -4,13 +4,10 @@ */ import * as Benchmark from 'benchmark'; -import { - BasicTracerProvider, - BatchSpanProcessor, - SpanExporter, - ReadableSpan, -} from '../../../src'; -import { ExportResultCode, ExportResult } from '@opentelemetry/core'; +import type { SpanExporter, ReadableSpan } from '../../../src'; +import { BasicTracerProvider, BatchSpanProcessor } from '../../../src'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; class NoopExporter implements SpanExporter { export( diff --git a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts index 2dd48dab759..58898959391 100644 --- a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts @@ -4,9 +4,9 @@ */ import * as assert from 'assert'; -import { Suite } from 'mocha'; +import type { Suite } from 'mocha'; import * as sinon from 'sinon'; -import { SpanExporter } from '../../../src'; +import type { SpanExporter } from '../../../src'; import { BatchSpanProcessor } from '../../../src/platform/browser/export/BatchSpanProcessor'; import { TestTracingSpanExporter } from '../../common/export/TestTracingSpanExporter'; import { 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 5cbb6a2096b..64939a054de 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { context, trace, - SpanContext, TraceFlags, ROOT_CONTEXT, diag, @@ -19,10 +19,10 @@ import { import { MeterProvider } from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; +import type { Span } from '../../src'; import { BasicTracerProvider, NoopSpanProcessor, - Span, AlwaysOnSampler, AlwaysOffSampler, ConsoleSpanExporter, @@ -30,7 +30,7 @@ import { } from '../../src'; import { SpanImpl } from '../../src/Span'; import { MultiSpanProcessor } from '../../src/MultiSpanProcessor'; -import { Tracer } from '../../src/Tracer'; +import type { Tracer } from '../../src/Tracer'; import { TestRecordOnlySampler } from './export/TestRecordOnlySampler'; import { TestMetricReader } from './util'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts index a79d096f4d0..d898544d2fb 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts @@ -5,12 +5,11 @@ import * as assert from 'assert'; import * as Sinon from 'sinon'; +import type { Span, SpanProcessor } from '../../src'; import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor, - Span, - SpanProcessor, } from '../../src'; import { setGlobalErrorHandler, diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts index 9fbe7dd3a4e..db491c892a2 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts @@ -3,17 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { + Exception, + SpanContext, + HrTime, + Attributes, + AttributeValue, +} from '@opentelemetry/api'; import { diag, SpanStatusCode, - Exception, ROOT_CONTEXT, - SpanContext, SpanKind, TraceFlags, - HrTime, - Attributes, - AttributeValue, } from '@opentelemetry/api'; import { hrTimeDuration, @@ -28,10 +30,11 @@ import { } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { BasicTracerProvider, Span, SpanProcessor } from '../../src'; +import type { Span, SpanProcessor } from '../../src'; +import { BasicTracerProvider } from '../../src'; import { SpanImpl } from '../../src/Span'; import { invalidAttributes, validAttributes } from './util'; -import { Tracer } from '../../src/Tracer'; +import type { Tracer } from '../../src/Tracer'; import { DEFAULT_ATTRIBUTE_COUNT_LIMIT, DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT, 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 e145c91a143..4ac52106e66 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts @@ -2,35 +2,32 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Attributes, Context, + Link, + SpanContext, + TraceState, +} from '@opentelemetry/api'; +import { context, createContextKey, createTraceState, INVALID_TRACEID, - Link, ROOT_CONTEXT, - SpanContext, SpanKind, trace, TraceFlags, - TraceState, } from '@opentelemetry/api'; -import { - InstrumentationScope, - sanitizeAttributes, - suppressTracing, -} from '@opentelemetry/core'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import { sanitizeAttributes, suppressTracing } from '@opentelemetry/core'; import * as assert from 'assert'; +import type { Sampler, Span, SpanProcessor } from '../../src'; import { AlwaysOffSampler, AlwaysOnSampler, BasicTracerProvider, - Sampler, SamplingDecision, - Span, - SpanProcessor, } from '../../src'; import { TestStackContextManager } from './export/TestStackContextManager'; import * as sinon from 'sinon'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts index 80e78d42c93..49e5b40a813 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts @@ -4,23 +4,25 @@ */ import { diag, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { ExportResult } from '@opentelemetry/core'; import { - ExportResult, ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, } from '@opentelemetry/core'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { - AlwaysOnSampler, - BasicTracerProvider, +import type { BufferConfig, - InMemorySpanExporter, ReadableSpan, Span, SpanExporter, } from '../../../src'; +import { + AlwaysOnSampler, + BasicTracerProvider, + InMemorySpanExporter, +} from '../../../src'; import { context } from '@opentelemetry/api'; import { TestRecordOnlySampler } from './TestRecordOnlySampler'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts index d6702da73cb..5ed476b9e4d 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpanContext, TraceFlags } from '@opentelemetry/api'; +import type { SpanContext } from '@opentelemetry/api'; +import { TraceFlags } from '@opentelemetry/api'; import { TraceState } from '@opentelemetry/core'; import * as assert from 'assert'; import * as sinon from 'sinon'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts index 5a1ab34810f..c541395d4c5 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts @@ -10,7 +10,8 @@ import { BasicTracerProvider, } from '../../../src'; import { context, trace } from '@opentelemetry/api'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; describe('InMemorySpanExporter', () => { let memoryExporter: InMemorySpanExporter; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts index 2e12c8f8411..806059e8b09 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { SpanContext } from '@opentelemetry/api'; import { context, ROOT_CONTEXT, - SpanContext, SpanKind, TraceFlags, } from '@opentelemetry/api'; @@ -26,7 +26,7 @@ import { SpanImpl } from '../../../src/Span'; import { TestStackContextManager } from './TestStackContextManager'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; import { TestExporterWithDelay } from './TestExporterWithDelay'; -import { Tracer } from '../../../src/Tracer'; +import type { Tracer } from '../../../src/Tracer'; import { resourceFromAttributes } from '@opentelemetry/resources'; describe('SimpleSpanProcessor', () => { diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts index b7422484b56..a55f90a0bee 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; -import { InMemorySpanExporter, ReadableSpan } from '../../../src'; +import type { ExportResult } from '@opentelemetry/core'; +import type { ReadableSpan } from '../../../src'; +import { InMemorySpanExporter } from '../../../src'; /** * A test-only exporter that delays during export to mimic a real exporter. diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts index df9132471cc..955144b1a7d 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Sampler, SamplingDecision, SamplingResult } from '../../../src'; +import type { Sampler, SamplingResult } from '../../../src'; +import { SamplingDecision } from '../../../src'; /** Sampler that always records but doesn't sample spans. */ export class TestRecordOnlySampler implements Sampler { diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts index 1dbb0c3510c..66e55d9ad6b 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ContextManager, Context, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { ContextManager, Context } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; /** * A test-only ContextManager that uses an in-memory stack to keep track of diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts index 710f3d889b1..31f5fd29682 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts @@ -3,12 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import type { ReadableSpan, SpanProcessor } from '../../../src'; import { BasicTracerProvider, InMemorySpanExporter, - ReadableSpan, - SpanProcessor, AlwaysOnSampler, } from '../../../src'; import { Tracer } from '../../../src/Tracer'; diff --git a/packages/opentelemetry-sdk-trace-base/test/common/sampler/Sampler.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/sampler/Sampler.test.ts index 4e39d074d1b..e079edc81c0 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/sampler/Sampler.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/sampler/Sampler.test.ts @@ -4,13 +4,11 @@ */ import { context, SpanKind } from '@opentelemetry/api'; +import type { Sampler, SamplingDecision, SamplingResult } from '../../../src'; import { AlwaysOffSampler, AlwaysOnSampler, ParentBasedSampler, - Sampler, - SamplingDecision, - SamplingResult, TraceIdRatioBasedSampler, } from '../../../src'; import { assertAssignable } from '../util'; diff --git a/packages/opentelemetry-sdk-trace-base/test/node/BasicTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-base/test/node/BasicTracerProvider.test.ts index 9353dac3f71..f20714ca8e2 100644 --- a/packages/opentelemetry-sdk-trace-base/test/node/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/node/BasicTracerProvider.test.ts @@ -7,7 +7,7 @@ import { context, trace } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { BasicTracerProvider } from '../../src'; -import { Tracer } from '../../src/Tracer'; +import type { Tracer } from '../../src/Tracer'; describe('BasicTracerProvider - Node', () => { beforeEach(() => { diff --git a/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessor.bench.ts b/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessor.bench.ts index 8d9544a97ab..197944d3bca 100644 --- a/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessor.bench.ts +++ b/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessor.bench.ts @@ -4,13 +4,10 @@ */ import * as Benchmark from 'benchmark'; -import { - BasicTracerProvider, - BatchSpanProcessor, - SpanExporter, - ReadableSpan, -} from '../../../src'; -import { ExportResultCode, ExportResult } from '@opentelemetry/core'; +import type { SpanExporter, ReadableSpan } from '../../../src'; +import { BasicTracerProvider, BatchSpanProcessor } from '../../../src'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; class NoopExporter implements SpanExporter { export( diff --git a/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessorBase.test.ts b/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessorBase.test.ts index ac33890acba..22a7753f6a1 100644 --- a/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessorBase.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/node/export/BatchSpanProcessorBase.test.ts @@ -4,7 +4,8 @@ */ import * as assert from 'assert'; -import { BufferConfig, InMemorySpanExporter } from '../../../src'; +import type { BufferConfig } from '../../../src'; +import { InMemorySpanExporter } from '../../../src'; import { BatchSpanProcessorBase } from '../../../src/export/BatchSpanProcessorBase'; class BatchSpanProcessor extends BatchSpanProcessorBase { diff --git a/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts b/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts index a3347f572b2..5d7c9d893c5 100644 --- a/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts @@ -3,18 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'; -import { - BasicTracerProvider, - SDKRegistrationConfig, -} from '@opentelemetry/sdk-trace-base'; -import { NodeTracerConfig } from './config'; -import { - context, - ContextManager, - propagation, - TextMapPropagator, - trace, -} from '@opentelemetry/api'; +import type { SDKRegistrationConfig } from '@opentelemetry/sdk-trace-base'; +import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; +import type { NodeTracerConfig } from './config'; +import type { ContextManager, TextMapPropagator } from '@opentelemetry/api'; +import { context, propagation, trace } from '@opentelemetry/api'; import { CompositePropagator, W3CBaggagePropagator, diff --git a/packages/opentelemetry-sdk-trace-node/src/config.ts b/packages/opentelemetry-sdk-trace-node/src/config.ts index 1fe88063032..61d0ce7b316 100644 --- a/packages/opentelemetry-sdk-trace-node/src/config.ts +++ b/packages/opentelemetry-sdk-trace-node/src/config.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TracerConfig } from '@opentelemetry/sdk-trace-base'; +import type { TracerConfig } from '@opentelemetry/sdk-trace-base'; /** * NodeTracerConfig provides an interface for configuring a Node Tracer. diff --git a/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts index 3e03e399e16..80c26e14bde 100644 --- a/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts @@ -5,18 +5,13 @@ import * as assert from 'assert'; -import { - context, - ContextManager, - ROOT_CONTEXT, - trace, - TraceFlags, -} from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; +import { context, ROOT_CONTEXT, trace, TraceFlags } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; +import type { Span } from '@opentelemetry/sdk-trace-base'; import { AlwaysOffSampler, AlwaysOnSampler, - Span, } from '@opentelemetry/sdk-trace-base'; import { ATTR_TELEMETRY_SDK_LANGUAGE } from '@opentelemetry/semantic-conventions'; diff --git a/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts b/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts index 8e3cb4b0d48..3e75a41195d 100644 --- a/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts +++ b/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api'; +import type { Context, ContextManager } from '@opentelemetry/api'; +import { ROOT_CONTEXT } from '@opentelemetry/api'; /** * Stack Context Manager for managing the state in web diff --git a/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts b/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts index 1402e914cfc..d39bc6a699b 100644 --- a/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts @@ -3,19 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - BasicTracerProvider, +import type { SDKRegistrationConfig, TracerConfig, } from '@opentelemetry/sdk-trace-base'; +import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; import { StackContextManager } from './StackContextManager'; -import { - trace, - context, - ContextManager, - propagation, - TextMapPropagator, -} from '@opentelemetry/api'; +import type { ContextManager, TextMapPropagator } from '@opentelemetry/api'; +import { trace, context, propagation } from '@opentelemetry/api'; import { CompositePropagator, W3CBaggagePropagator, diff --git a/packages/opentelemetry-sdk-trace-web/src/types.ts b/packages/opentelemetry-sdk-trace-web/src/types.ts index c6c34f8d87d..719fc5006e7 100644 --- a/packages/opentelemetry-sdk-trace-web/src/types.ts +++ b/packages/opentelemetry-sdk-trace-web/src/types.ts @@ -2,7 +2,7 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { PerformanceTimingNames } from './enums/PerformanceTimingNames'; +import type { PerformanceTimingNames } from './enums/PerformanceTimingNames'; export type PerformanceEntries = { [PerformanceTimingNames.CONNECT_END]?: number; diff --git a/packages/opentelemetry-sdk-trace-web/src/utils.ts b/packages/opentelemetry-sdk-trace-web/src/utils.ts index b6d666bffde..d8cc4c0aa88 100644 --- a/packages/opentelemetry-sdk-trace-web/src/utils.ts +++ b/packages/opentelemetry-sdk-trace-web/src/utils.ts @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { PerformanceEntries, PerformanceResourceTimingInfo, PropagateTraceHeaderCorsUrls, } from './types'; import { PerformanceTimingNames as PTN } from './enums/PerformanceTimingNames'; -import * as api from '@opentelemetry/api'; +import type * as api from '@opentelemetry/api'; import { hrTimeToNanoseconds, timeInputToHrTime, diff --git a/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts index a5faa6bd175..b816ae87806 100644 --- a/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts @@ -3,12 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { context, ContextManager, trace } from '@opentelemetry/api'; +import type { ContextManager } from '@opentelemetry/api'; +import { context, trace } from '@opentelemetry/api'; import { ZoneContextManager } from '@opentelemetry/context-zone'; import { ATTR_TELEMETRY_SDK_LANGUAGE } from '@opentelemetry/semantic-conventions'; -import { Span } from '@opentelemetry/sdk-trace-base'; +import type { Span } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; -import { WebTracerConfig } from '../src'; +import type { WebTracerConfig } from '../src'; import { WebTracerProvider } from '../src/WebTracerProvider'; describe('WebTracerProvider', function () { diff --git a/packages/opentelemetry-sdk-trace-web/test/utils.test.ts b/packages/opentelemetry-sdk-trace-web/test/utils.test.ts index a5d59ba5c89..74691b86c7d 100644 --- a/packages/opentelemetry-sdk-trace-web/test/utils.test.ts +++ b/packages/opentelemetry-sdk-trace-web/test/utils.test.ts @@ -8,20 +8,19 @@ import { otperformance as performance, } from '@opentelemetry/core'; import * as core from '@opentelemetry/core'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { HrTime } from '@opentelemetry/api'; +import type * as tracing from '@opentelemetry/sdk-trace-base'; +import type { HrTime } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; +import type { PerformanceEntries, URLLike } from '../src'; import { addSpanNetworkEvent, addSpanNetworkEvents, getResource, normalizeUrl, parseUrl, - PerformanceEntries, shouldPropagateTraceHeaders, - URLLike, } from '../src'; import { PerformanceTimingNames as PTN } from '../src/enums/PerformanceTimingNames'; diff --git a/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts b/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts index cebc0a70abe..05bd9f83dc7 100644 --- a/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts +++ b/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts @@ -5,12 +5,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { - getElementXPath, - normalizeUrl, - parseUrl, - URLLike, -} from '../../src/utils'; +import type { URLLike } from '../../src/utils'; +import { getElementXPath, normalizeUrl, parseUrl } from '../../src/utils'; const fixture = `
diff --git a/packages/opentelemetry-shim-opentracing/src/shim.ts b/packages/opentelemetry-shim-opentracing/src/shim.ts index dd1df5addaf..9e6f2b1f4a4 100644 --- a/packages/opentelemetry-shim-opentracing/src/shim.ts +++ b/packages/opentelemetry-shim-opentracing/src/shim.ts @@ -4,12 +4,12 @@ */ import * as api from '@opentelemetry/api'; -import { +import type { Attributes, AttributeValue, - SpanStatusCode, TextMapPropagator, } from '@opentelemetry/api'; +import { SpanStatusCode } from '@opentelemetry/api'; import * as opentracing from 'opentracing'; import { ATTR_EXCEPTION_MESSAGE, diff --git a/packages/opentelemetry-shim-opentracing/test/Shim.test.ts b/packages/opentelemetry-shim-opentracing/test/Shim.test.ts index 7a36ebe8922..91e54ae6cba 100644 --- a/packages/opentelemetry-shim-opentracing/test/Shim.test.ts +++ b/packages/opentelemetry-shim-opentracing/test/Shim.test.ts @@ -5,8 +5,10 @@ import * as assert from 'assert'; import * as opentracing from 'opentracing'; -import { BasicTracerProvider, Span } from '@opentelemetry/sdk-trace-base'; -import { SpanContextShim, SpanShim, TracerShim } from '../src/shim'; +import type { Span } from '@opentelemetry/sdk-trace-base'; +import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; +import type { SpanShim } from '../src/shim'; +import { SpanContextShim, TracerShim } from '../src/shim'; import { CompositePropagator, W3CBaggagePropagator, diff --git a/packages/sdk-metrics/src/InstrumentDescriptor.ts b/packages/sdk-metrics/src/InstrumentDescriptor.ts index e9dd54a7402..1d2b0bba552 100644 --- a/packages/sdk-metrics/src/InstrumentDescriptor.ts +++ b/packages/sdk-metrics/src/InstrumentDescriptor.ts @@ -3,15 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - MetricAdvice, - MetricOptions, - ValueType, - diag, -} from '@opentelemetry/api'; -import { View } from './view/View'; +import type { MetricAdvice, MetricOptions } from '@opentelemetry/api'; +import { ValueType, diag } from '@opentelemetry/api'; +import type { View } from './view/View'; import { equalsCaseInsensitive } from './utils'; -import { InstrumentType, MetricDescriptor } from './export/MetricData'; +import type { InstrumentType, MetricDescriptor } from './export/MetricData'; /** * An internal interface describing the instrument. diff --git a/packages/sdk-metrics/src/Instruments.ts b/packages/sdk-metrics/src/Instruments.ts index 37faae83fbd..e459cf6ee98 100644 --- a/packages/sdk-metrics/src/Instruments.ts +++ b/packages/sdk-metrics/src/Instruments.ts @@ -3,12 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - context as contextApi, - diag, +import type { Context, Attributes, - ValueType, UpDownCounter, Counter, Gauge, @@ -19,10 +16,11 @@ import { ObservableGauge, ObservableUpDownCounter, } from '@opentelemetry/api'; +import { context as contextApi, diag, ValueType } from '@opentelemetry/api'; import { millisToHrTime } from '@opentelemetry/core'; -import { InstrumentDescriptor } from './InstrumentDescriptor'; -import { ObservableRegistry } from './state/ObservableRegistry'; -import { +import type { InstrumentDescriptor } from './InstrumentDescriptor'; +import type { ObservableRegistry } from './state/ObservableRegistry'; +import type { AsyncWritableMetricStorage, WritableMetricStorage, } from './state/WritableMetricStorage'; diff --git a/packages/sdk-metrics/src/Meter.ts b/packages/sdk-metrics/src/Meter.ts index 6d2844c084f..1b96629bf9f 100644 --- a/packages/sdk-metrics/src/Meter.ts +++ b/packages/sdk-metrics/src/Meter.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Meter as IMeter, MetricOptions, Gauge, @@ -26,7 +26,7 @@ import { ObservableUpDownCounterInstrument, UpDownCounterInstrument, } from './Instruments'; -import { MeterSharedState } from './state/MeterSharedState'; +import type { MeterSharedState } from './state/MeterSharedState'; import { InstrumentType } from './export/MetricData'; /** diff --git a/packages/sdk-metrics/src/MeterProvider.ts b/packages/sdk-metrics/src/MeterProvider.ts index a2b77ba31a9..706a501d212 100644 --- a/packages/sdk-metrics/src/MeterProvider.ts +++ b/packages/sdk-metrics/src/MeterProvider.ts @@ -3,19 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - diag, +import type { MeterProvider as IMeterProvider, Meter as IMeter, MeterOptions, - createNoopMeter, } from '@opentelemetry/api'; -import { defaultResource, Resource } from '@opentelemetry/resources'; -import { IMetricReader } from './export/MetricReader'; +import { diag, createNoopMeter } from '@opentelemetry/api'; +import type { Resource } from '@opentelemetry/resources'; +import { defaultResource } from '@opentelemetry/resources'; +import type { IMetricReader } from './export/MetricReader'; import { MeterProviderSharedState } from './state/MeterProviderSharedState'; import { MetricCollector } from './state/MetricCollector'; -import { ForceFlushOptions, ShutdownOptions } from './types'; -import { View, ViewOptions } from './view/View'; +import type { ForceFlushOptions, ShutdownOptions } from './types'; +import type { ViewOptions } from './view/View'; +import { View } from './view/View'; /** * MeterProviderOptions provides an interface for configuring a MeterProvider. diff --git a/packages/sdk-metrics/src/ObservableResult.ts b/packages/sdk-metrics/src/ObservableResult.ts index 9fa3cc58b94..ad6ca9fd3f5 100644 --- a/packages/sdk-metrics/src/ObservableResult.ts +++ b/packages/sdk-metrics/src/ObservableResult.ts @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - diag, +import type { ObservableResult, Attributes, - ValueType, BatchObservableResult, Observable, } from '@opentelemetry/api'; +import { diag, ValueType } from '@opentelemetry/api'; import { AttributeHashMap } from './state/HashMap'; -import { isObservableInstrument, ObservableInstrument } from './Instruments'; +import type { ObservableInstrument } from './Instruments'; +import { isObservableInstrument } from './Instruments'; /** * The class implements {@link ObservableResult} interface. diff --git a/packages/sdk-metrics/src/aggregator/Drop.ts b/packages/sdk-metrics/src/aggregator/Drop.ts index c9f05c71b94..a7d1be596d4 100644 --- a/packages/sdk-metrics/src/aggregator/Drop.ts +++ b/packages/sdk-metrics/src/aggregator/Drop.ts @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { MetricData, MetricDescriptor } from '../export/MetricData'; -import { Maybe } from '../utils'; -import { AggregatorKind, Aggregator, AccumulationRecord } from './types'; +import type { HrTime } from '@opentelemetry/api'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { MetricData, MetricDescriptor } from '../export/MetricData'; +import type { Maybe } from '../utils'; +import type { Aggregator, AccumulationRecord } from './types'; +import { AggregatorKind } from './types'; /** Basic aggregator for None which keeps no recorded value. */ export class DropAggregator implements Aggregator { diff --git a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts index e9948edc28d..00214a474d5 100644 --- a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts +++ b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts @@ -3,25 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Accumulation, AccumulationRecord, Aggregator, - AggregatorKind, ExponentialHistogram, } from './types'; -import { - DataPointType, - ExponentialHistogramMetricData, - InstrumentType, -} from '../export/MetricData'; -import { diag, HrTime } from '@opentelemetry/api'; -import { Maybe } from '../utils'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { AggregatorKind } from './types'; +import type { ExponentialHistogramMetricData } from '../export/MetricData'; +import { DataPointType, InstrumentType } from '../export/MetricData'; +import type { HrTime } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; +import type { Maybe } from '../utils'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; import { Buckets } from './exponential-histogram/Buckets'; import { getMapping } from './exponential-histogram/mapping/getMapping'; -import { Mapping } from './exponential-histogram/mapping/types'; +import type { Mapping } from './exponential-histogram/mapping/types'; import { nextGreaterSquare } from './exponential-histogram/util'; /** diff --git a/packages/sdk-metrics/src/aggregator/Histogram.ts b/packages/sdk-metrics/src/aggregator/Histogram.ts index 0835e0e6f94..494b7c28cfa 100644 --- a/packages/sdk-metrics/src/aggregator/Histogram.ts +++ b/packages/sdk-metrics/src/aggregator/Histogram.ts @@ -3,21 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Accumulation, - AccumulationRecord, - Aggregator, - AggregatorKind, -} from './types'; -import { - DataPointType, - HistogramMetricData, - InstrumentType, -} from '../export/MetricData'; -import { HrTime } from '@opentelemetry/api'; -import { binarySearchUB, Maybe } from '../utils'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { Accumulation, AccumulationRecord, Aggregator } from './types'; +import { AggregatorKind } from './types'; +import type { HistogramMetricData } from '../export/MetricData'; +import { DataPointType, InstrumentType } from '../export/MetricData'; +import type { HrTime } from '@opentelemetry/api'; +import type { Maybe } from '../utils'; +import { binarySearchUB } from '../utils'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; /** * Internal value type for HistogramAggregation. diff --git a/packages/sdk-metrics/src/aggregator/LastValue.ts b/packages/sdk-metrics/src/aggregator/LastValue.ts index 80be3ef531e..21bcdbf76e7 100644 --- a/packages/sdk-metrics/src/aggregator/LastValue.ts +++ b/packages/sdk-metrics/src/aggregator/LastValue.ts @@ -3,19 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Accumulation, AccumulationRecord, Aggregator, - AggregatorKind, LastValue, } from './types'; -import { HrTime } from '@opentelemetry/api'; +import { AggregatorKind } from './types'; +import type { HrTime } from '@opentelemetry/api'; import { millisToHrTime, hrTimeToMicroseconds } from '@opentelemetry/core'; -import { DataPointType, GaugeMetricData } from '../export/MetricData'; -import { Maybe } from '../utils'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { GaugeMetricData } from '../export/MetricData'; +import { DataPointType } from '../export/MetricData'; +import type { Maybe } from '../utils'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; export class LastValueAccumulation implements Accumulation { public startTime; diff --git a/packages/sdk-metrics/src/aggregator/Sum.ts b/packages/sdk-metrics/src/aggregator/Sum.ts index 6856bf7e79f..7731441afd0 100644 --- a/packages/sdk-metrics/src/aggregator/Sum.ts +++ b/packages/sdk-metrics/src/aggregator/Sum.ts @@ -3,18 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Sum, - AggregatorKind, Aggregator, Accumulation, AccumulationRecord, } from './types'; -import { HrTime } from '@opentelemetry/api'; -import { DataPointType, SumMetricData } from '../export/MetricData'; -import { Maybe } from '../utils'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { AggregatorKind } from './types'; +import type { HrTime } from '@opentelemetry/api'; +import type { SumMetricData } from '../export/MetricData'; +import { DataPointType } from '../export/MetricData'; +import type { Maybe } from '../utils'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; export class SumAccumulation implements Accumulation { public startTime; diff --git a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts index b502f2b98da..d20ee3da93d 100644 --- a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts +++ b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts @@ -4,7 +4,8 @@ */ import * as ieee754 from './ieee754'; import * as util from '../util'; -import { Mapping, MappingError } from './types'; +import type { Mapping } from './types'; +import { MappingError } from './types'; /** * ExponentMapping implements exponential mapping functions for diff --git a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts index 932b86b9c8e..a8ea33f96a5 100644 --- a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts +++ b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts @@ -4,7 +4,8 @@ */ import * as ieee754 from './ieee754'; import * as util from '../util'; -import { Mapping, MappingError } from './types'; +import type { Mapping } from './types'; +import { MappingError } from './types'; /** * LogarithmMapping implements exponential mapping functions for scale > 0. diff --git a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts index 4003955f7a5..7a4517f2436 100644 --- a/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts +++ b/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts @@ -4,7 +4,8 @@ */ import { ExponentMapping } from './ExponentMapping'; import { LogarithmMapping } from './LogarithmMapping'; -import { MappingError, Mapping } from './types'; +import type { Mapping } from './types'; +import { MappingError } from './types'; const MIN_SCALE = -10; const MAX_SCALE = 20; diff --git a/packages/sdk-metrics/src/aggregator/types.ts b/packages/sdk-metrics/src/aggregator/types.ts index 67cdc30a198..5ff274baa8b 100644 --- a/packages/sdk-metrics/src/aggregator/types.ts +++ b/packages/sdk-metrics/src/aggregator/types.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, Attributes } from '@opentelemetry/api'; -import { AggregationTemporality } from '../export/AggregationTemporality'; -import { MetricData } from '../export/MetricData'; -import { Maybe } from '../utils'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { HrTime, Attributes } from '@opentelemetry/api'; +import type { AggregationTemporality } from '../export/AggregationTemporality'; +import type { MetricData } from '../export/MetricData'; +import type { Maybe } from '../utils'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; /** The kind of aggregator. */ export enum AggregatorKind { diff --git a/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts b/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts index 6a435ec36b5..560ce135bc2 100644 --- a/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts +++ b/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir'; /** diff --git a/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts b/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts index 6f4df5395f8..7261abd2449 100644 --- a/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts +++ b/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { ExemplarFilter } from './ExemplarFilter'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { ExemplarFilter } from './ExemplarFilter'; export class AlwaysSampleExemplarFilter implements ExemplarFilter { shouldSample( diff --git a/packages/sdk-metrics/src/exemplar/Exemplar.ts b/packages/sdk-metrics/src/exemplar/Exemplar.ts index 2a874634c80..44db87c407b 100644 --- a/packages/sdk-metrics/src/exemplar/Exemplar.ts +++ b/packages/sdk-metrics/src/exemplar/Exemplar.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, Attributes } from '@opentelemetry/api'; +import type { HrTime, Attributes } from '@opentelemetry/api'; /** * A representation of an exemplar, which is a sample input measurement. diff --git a/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts b/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts index 327f96b2159..6264bf2c675 100644 --- a/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts +++ b/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; /** * This interface represents a ExemplarFilter. Exemplar filters are diff --git a/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts b/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts index 93cf9d77060..c84225acb75 100644 --- a/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts +++ b/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts @@ -3,14 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Context, - HrTime, - isSpanContextValid, - trace, - Attributes, -} from '@opentelemetry/api'; -import { Exemplar } from './Exemplar'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import { isSpanContextValid, trace } from '@opentelemetry/api'; +import type { Exemplar } from './Exemplar'; /** * An interface for an exemplar reservoir of samples. diff --git a/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts b/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts index 8394c63155e..b5a645dc301 100644 --- a/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts +++ b/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { ExemplarFilter } from './ExemplarFilter'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { ExemplarFilter } from './ExemplarFilter'; export class NeverSampleExemplarFilter implements ExemplarFilter { shouldSample( diff --git a/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts b/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts index 05285d1d3d3..78b9237d638 100644 --- a/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts +++ b/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir'; /** diff --git a/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts b/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts index a94a805d36a..c17a9b6a0e4 100644 --- a/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts +++ b/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts @@ -3,15 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - Context, - HrTime, - isSpanContextValid, - trace, - TraceFlags, - Attributes, -} from '@opentelemetry/api'; -import { ExemplarFilter } from './ExemplarFilter'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import { isSpanContextValid, trace, TraceFlags } from '@opentelemetry/api'; +import type { ExemplarFilter } from './ExemplarFilter'; export class WithTraceExemplarFilter implements ExemplarFilter { shouldSample( diff --git a/packages/sdk-metrics/src/export/AggregationSelector.ts b/packages/sdk-metrics/src/export/AggregationSelector.ts index f80fbd9ce34..75a56e9551c 100644 --- a/packages/sdk-metrics/src/export/AggregationSelector.ts +++ b/packages/sdk-metrics/src/export/AggregationSelector.ts @@ -4,8 +4,9 @@ */ import { AggregationTemporality } from './AggregationTemporality'; -import { InstrumentType } from './MetricData'; -import { AggregationOption, AggregationType } from '../view/AggregationOption'; +import type { InstrumentType } from './MetricData'; +import type { AggregationOption } from '../view/AggregationOption'; +import { AggregationType } from '../view/AggregationOption'; /** * Aggregation selector based on metric instrument types. diff --git a/packages/sdk-metrics/src/export/CardinalitySelector.ts b/packages/sdk-metrics/src/export/CardinalitySelector.ts index 7c70acb40c1..d18c2506856 100644 --- a/packages/sdk-metrics/src/export/CardinalitySelector.ts +++ b/packages/sdk-metrics/src/export/CardinalitySelector.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentType } from './MetricData'; +import type { InstrumentType } from './MetricData'; /** * Cardinality Limit selector based on metric instrument types. diff --git a/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts b/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts index 8d755dcfb02..47df9e0c858 100644 --- a/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts +++ b/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts @@ -2,14 +2,13 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; -import { AggregationTemporality } from './AggregationTemporality'; -import { ResourceMetrics, InstrumentType } from './MetricData'; -import { PushMetricExporter } from './MetricExporter'; -import { - AggregationTemporalitySelector, - DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR, -} from './AggregationSelector'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; +import type { AggregationTemporality } from './AggregationTemporality'; +import type { ResourceMetrics, InstrumentType } from './MetricData'; +import type { PushMetricExporter } from './MetricExporter'; +import type { AggregationTemporalitySelector } from './AggregationSelector'; +import { DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR } from './AggregationSelector'; interface ConsoleMetricExporterOptions { temporalitySelector?: AggregationTemporalitySelector; diff --git a/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts b/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts index 65233a0df15..81d27e3d278 100644 --- a/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts +++ b/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts @@ -4,10 +4,10 @@ */ import { ExportResultCode } from '@opentelemetry/core'; -import { ExportResult } from '@opentelemetry/core'; -import { AggregationTemporality } from './AggregationTemporality'; -import { InstrumentType, ResourceMetrics } from './MetricData'; -import { PushMetricExporter } from './MetricExporter'; +import type { ExportResult } from '@opentelemetry/core'; +import type { AggregationTemporality } from './AggregationTemporality'; +import type { InstrumentType, ResourceMetrics } from './MetricData'; +import type { PushMetricExporter } from './MetricExporter'; /** * In-memory Metrics Exporter is a Push Metric Exporter diff --git a/packages/sdk-metrics/src/export/MetricData.ts b/packages/sdk-metrics/src/export/MetricData.ts index 71fbd5d4439..4cc474c545a 100644 --- a/packages/sdk-metrics/src/export/MetricData.ts +++ b/packages/sdk-metrics/src/export/MetricData.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, Attributes, ValueType } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { AggregationTemporality } from './AggregationTemporality'; -import { Histogram, ExponentialHistogram } from '../aggregator/types'; +import type { HrTime, Attributes, ValueType } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { Resource } from '@opentelemetry/resources'; +import type { AggregationTemporality } from './AggregationTemporality'; +import type { Histogram, ExponentialHistogram } from '../aggregator/types'; /** * Supported types of metric instruments. diff --git a/packages/sdk-metrics/src/export/MetricExporter.ts b/packages/sdk-metrics/src/export/MetricExporter.ts index 11903c51e14..92d51f9d1f2 100644 --- a/packages/sdk-metrics/src/export/MetricExporter.ts +++ b/packages/sdk-metrics/src/export/MetricExporter.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult } from '@opentelemetry/core'; -import { AggregationTemporality } from './AggregationTemporality'; -import { InstrumentType, ResourceMetrics } from './MetricData'; -import { AggregationOption } from '../view/AggregationOption'; +import type { ExportResult } from '@opentelemetry/core'; +import type { AggregationTemporality } from './AggregationTemporality'; +import type { InstrumentType, ResourceMetrics } from './MetricData'; +import type { AggregationOption } from '../view/AggregationOption'; /** * An interface that allows different metric services to export recorded data diff --git a/packages/sdk-metrics/src/export/MetricProducer.ts b/packages/sdk-metrics/src/export/MetricProducer.ts index 63a243b5c3e..ac0e44bb943 100644 --- a/packages/sdk-metrics/src/export/MetricProducer.ts +++ b/packages/sdk-metrics/src/export/MetricProducer.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { CollectionResult } from './MetricData'; +import type { CollectionResult } from './MetricData'; export interface MetricCollectOptions { /** diff --git a/packages/sdk-metrics/src/export/MetricReader.ts b/packages/sdk-metrics/src/export/MetricReader.ts index 9210a44da31..8514c3518b0 100644 --- a/packages/sdk-metrics/src/export/MetricReader.ts +++ b/packages/sdk-metrics/src/export/MetricReader.ts @@ -4,23 +4,25 @@ */ import * as api from '@opentelemetry/api'; -import { AggregationTemporality } from './AggregationTemporality'; -import { MetricProducer } from './MetricProducer'; -import { CollectionResult, InstrumentType } from './MetricData'; +import type { AggregationTemporality } from './AggregationTemporality'; +import type { MetricProducer } from './MetricProducer'; +import type { CollectionResult, InstrumentType } from './MetricData'; import { callWithTimeout } from '../utils'; -import { +import type { CollectionOptions, ForceFlushOptions, ShutdownOptions, } from '../types'; -import { +import type { AggregationSelector, AggregationTemporalitySelector, +} from './AggregationSelector'; +import { DEFAULT_AGGREGATION_SELECTOR, DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR, } from './AggregationSelector'; -import { AggregationOption } from '../view/AggregationOption'; -import { CardinalitySelector } from './CardinalitySelector'; +import type { AggregationOption } from '../view/AggregationOption'; +import type { CardinalitySelector } from './CardinalitySelector'; export interface MetricReaderOptions { /** diff --git a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts index 584a3fc68d9..9d604695250 100644 --- a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts +++ b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts @@ -10,9 +10,9 @@ import { globalErrorHandler, } from '@opentelemetry/core'; import { MetricReader } from './MetricReader'; -import { PushMetricExporter } from './MetricExporter'; +import type { PushMetricExporter } from './MetricExporter'; import { callWithTimeout, TimeoutError } from '../utils'; -import { MetricProducer } from './MetricProducer'; +import type { MetricProducer } from './MetricProducer'; export type PeriodicExportingMetricReaderOptions = { /** diff --git a/packages/sdk-metrics/src/state/AsyncMetricStorage.ts b/packages/sdk-metrics/src/state/AsyncMetricStorage.ts index c4d6d97457c..ebf148ff7a4 100644 --- a/packages/sdk-metrics/src/state/AsyncMetricStorage.ts +++ b/packages/sdk-metrics/src/state/AsyncMetricStorage.ts @@ -3,18 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; -import { Accumulation, Aggregator } from '../aggregator/types'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { HrTime } from '@opentelemetry/api'; +import type { Accumulation, Aggregator } from '../aggregator/types'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; import { MetricStorage } from './MetricStorage'; -import { MetricData } from '../export/MetricData'; +import type { MetricData } from '../export/MetricData'; import { DeltaMetricProcessor } from './DeltaMetricProcessor'; import { TemporalMetricProcessor } from './TemporalMetricProcessor'; -import { Maybe } from '../utils'; -import { MetricCollectorHandle } from './MetricCollector'; +import type { Maybe } from '../utils'; +import type { MetricCollectorHandle } from './MetricCollector'; import { AttributeHashMap } from './HashMap'; -import { AsyncWritableMetricStorage } from './WritableMetricStorage'; -import { IAttributesProcessor } from '../view/AttributesProcessor'; +import type { AsyncWritableMetricStorage } from './WritableMetricStorage'; +import type { IAttributesProcessor } from '../view/AttributesProcessor'; /** * Internal interface. diff --git a/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts b/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts index a2d520b5620..7fcc5100e00 100644 --- a/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts +++ b/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { Maybe, hashAttributes } from '../utils'; -import { Accumulation, Aggregator } from '../aggregator/types'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { Maybe } from '../utils'; +import { hashAttributes } from '../utils'; +import type { Accumulation, Aggregator } from '../aggregator/types'; import { AttributeHashMap } from './HashMap'; /** diff --git a/packages/sdk-metrics/src/state/HashMap.ts b/packages/sdk-metrics/src/state/HashMap.ts index b1fffd6bbf1..fe9f644e295 100644 --- a/packages/sdk-metrics/src/state/HashMap.ts +++ b/packages/sdk-metrics/src/state/HashMap.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; import { hashAttributes } from '../utils'; export interface Hash { diff --git a/packages/sdk-metrics/src/state/MeterProviderSharedState.ts b/packages/sdk-metrics/src/state/MeterProviderSharedState.ts index 966244b752e..a4df32ffd48 100644 --- a/packages/sdk-metrics/src/state/MeterProviderSharedState.ts +++ b/packages/sdk-metrics/src/state/MeterProviderSharedState.ts @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { Resource } from '@opentelemetry/resources'; import { instrumentationScopeId } from '../utils'; import { ViewRegistry } from '../view/ViewRegistry'; import { MeterSharedState } from './MeterSharedState'; -import { MetricCollector, MetricCollectorHandle } from './MetricCollector'; +import type { MetricCollector, MetricCollectorHandle } from './MetricCollector'; import { toAggregation } from '../view/AggregationOption'; -import { Aggregation } from '../view/Aggregation'; -import { InstrumentType } from '../export/MetricData'; +import type { Aggregation } from '../view/Aggregation'; +import type { InstrumentType } from '../export/MetricData'; /** * An internal record for shared meter provider states. diff --git a/packages/sdk-metrics/src/state/MeterSharedState.ts b/packages/sdk-metrics/src/state/MeterSharedState.ts index c904768c85c..898cc5ad9a3 100644 --- a/packages/sdk-metrics/src/state/MeterSharedState.ts +++ b/packages/sdk-metrics/src/state/MeterSharedState.ts @@ -3,29 +3,25 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { MetricCollectOptions } from '../export/MetricProducer'; -import { MetricData, ScopeMetrics } from '../export/MetricData'; -import { - createInstrumentDescriptorWithView, - InstrumentDescriptor, -} from '../InstrumentDescriptor'; +import type { HrTime } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { MetricCollectOptions } from '../export/MetricProducer'; +import type { MetricData, ScopeMetrics } from '../export/MetricData'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { createInstrumentDescriptorWithView } from '../InstrumentDescriptor'; import { Meter } from '../Meter'; -import { Maybe } from '../utils'; +import type { Maybe } from '../utils'; import { AsyncMetricStorage } from './AsyncMetricStorage'; -import { MeterProviderSharedState } from './MeterProviderSharedState'; -import { MetricCollectorHandle } from './MetricCollector'; +import type { MeterProviderSharedState } from './MeterProviderSharedState'; +import type { MetricCollectorHandle } from './MetricCollector'; import { MetricStorageRegistry } from './MetricStorageRegistry'; import { MultiMetricStorage } from './MultiWritableMetricStorage'; import { ObservableRegistry } from './ObservableRegistry'; import { SyncMetricStorage } from './SyncMetricStorage'; -import { Accumulation, Aggregator } from '../aggregator/types'; -import { - createNoopAttributesProcessor, - IAttributesProcessor, -} from '../view/AttributesProcessor'; -import { MetricStorage } from './MetricStorage'; +import type { Accumulation, Aggregator } from '../aggregator/types'; +import type { IAttributesProcessor } from '../view/AttributesProcessor'; +import { createNoopAttributesProcessor } from '../view/AttributesProcessor'; +import type { MetricStorage } from './MetricStorage'; /** * An internal record for shared meter provider states. diff --git a/packages/sdk-metrics/src/state/MetricCollector.ts b/packages/sdk-metrics/src/state/MetricCollector.ts index 2b61aa339be..4eed3e98a77 100644 --- a/packages/sdk-metrics/src/state/MetricCollector.ts +++ b/packages/sdk-metrics/src/state/MetricCollector.ts @@ -4,16 +4,19 @@ */ import { millisToHrTime } from '@opentelemetry/core'; -import { AggregationTemporalitySelector } from '../export/AggregationSelector'; -import { +import type { AggregationTemporalitySelector } from '../export/AggregationSelector'; +import type { CollectionResult, InstrumentType, ScopeMetrics, } from '../export/MetricData'; -import { MetricCollectOptions, MetricProducer } from '../export/MetricProducer'; -import { IMetricReader } from '../export/MetricReader'; -import { ForceFlushOptions, ShutdownOptions } from '../types'; -import { MeterProviderSharedState } from './MeterProviderSharedState'; +import type { + MetricCollectOptions, + MetricProducer, +} from '../export/MetricProducer'; +import type { IMetricReader } from '../export/MetricReader'; +import type { ForceFlushOptions, ShutdownOptions } from '../types'; +import type { MeterProviderSharedState } from './MeterProviderSharedState'; /** * An internal opaque interface that the MetricReader receives as diff --git a/packages/sdk-metrics/src/state/MetricStorage.ts b/packages/sdk-metrics/src/state/MetricStorage.ts index ba3d6049673..e03f7942cb2 100644 --- a/packages/sdk-metrics/src/state/MetricStorage.ts +++ b/packages/sdk-metrics/src/state/MetricStorage.ts @@ -3,14 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; -import { MetricData } from '../export/MetricData'; -import { Maybe } from '../utils'; -import { MetricCollectorHandle } from './MetricCollector'; -import { - createInstrumentDescriptor, - InstrumentDescriptor, -} from '../InstrumentDescriptor'; +import type { HrTime } from '@opentelemetry/api'; +import type { MetricData } from '../export/MetricData'; +import type { Maybe } from '../utils'; +import type { MetricCollectorHandle } from './MetricCollector'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { createInstrumentDescriptor } from '../InstrumentDescriptor'; /** * Internal interface. diff --git a/packages/sdk-metrics/src/state/MetricStorageRegistry.ts b/packages/sdk-metrics/src/state/MetricStorageRegistry.ts index 0361d4af424..6fe8c6d1c64 100644 --- a/packages/sdk-metrics/src/state/MetricStorageRegistry.ts +++ b/packages/sdk-metrics/src/state/MetricStorageRegistry.ts @@ -3,17 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { MetricStorage } from './MetricStorage'; -import { - InstrumentDescriptor, - isDescriptorCompatibleWith, -} from '../InstrumentDescriptor'; +import type { MetricStorage } from './MetricStorage'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import { isDescriptorCompatibleWith } from '../InstrumentDescriptor'; import * as api from '@opentelemetry/api'; import { getConflictResolutionRecipe, getIncompatibilityDetails, } from '../view/RegistrationConflicts'; -import { MetricCollectorHandle } from './MetricCollector'; +import type { MetricCollectorHandle } from './MetricCollector'; type StorageMap = Map; diff --git a/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts b/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts index d96eb2ade18..84dd5c491d9 100644 --- a/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts +++ b/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { WritableMetricStorage } from './WritableMetricStorage'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { WritableMetricStorage } from './WritableMetricStorage'; /** * Internal interface. diff --git a/packages/sdk-metrics/src/state/ObservableRegistry.ts b/packages/sdk-metrics/src/state/ObservableRegistry.ts index b862118d3c2..fc7096df7b7 100644 --- a/packages/sdk-metrics/src/state/ObservableRegistry.ts +++ b/packages/sdk-metrics/src/state/ObservableRegistry.ts @@ -3,14 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - diag, +import type { HrTime, BatchObservableCallback, Observable, ObservableCallback, } from '@opentelemetry/api'; -import { isObservableInstrument, ObservableInstrument } from '../Instruments'; +import { diag } from '@opentelemetry/api'; +import type { ObservableInstrument } from '../Instruments'; +import { isObservableInstrument } from '../Instruments'; import { BatchObservableResultImpl, ObservableResultImpl, diff --git a/packages/sdk-metrics/src/state/SyncMetricStorage.ts b/packages/sdk-metrics/src/state/SyncMetricStorage.ts index 8e01888c201..7944d28618e 100644 --- a/packages/sdk-metrics/src/state/SyncMetricStorage.ts +++ b/packages/sdk-metrics/src/state/SyncMetricStorage.ts @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { WritableMetricStorage } from './WritableMetricStorage'; -import { Accumulation, Aggregator } from '../aggregator/types'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; -import { IAttributesProcessor } from '../view/AttributesProcessor'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { WritableMetricStorage } from './WritableMetricStorage'; +import type { Accumulation, Aggregator } from '../aggregator/types'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { IAttributesProcessor } from '../view/AttributesProcessor'; import { MetricStorage } from './MetricStorage'; -import { MetricData } from '../export/MetricData'; +import type { MetricData } from '../export/MetricData'; import { DeltaMetricProcessor } from './DeltaMetricProcessor'; import { TemporalMetricProcessor } from './TemporalMetricProcessor'; -import { Maybe } from '../utils'; -import { MetricCollectorHandle } from './MetricCollector'; +import type { Maybe } from '../utils'; +import type { MetricCollectorHandle } from './MetricCollector'; /** * Internal interface. diff --git a/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts b/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts index eec5c412ae6..166bc30a8d0 100644 --- a/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts +++ b/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; -import { +import type { HrTime } from '@opentelemetry/api'; +import type { Accumulation, AccumulationRecord, Aggregator, } from '../aggregator/types'; -import { MetricData } from '../export/MetricData'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { MetricData } from '../export/MetricData'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; import { AggregationTemporality } from '../export/AggregationTemporality'; -import { Maybe } from '../utils'; -import { MetricCollectorHandle } from './MetricCollector'; +import type { Maybe } from '../utils'; +import type { MetricCollectorHandle } from './MetricCollector'; import { AttributeHashMap } from './HashMap'; /** diff --git a/packages/sdk-metrics/src/state/WritableMetricStorage.ts b/packages/sdk-metrics/src/state/WritableMetricStorage.ts index a160cc430b1..f58813916bc 100644 --- a/packages/sdk-metrics/src/state/WritableMetricStorage.ts +++ b/packages/sdk-metrics/src/state/WritableMetricStorage.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { AttributeHashMap } from './HashMap'; +import type { Context, HrTime, Attributes } from '@opentelemetry/api'; +import type { AttributeHashMap } from './HashMap'; /** * Internal interface. Stores measurements and allows synchronous writes of diff --git a/packages/sdk-metrics/src/utils.ts b/packages/sdk-metrics/src/utils.ts index 0937cd921dd..07fb9a3b1eb 100644 --- a/packages/sdk-metrics/src/utils.ts +++ b/packages/sdk-metrics/src/utils.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Attributes } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; +import type { Attributes } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; export type Maybe = T | undefined; diff --git a/packages/sdk-metrics/src/view/Aggregation.ts b/packages/sdk-metrics/src/view/Aggregation.ts index 1e0652452ad..e5aae1a0436 100644 --- a/packages/sdk-metrics/src/view/Aggregation.ts +++ b/packages/sdk-metrics/src/view/Aggregation.ts @@ -4,17 +4,17 @@ */ import * as api from '@opentelemetry/api'; +import type { Aggregator } from '../aggregator'; import { - Aggregator, SumAggregator, DropAggregator, LastValueAggregator, HistogramAggregator, ExponentialHistogramAggregator, } from '../aggregator'; -import { Accumulation } from '../aggregator/types'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; -import { Maybe } from '../utils'; +import type { Accumulation } from '../aggregator/types'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { Maybe } from '../utils'; import { InstrumentType } from '../export/MetricData'; /** diff --git a/packages/sdk-metrics/src/view/AggregationOption.ts b/packages/sdk-metrics/src/view/AggregationOption.ts index ee09e20d286..0eecaae4f01 100644 --- a/packages/sdk-metrics/src/view/AggregationOption.ts +++ b/packages/sdk-metrics/src/view/AggregationOption.ts @@ -2,8 +2,8 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ +import type { Aggregation } from './Aggregation'; import { - Aggregation, DEFAULT_AGGREGATION, DROP_AGGREGATION, ExplicitBucketHistogramAggregation, diff --git a/packages/sdk-metrics/src/view/AttributesProcessor.ts b/packages/sdk-metrics/src/view/AttributesProcessor.ts index e61799cd08e..276a53a42cc 100644 --- a/packages/sdk-metrics/src/view/AttributesProcessor.ts +++ b/packages/sdk-metrics/src/view/AttributesProcessor.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Context, Attributes } from '@opentelemetry/api'; +import type { Context, Attributes } from '@opentelemetry/api'; /** * The {@link AttributesProcessor} is responsible for customizing which diff --git a/packages/sdk-metrics/src/view/InstrumentSelector.ts b/packages/sdk-metrics/src/view/InstrumentSelector.ts index 846fd62e075..f0145a033c4 100644 --- a/packages/sdk-metrics/src/view/InstrumentSelector.ts +++ b/packages/sdk-metrics/src/view/InstrumentSelector.ts @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExactPredicate, PatternPredicate, Predicate } from './Predicate'; -import { InstrumentType } from '../export/MetricData'; +import type { Predicate } from './Predicate'; +import { ExactPredicate, PatternPredicate } from './Predicate'; +import type { InstrumentType } from '../export/MetricData'; export interface InstrumentSelectorCriteria { name?: string; diff --git a/packages/sdk-metrics/src/view/MeterSelector.ts b/packages/sdk-metrics/src/view/MeterSelector.ts index 37c57fd4cf3..f34ae7e4f2c 100644 --- a/packages/sdk-metrics/src/view/MeterSelector.ts +++ b/packages/sdk-metrics/src/view/MeterSelector.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExactPredicate, Predicate } from './Predicate'; +import type { Predicate } from './Predicate'; +import { ExactPredicate } from './Predicate'; export interface MeterSelectorCriteria { name?: string; diff --git a/packages/sdk-metrics/src/view/RegistrationConflicts.ts b/packages/sdk-metrics/src/view/RegistrationConflicts.ts index 378b1cc9012..32ee2741859 100644 --- a/packages/sdk-metrics/src/view/RegistrationConflicts.ts +++ b/packages/sdk-metrics/src/view/RegistrationConflicts.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentSelectorCriteria } from './InstrumentSelector'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { InstrumentSelectorCriteria } from './InstrumentSelector'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; export function getIncompatibilityDetails( existing: InstrumentDescriptor, diff --git a/packages/sdk-metrics/src/view/View.ts b/packages/sdk-metrics/src/view/View.ts index e90d4f4c464..0bc20f5adcd 100644 --- a/packages/sdk-metrics/src/view/View.ts +++ b/packages/sdk-metrics/src/view/View.ts @@ -4,20 +4,17 @@ */ import { PatternPredicate } from './Predicate'; +import type { IAttributesProcessor } from './AttributesProcessor'; import { createMultiAttributesProcessor, createNoopAttributesProcessor, - IAttributesProcessor, } from './AttributesProcessor'; import { InstrumentSelector } from './InstrumentSelector'; import { MeterSelector } from './MeterSelector'; -import { Aggregation } from './Aggregation'; -import { - AggregationOption, - AggregationType, - toAggregation, -} from './AggregationOption'; -import { InstrumentType } from '../export/MetricData'; +import type { Aggregation } from './Aggregation'; +import type { AggregationOption } from './AggregationOption'; +import { AggregationType, toAggregation } from './AggregationOption'; +import type { InstrumentType } from '../export/MetricData'; export type ViewOptions = { /** diff --git a/packages/sdk-metrics/src/view/ViewRegistry.ts b/packages/sdk-metrics/src/view/ViewRegistry.ts index 83906042dd5..0460327239b 100644 --- a/packages/sdk-metrics/src/view/ViewRegistry.ts +++ b/packages/sdk-metrics/src/view/ViewRegistry.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { InstrumentationScope } from '@opentelemetry/core'; -import { InstrumentDescriptor } from '../InstrumentDescriptor'; -import { InstrumentSelector } from './InstrumentSelector'; -import { MeterSelector } from './MeterSelector'; -import { View } from './View'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { InstrumentDescriptor } from '../InstrumentDescriptor'; +import type { InstrumentSelector } from './InstrumentSelector'; +import type { MeterSelector } from './MeterSelector'; +import type { View } from './View'; export class ViewRegistry { private _registeredViews: View[] = []; diff --git a/packages/sdk-metrics/test/ExemplarFilter.test.ts b/packages/sdk-metrics/test/ExemplarFilter.test.ts index fcffa6a70ba..8015d5346dd 100644 --- a/packages/sdk-metrics/test/ExemplarFilter.test.ts +++ b/packages/sdk-metrics/test/ExemplarFilter.test.ts @@ -4,12 +4,8 @@ */ import * as assert from 'assert'; -import { - ROOT_CONTEXT, - SpanContext, - TraceFlags, - trace, -} from '@opentelemetry/api'; +import type { SpanContext } from '@opentelemetry/api'; +import { ROOT_CONTEXT, TraceFlags, trace } from '@opentelemetry/api'; import { AlwaysSampleExemplarFilter, diff --git a/packages/sdk-metrics/test/ExemplarReservoir.test.ts b/packages/sdk-metrics/test/ExemplarReservoir.test.ts index 04973a0c6cc..afcfc30d66d 100644 --- a/packages/sdk-metrics/test/ExemplarReservoir.test.ts +++ b/packages/sdk-metrics/test/ExemplarReservoir.test.ts @@ -3,12 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { - ROOT_CONTEXT, - SpanContext, - TraceFlags, - trace, -} from '@opentelemetry/api'; +import type { SpanContext } from '@opentelemetry/api'; +import { ROOT_CONTEXT, TraceFlags, trace } from '@opentelemetry/api'; import { hrTime } from '@opentelemetry/core'; import * as assert from 'assert'; diff --git a/packages/sdk-metrics/test/InstrumentDescriptor.test.ts b/packages/sdk-metrics/test/InstrumentDescriptor.test.ts index b84ef8006b3..a7d6d4ebbc0 100644 --- a/packages/sdk-metrics/test/InstrumentDescriptor.test.ts +++ b/packages/sdk-metrics/test/InstrumentDescriptor.test.ts @@ -4,9 +4,9 @@ */ import * as assert from 'assert'; +import type { InstrumentDescriptor } from '../src/InstrumentDescriptor'; import { createInstrumentDescriptor, - InstrumentDescriptor, isValidName, isDescriptorCompatibleWith, } from '../src/InstrumentDescriptor'; diff --git a/packages/sdk-metrics/test/Instruments.test.ts b/packages/sdk-metrics/test/Instruments.test.ts index 164c901a16a..ef98093845e 100644 --- a/packages/sdk-metrics/test/Instruments.test.ts +++ b/packages/sdk-metrics/test/Instruments.test.ts @@ -5,15 +5,10 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { - DataPoint, - DataPointType, - Histogram, - InstrumentType, - MeterProvider, -} from '../src'; -import { InstrumentDescriptor } from '../src/InstrumentDescriptor'; +import type { InstrumentationScope } from '@opentelemetry/core'; +import type { DataPoint, Histogram } from '../src'; +import { DataPointType, InstrumentType, MeterProvider } from '../src'; +import type { InstrumentDescriptor } from '../src/InstrumentDescriptor'; import { TestDeltaMetricReader, TestMetricReader, @@ -26,9 +21,10 @@ import { defaultInstrumentationScope, testResource, } from './util'; -import { ObservableResult, ValueType } from '@opentelemetry/api'; -import { IMetricReader } from '../src/export/MetricReader'; -import { Resource } from '@opentelemetry/resources'; +import type { ObservableResult } from '@opentelemetry/api'; +import { ValueType } from '@opentelemetry/api'; +import type { IMetricReader } from '../src/export/MetricReader'; +import type { Resource } from '@opentelemetry/resources'; describe('Instruments', () => { describe('Counter', () => { diff --git a/packages/sdk-metrics/test/Meter.test.ts b/packages/sdk-metrics/test/Meter.test.ts index 124311dbcf3..adcd18b0de5 100644 --- a/packages/sdk-metrics/test/Meter.test.ts +++ b/packages/sdk-metrics/test/Meter.test.ts @@ -3,7 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Observable, diag } from '@opentelemetry/api'; +import type { Observable } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { diff --git a/packages/sdk-metrics/test/MeterProvider.test.ts b/packages/sdk-metrics/test/MeterProvider.test.ts index dc06880069b..ccc14866311 100644 --- a/packages/sdk-metrics/test/MeterProvider.test.ts +++ b/packages/sdk-metrics/test/MeterProvider.test.ts @@ -4,13 +4,8 @@ */ import * as assert from 'assert'; -import { - MeterProvider, - InstrumentType, - DataPointType, - HistogramMetricData, - DataPoint, -} from '../src'; +import type { HistogramMetricData, DataPoint } from '../src'; +import { MeterProvider, InstrumentType, DataPointType } from '../src'; import { assertScopeMetrics, assertMetricData, diff --git a/packages/sdk-metrics/test/aggregator/Drop.test.ts b/packages/sdk-metrics/test/aggregator/Drop.test.ts index b5ed2be24d5..194d20cc11d 100644 --- a/packages/sdk-metrics/test/aggregator/Drop.test.ts +++ b/packages/sdk-metrics/test/aggregator/Drop.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; import * as assert from 'assert'; import { AggregationTemporality } from '../../src'; import { DropAggregator } from '../../src/aggregator'; diff --git a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts index 90d84a7db5f..4624b9dcc9f 100644 --- a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts +++ b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts @@ -3,20 +3,21 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, ValueType } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; +import { ValueType } from '@opentelemetry/api'; +import type { MetricData } from '../../src'; import { AggregationTemporality, DataPointType, InstrumentType, - MetricData, } from '../../src'; import { ExponentialHistogramAccumulation, ExponentialHistogramAggregator, } from '../../src/aggregator/ExponentialHistogram'; -import { Buckets } from '../../src/aggregator/exponential-histogram/Buckets'; +import type { Buckets } from '../../src/aggregator/exponential-histogram/Buckets'; import { getMapping } from '../../src/aggregator/exponential-histogram/mapping/getMapping'; -import { Mapping } from '../../src/aggregator/exponential-histogram/mapping/types'; +import type { Mapping } from '../../src/aggregator/exponential-histogram/mapping/types'; import * as assert from 'assert'; import { assertInEpsilon, diff --git a/packages/sdk-metrics/test/aggregator/Histogram.test.ts b/packages/sdk-metrics/test/aggregator/Histogram.test.ts index 1d6b2f9f4fc..c665ad21057 100644 --- a/packages/sdk-metrics/test/aggregator/Histogram.test.ts +++ b/packages/sdk-metrics/test/aggregator/Histogram.test.ts @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime, ValueType } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; +import { ValueType } from '@opentelemetry/api'; import * as assert from 'assert'; +import type { MetricData } from '../../src'; import { AggregationTemporality, InstrumentType, DataPointType, - MetricData, } from '../../src'; import { HistogramAccumulation, diff --git a/packages/sdk-metrics/test/aggregator/LastValue.test.ts b/packages/sdk-metrics/test/aggregator/LastValue.test.ts index d50bc887aef..c619df3b8c3 100644 --- a/packages/sdk-metrics/test/aggregator/LastValue.test.ts +++ b/packages/sdk-metrics/test/aggregator/LastValue.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { AggregationTemporality } from '../../src'; @@ -11,7 +11,8 @@ import { LastValueAccumulation, LastValueAggregator, } from '../../src/aggregator'; -import { MetricData, DataPointType } from '../../src/export/MetricData'; +import type { MetricData } from '../../src/export/MetricData'; +import { DataPointType } from '../../src/export/MetricData'; import { commonValues, defaultInstrumentDescriptor } from '../util'; describe('LastValueAggregator', () => { diff --git a/packages/sdk-metrics/test/aggregator/Sum.test.ts b/packages/sdk-metrics/test/aggregator/Sum.test.ts index 14d9328bd7b..592226b924f 100644 --- a/packages/sdk-metrics/test/aggregator/Sum.test.ts +++ b/packages/sdk-metrics/test/aggregator/Sum.test.ts @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; import * as assert from 'assert'; import { AggregationTemporality } from '../../src'; import { SumAccumulation, SumAggregator } from '../../src/aggregator'; -import { MetricData, DataPointType } from '../../src/export/MetricData'; +import type { MetricData } from '../../src/export/MetricData'; +import { DataPointType } from '../../src/export/MetricData'; import { commonValues, defaultInstrumentDescriptor } from '../util'; describe('SumAggregator', () => { diff --git a/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts b/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts index 5ccb09c4051..4ecb5ebff59 100644 --- a/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts +++ b/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts @@ -2,11 +2,11 @@ * Copyright The OpenTelemetry Authors * SPDX-License-Identifier: Apache-2.0 */ -import * as metrics from '@opentelemetry/api'; -import { ExportResult } from '@opentelemetry/core'; +import type * as metrics from '@opentelemetry/api'; +import type { ExportResult } from '@opentelemetry/core'; import { ConsoleMetricExporter } from '../../src/export/ConsoleMetricExporter'; import { PeriodicExportingMetricReader } from '../../src/export/PeriodicExportingMetricReader'; -import { ResourceMetrics } from '../../src/export/MetricData'; +import type { ResourceMetrics } from '../../src/export/MetricData'; import { MeterProvider } from '../../src/MeterProvider'; import { testResource } from '../util'; import * as assert from 'assert'; diff --git a/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts b/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts index aff45816926..14e40e326ee 100644 --- a/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts +++ b/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ import { ExportResultCode } from '@opentelemetry/core'; -import * as metrics from '@opentelemetry/api'; +import type * as metrics from '@opentelemetry/api'; import * as assert from 'assert'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; import { InMemoryMetricExporter } from '../../src/export/InMemoryMetricExporter'; -import { ResourceMetrics } from '../../src/export/MetricData'; +import type { ResourceMetrics } from '../../src/export/MetricData'; import { PeriodicExportingMetricReader } from '../../src/export/PeriodicExportingMetricReader'; import { MeterProvider } from '../../src/MeterProvider'; import { testResource } from '../util'; diff --git a/packages/sdk-metrics/test/export/MetricReader.test.ts b/packages/sdk-metrics/test/export/MetricReader.test.ts index 1ff799e6011..b5eb4318852 100644 --- a/packages/sdk-metrics/test/export/MetricReader.test.ts +++ b/packages/sdk-metrics/test/export/MetricReader.test.ts @@ -8,11 +8,11 @@ import * as sinon from 'sinon'; import { MeterProvider } from '../../src/MeterProvider'; import { emptyResourceMetrics, TestMetricProducer } from './TestMetricProducer'; import { TestMetricReader } from './TestMetricReader'; +import type { ScopeMetrics } from '../../src'; import { AggregationTemporality, AggregationType, DataPointType, - ScopeMetrics, } from '../../src'; import { DEFAULT_AGGREGATION_SELECTOR, diff --git a/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts b/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts index 36805005620..ae02ef56878 100644 --- a/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts +++ b/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts @@ -5,27 +5,24 @@ import { PeriodicExportingMetricReader } from '../../src/export/PeriodicExportingMetricReader'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; -import { +import type { AggregationOption, - AggregationType, CollectionResult, InstrumentType, MetricProducer, PushMetricExporter, } from '../../src'; -import { - DataPointType, +import { AggregationType } from '../../src'; +import type { ResourceMetrics, ScopeMetrics, } from '../../src/export/MetricData'; +import { DataPointType } from '../../src/export/MetricData'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { TimeoutError } from '../../src/utils'; -import { - ExportResult, - ExportResultCode, - setGlobalErrorHandler, -} from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode, setGlobalErrorHandler } from '@opentelemetry/core'; import { TestMetricProducer } from './TestMetricProducer'; import { assertAggregationSelector, diff --git a/packages/sdk-metrics/test/export/TestMetricExporter.ts b/packages/sdk-metrics/test/export/TestMetricExporter.ts index 9206dbcf38e..b5f4affe1b2 100644 --- a/packages/sdk-metrics/test/export/TestMetricExporter.ts +++ b/packages/sdk-metrics/test/export/TestMetricExporter.ts @@ -3,12 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; -import { - AggregationTemporality, - PushMetricExporter, - ResourceMetrics, -} from '../../src'; +import type { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/core'; +import type { PushMetricExporter, ResourceMetrics } from '../../src'; +import { AggregationTemporality } from '../../src'; export class TestMetricExporter implements PushMetricExporter { resourceMetricsList: ResourceMetrics[] = []; diff --git a/packages/sdk-metrics/test/export/TestMetricProducer.ts b/packages/sdk-metrics/test/export/TestMetricProducer.ts index 1bd77c75515..7a2a0016663 100644 --- a/packages/sdk-metrics/test/export/TestMetricProducer.ts +++ b/packages/sdk-metrics/test/export/TestMetricProducer.ts @@ -3,8 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { CollectionResult, ResourceMetrics } from '../../src/export/MetricData'; -import { MetricProducer } from '../../src/export/MetricProducer'; +import type { + CollectionResult, + ResourceMetrics, +} from '../../src/export/MetricData'; +import type { MetricProducer } from '../../src/export/MetricProducer'; import { testResource } from '../util'; export const emptyResourceMetrics = { diff --git a/packages/sdk-metrics/test/export/TestMetricReader.ts b/packages/sdk-metrics/test/export/TestMetricReader.ts index d89f064228e..ce30945f57a 100644 --- a/packages/sdk-metrics/test/export/TestMetricReader.ts +++ b/packages/sdk-metrics/test/export/TestMetricReader.ts @@ -4,8 +4,8 @@ */ import { AggregationTemporality, MetricReader } from '../../src'; -import { MetricCollector } from '../../src/state/MetricCollector'; -import { MetricReaderOptions } from '../../src/export/MetricReader'; +import type { MetricCollector } from '../../src/state/MetricCollector'; +import type { MetricReaderOptions } from '../../src/export/MetricReader'; /** * A test metric reader that implements no-op onForceFlush() and onShutdown() handlers. diff --git a/packages/sdk-metrics/test/export/utils.ts b/packages/sdk-metrics/test/export/utils.ts index cd44461bb9b..80b3fcb2f74 100644 --- a/packages/sdk-metrics/test/export/utils.ts +++ b/packages/sdk-metrics/test/export/utils.ts @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { AggregationSelector, AggregationTemporalitySelector, - InstrumentType, IMetricReader, PushMetricExporter, } from '../../src'; +import { InstrumentType } from '../../src'; import * as assert from 'assert'; const instrumentTypes = [ diff --git a/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts b/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts index f5860235134..8be62a76a00 100644 --- a/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts +++ b/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts @@ -5,15 +5,15 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; +import type { AggregationOption } from '../../src'; import { - AggregationOption, AggregationTemporality, AggregationType, InstrumentType, MeterProvider, } from '../../src'; import { TestMetricReader } from '../export/TestMetricReader'; -import { IMetricReader } from '../../src/export/MetricReader'; +import type { IMetricReader } from '../../src/export/MetricReader'; describe('cumulative-exponential-histogram', () => { let clock: sinon.SinonFakeTimers; diff --git a/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts b/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts index 65486d1b972..2338640b2ac 100644 --- a/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts +++ b/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts @@ -4,16 +4,14 @@ */ import * as assert from 'assert'; +import type { DataPoint, ExponentialHistogram, Histogram } from '../../src'; import { AggregationTemporality, AggregationType, - DataPoint, - ExponentialHistogram, - Histogram, MeterProvider, } from '../../src'; import { TestMetricReader } from '../export/TestMetricReader'; -import { IMetricReader } from '../../src/export/MetricReader'; +import type { IMetricReader } from '../../src/export/MetricReader'; describe('histogram-recording-nan', () => { it('exponential histogram should not count NaN', async () => { diff --git a/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts b/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts index d8bfa9bd6e9..3d0921676bd 100644 --- a/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts +++ b/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { DataPointType, MeterProvider } from '../../src'; import { TestDeltaMetricReader } from '../export/TestMetricReader'; import { assertDataPoint, assertMetricData } from '../util'; -import { IMetricReader } from '../../src/export/MetricReader'; +import type { IMetricReader } from '../../src/export/MetricReader'; // https://github.com/open-telemetry/opentelemetry-js/issues/3664 diff --git a/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts b/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts index 76ab1a2aa64..a403373c14b 100644 --- a/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts +++ b/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { SumAggregator } from '../../src/aggregator'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; import { DataPointType } from '../../src/export/MetricData'; -import { MetricCollectorHandle } from '../../src/state/MetricCollector'; +import type { MetricCollectorHandle } from '../../src/state/MetricCollector'; import { AsyncMetricStorage } from '../../src/state/AsyncMetricStorage'; import { createNoopAttributesProcessor } from '../../src/view/AttributesProcessor'; import { ObservableRegistry } from '../../src/state/ObservableRegistry'; @@ -19,7 +19,7 @@ import { ObservableCallbackDelegate, } from '../util'; import { ObservableInstrument } from '../../src/Instruments'; -import { HrTime } from '@opentelemetry/api'; +import type { HrTime } from '@opentelemetry/api'; const deltaCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, diff --git a/packages/sdk-metrics/test/state/HashMap.test.ts b/packages/sdk-metrics/test/state/HashMap.test.ts index 468fafcd7ec..b546f722d4f 100644 --- a/packages/sdk-metrics/test/state/HashMap.test.ts +++ b/packages/sdk-metrics/test/state/HashMap.test.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; import { HashMap } from '../../src/state/HashMap'; import { hashAttributes } from '../../src/utils'; diff --git a/packages/sdk-metrics/test/state/MeterSharedState.test.ts b/packages/sdk-metrics/test/state/MeterSharedState.test.ts index 005874c9415..55104e0f8a2 100644 --- a/packages/sdk-metrics/test/state/MeterSharedState.test.ts +++ b/packages/sdk-metrics/test/state/MeterSharedState.test.ts @@ -5,14 +5,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { - MeterProvider, - DataPointType, - IMetricReader, - InstrumentType, - AggregationType, - ViewOptions, -} from '../../src'; +import type { IMetricReader, InstrumentType, ViewOptions } from '../../src'; +import { MeterProvider, DataPointType, AggregationType } from '../../src'; import { assertMetricData, defaultInstrumentationScope, @@ -23,9 +17,9 @@ import { TestDeltaMetricReader, TestMetricReader, } from '../export/TestMetricReader'; -import { MeterSharedState } from '../../src/state/MeterSharedState'; -import { CollectionResult } from '../../src/export/MetricData'; -import { Meter } from '../../src/Meter'; +import type { MeterSharedState } from '../../src/state/MeterSharedState'; +import type { CollectionResult } from '../../src/export/MetricData'; +import type { Meter } from '../../src/Meter'; describe('MeterSharedState', () => { afterEach(() => { diff --git a/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts b/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts index 7b56a44a927..4005254dcf0 100644 --- a/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts +++ b/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts @@ -6,10 +6,11 @@ import { MetricStorageRegistry } from '../../src/state/MetricStorageRegistry'; import { diag, ValueType } from '@opentelemetry/api'; import { MetricStorage } from '../../src/state/MetricStorage'; -import { HrTime } from '@opentelemetry/api'; -import { MetricCollectorHandle } from '../../src/state/MetricCollector'; -import { MetricData, InstrumentType } from '../../src'; -import { Maybe } from '../../src/utils'; +import type { HrTime } from '@opentelemetry/api'; +import type { MetricCollectorHandle } from '../../src/state/MetricCollector'; +import type { MetricData } from '../../src'; +import { InstrumentType } from '../../src'; +import type { Maybe } from '../../src/utils'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { @@ -18,7 +19,7 @@ import { getUnitConflictResolutionRecipe, getValueTypeConflictResolutionRecipe, } from '../../src/view/RegistrationConflicts'; -import { InstrumentDescriptor } from '../../src/InstrumentDescriptor'; +import type { InstrumentDescriptor } from '../../src/InstrumentDescriptor'; class TestMetricStorage extends MetricStorage { collect( diff --git a/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts b/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts index cf4e95f6f92..476fe32f1cb 100644 --- a/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts +++ b/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts @@ -4,16 +4,16 @@ */ import * as api from '@opentelemetry/api'; -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; import { hrTime } from '@opentelemetry/core'; import * as assert from 'assert'; import { MultiMetricStorage } from '../../src/state/MultiWritableMetricStorage'; -import { WritableMetricStorage } from '../../src/state/WritableMetricStorage'; +import type { WritableMetricStorage } from '../../src/state/WritableMetricStorage'; +import type { Measurement } from '../util'; import { assertMeasurementEqual, commonAttributes, commonValues, - Measurement, } from '../util'; describe('MultiMetricStorage', () => { diff --git a/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts b/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts index c4bb11990c5..d089a2837f2 100644 --- a/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts +++ b/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts @@ -9,7 +9,7 @@ import * as assert from 'assert'; import { SumAggregator } from '../../src/aggregator'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; import { DataPointType } from '../../src/export/MetricData'; -import { MetricCollectorHandle } from '../../src/state/MetricCollector'; +import type { MetricCollectorHandle } from '../../src/state/MetricCollector'; import { SyncMetricStorage } from '../../src/state/SyncMetricStorage'; import { createNoopAttributesProcessor } from '../../src/view/AttributesProcessor'; import { diff --git a/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts b/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts index 82759db7363..81b130e5a75 100644 --- a/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts +++ b/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts @@ -10,7 +10,7 @@ import { SumAggregator } from '../../src/aggregator'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; import { DataPointType } from '../../src/export/MetricData'; import { DeltaMetricProcessor } from '../../src/state/DeltaMetricProcessor'; -import { MetricCollectorHandle } from '../../src/state/MetricCollector'; +import type { MetricCollectorHandle } from '../../src/state/MetricCollector'; import { TemporalMetricProcessor } from '../../src/state/TemporalMetricProcessor'; import { assertMetricData, diff --git a/packages/sdk-metrics/test/util.ts b/packages/sdk-metrics/test/util.ts index e431921b60c..306c4915b17 100644 --- a/packages/sdk-metrics/test/util.ts +++ b/packages/sdk-metrics/test/util.ts @@ -3,30 +3,29 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { +import type { Context, BatchObservableCallback, Attributes, ObservableCallback, - ValueType, } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; +import { ValueType } from '@opentelemetry/api'; +import type { InstrumentationScope } from '@opentelemetry/core'; import { defaultResource, resourceFromAttributes, } from '@opentelemetry/resources'; import * as assert from 'assert'; -import { InstrumentDescriptor } from '../src/InstrumentDescriptor'; -import { - InstrumentType, +import type { InstrumentDescriptor } from '../src/InstrumentDescriptor'; +import type { MetricData, DataPoint, - DataPointType, ScopeMetrics, } from '../src/export/MetricData'; -import { HrTime } from '@opentelemetry/api'; -import { Histogram } from '../src/aggregator/types'; -import { AggregationTemporality } from '../src/export/AggregationTemporality'; +import { InstrumentType, DataPointType } from '../src/export/MetricData'; +import type { HrTime } from '@opentelemetry/api'; +import type { Histogram } from '../src/aggregator/types'; +import type { AggregationTemporality } from '../src/export/AggregationTemporality'; export type Measurement = { value: number; diff --git a/packages/sdk-metrics/test/utils.test.ts b/packages/sdk-metrics/test/utils.test.ts index 2d306ed8673..d4ca9f75bcc 100644 --- a/packages/sdk-metrics/test/utils.test.ts +++ b/packages/sdk-metrics/test/utils.test.ts @@ -11,7 +11,7 @@ import { hashAttributes, TimeoutError, } from '../src/utils'; -import { Attributes } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; describe('utils', () => { afterEach(() => { diff --git a/packages/sdk-metrics/test/view/Aggregation.test.ts b/packages/sdk-metrics/test/view/Aggregation.test.ts index ae904c0c3b0..60590c9b9d0 100644 --- a/packages/sdk-metrics/test/view/Aggregation.test.ts +++ b/packages/sdk-metrics/test/view/Aggregation.test.ts @@ -5,14 +5,14 @@ import * as assert from 'assert'; import { InstrumentType } from '../../src'; +import type { Aggregator } from '../../src/aggregator'; import { - Aggregator, DropAggregator, HistogramAggregator, LastValueAggregator, SumAggregator, } from '../../src/aggregator'; -import { InstrumentDescriptor } from '../../src/InstrumentDescriptor'; +import type { InstrumentDescriptor } from '../../src/InstrumentDescriptor'; import { DefaultAggregation, ExplicitBucketHistogramAggregation, diff --git a/packages/sdk-metrics/test/view/AttributesProcessor.test.ts b/packages/sdk-metrics/test/view/AttributesProcessor.test.ts index 0dae9b5ee3b..537614b746a 100644 --- a/packages/sdk-metrics/test/view/AttributesProcessor.test.ts +++ b/packages/sdk-metrics/test/view/AttributesProcessor.test.ts @@ -4,9 +4,10 @@ */ import * as assert from 'assert'; -import { Attributes, context } from '@opentelemetry/api'; +import type { Attributes } from '@opentelemetry/api'; +import { context } from '@opentelemetry/api'; +import type { IAttributesProcessor } from '../../src/view/AttributesProcessor'; import { - IAttributesProcessor, createMultiAttributesProcessor, createNoopAttributesProcessor, createAllowListAttributesProcessor, From 08c78418401ead537ed3536563d0816a4d657500 Mon Sep 17 00:00:00 2001 From: overbalance Date: Wed, 4 Mar 2026 11:20:01 -0600 Subject: [PATCH 3/4] uglify --- eslint.base.js | 141 ++++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 77 deletions(-) diff --git a/eslint.base.js b/eslint.base.js index 005d092dc01..d969f8b5047 100644 --- a/eslint.base.js +++ b/eslint.base.js @@ -1,102 +1,89 @@ module.exports = { - plugins: ['@typescript-eslint', 'header', 'n', 'prettier'], - extends: ['eslint:recommended', 'plugin:prettier/recommended'], - parser: '@typescript-eslint/parser', + plugins: [ + "@typescript-eslint", + "header", + "n", + "prettier" + ], + extends: ["eslint:recommended", "plugin:prettier/recommended"], + parser: "@typescript-eslint/parser", parserOptions: { - project: null, + "project": null, }, rules: { - quotes: ['error', 'single', { avoidEscape: true }], - eqeqeq: ['error', 'smart'], - 'prefer-rest-params': 'off', - 'no-console': 'error', - 'no-shadow': 'off', - 'n/no-deprecated-api': ['warn'], - 'header/header': [ - 'error', - 'block', - [ - { - pattern: - / \* Copyright The OpenTelemetry Authors[\r\n]+ \* SPDX-License-Identifier: Apache-2\.0/, - template: `\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n `, - }, - ], + "quotes": ["error", "single", { "avoidEscape": true }], + "eqeqeq": [ + "error", + "smart" ], + "prefer-rest-params": "off", + "no-console": "error", + "no-shadow": "off", + "n/no-deprecated-api": ["warn"], + "header/header": ["error", "block", [{ + pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \* SPDX-License-Identifier: Apache-2\.0/, + template: `\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n ` + }]] }, overrides: [ { files: ['*.ts'], // Enable typescript-eslint for ts files. - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:prettier/recommended', - ], + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], parserOptions: { - projectService: true, + "projectService": true }, rules: { - '@typescript-eslint/no-floating-promises': 'error', - '@typescript-eslint/no-this-alias': 'off', - '@typescript-eslint/naming-convention': [ - 'error', + "@typescript-eslint/no-floating-promises": "error", + "@typescript-eslint/no-this-alias": "off", + "@typescript-eslint/naming-convention": [ + "error", { - selector: 'memberLike', - modifiers: ['private', 'protected'], - format: ['camelCase'], - leadingUnderscore: 'require', - }, + "selector": "memberLike", + "modifiers": ["private", "protected"], + "format": ["camelCase"], + "leadingUnderscore": "require" + } ], - '@typescript-eslint/consistent-type-imports': [ - 'error', + "@typescript-eslint/consistent-type-imports": [ + "error", { - prefer: 'type-imports', - fixStyle: 'separate-type-imports', + prefer: "type-imports", + fixStyle: "separate-type-imports", }, ], - '@typescript-eslint/no-unused-vars': [ - 'error', - { argsIgnorePattern: '^_', args: 'after-used' }, - ], - '@typescript-eslint/no-inferrable-types': [ - 'error', - { ignoreProperties: true }, - ], - '@typescript-eslint/no-empty-function': ['off'], - '@typescript-eslint/no-unsafe-function-type': ['warn'], - '@typescript-eslint/no-shadow': ['warn'], - '@typescript-eslint/parameter-properties': 'error', - 'no-restricted-syntax': ['error', 'ExportAllDeclaration'], - 'prefer-rest-params': 'off', - }, + "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}], + "@typescript-eslint/no-inferrable-types": ["error", { ignoreProperties: true }], + "@typescript-eslint/no-empty-function": ["off"], + "@typescript-eslint/no-unsafe-function-type": ["warn"], + "@typescript-eslint/no-shadow": ["warn"], + "@typescript-eslint/parameter-properties": "error", + "no-restricted-syntax": ["error", "ExportAllDeclaration"], + "prefer-rest-params": "off", + } }, { - files: ['test/**/*.ts'], + files: ["test/**/*.ts"], // Enable typescript-eslint for ts files. - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:prettier/recommended', - ], + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], parserOptions: { - projectService: true, + "projectService": true }, rules: { - 'no-console': 'warn', - 'no-empty': 'off', - '@typescript-eslint/ban-ts-ignore': 'off', - '@typescript-eslint/no-unsafe-function-type': ['warn'], - '@typescript-eslint/no-empty-function': 'off', - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-unused-vars': 'off', - '@typescript-eslint/no-require-imports': 'off', - '@typescript-eslint/no-shadow': ['off'], - '@typescript-eslint/no-floating-promises': ['off'], - '@typescript-eslint/no-non-null-assertion': ['off'], - '@typescript-eslint/explicit-module-boundary-types': ['off'], - 'prefer-rest-params': 'off', - }, - }, - ], + "no-console": "warn", + "no-empty": "off", + "@typescript-eslint/ban-ts-ignore": "off", + "@typescript-eslint/no-unsafe-function-type": ["warn"], + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-unused-vars": "off", + "@typescript-eslint/no-require-imports": "off", + "@typescript-eslint/no-shadow": ["off"], + "@typescript-eslint/no-floating-promises": ["off"], + "@typescript-eslint/no-non-null-assertion": ["off"], + "@typescript-eslint/explicit-module-boundary-types": ["off"], + "prefer-rest-params": "off", + } + } + ] }; From 2526d85b638f2e6b24cd2dea3b0e48bb9d00065c Mon Sep 17 00:00:00 2001 From: overbalance Date: Wed, 4 Mar 2026 11:26:55 -0600 Subject: [PATCH 4/4] docs: add changelogs --- CHANGELOG.md | 2 ++ api/CHANGELOG.md | 1 + experimental/CHANGELOG.md | 2 ++ 3 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b735b82f589..42ae765cd5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ### :house: Internal +* chore: enforce `import type` for type-only imports via ESLint [#6467](https://github.com/open-telemetry/opentelemetry-js/pull/6467) @overbalance + ## 2.6.0 ### :boom: Breaking Changes diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 81c14f37b91..f8a42fd8368 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file. * chore: disallow constructor parameter property syntax [#6187](https://github.com/open-telemetry/opentelemetry-js/pull/6187) @legendecas * refactor(api): remove platform-specific globalThis, use globalThis directly [#6208](https://github.com/open-telemetry/opentelemetry-js/pull/6208) @overbalance * chore(api): mark ProxyTracerProvider as deprecated [#6328](https://github.com/open-telemetry/opentelemetry-js/pull/6328) @cjihrig +* chore: enforce `import type` for type-only imports via ESLint [#6467](https://github.com/open-telemetry/opentelemetry-js/pull/6467) @overbalance ## 1.9.0 diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index e1f8652811d..c7e096804c9 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -16,6 +16,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ### :house: Internal +* chore: enforce `import type` for type-only imports via ESLint [#6467](https://github.com/open-telemetry/opentelemetry-js/pull/6467) @overbalance + ## 0.213.0 ### :boom: Breaking Changes