diff --git a/CHANGELOG.md b/CHANGELOG.md index 68c62f2a7f6..accaf406d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file. * chore: require changelog entry to merge PR [#2847](https://github.com/open-telemetry/opentelemetry-js/pull/2847) @dyladan * chore: remove peer API check [#2892](https://github.com/open-telemetry/opentelemetry-js/pull/2892) @dyladan * chore: merge lerna subdirectories into a single monorepo [#2892](https://github.com/open-telemetry/opentelemetry-js/pull/2892) @dyladan +* chore: indent the code with eslint [#2923](https://github.com/open-telemetry/opentelemetry-js/pull/2923) @blumamir * `opentelemetry-propagator-jaeger` * [#2906](https://github.com/open-telemetry/opentelemetry-js/pull/2906) fix: support extract one digit '0' in jaeger traceFlag ([@shmilyoo](https://github.com/shmilyoo)) diff --git a/eslint.config.js b/eslint.config.js index 61d75e50090..80f6b9242f3 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -10,6 +10,7 @@ module.exports = { "project": "./tsconfig.json" }, rules: { + "indent": ["error", 2, { "SwitchCase": 1 }], "no-trailing-spaces": "error", "eol-last": "error", "quotes": [2, "single", { "avoidEscape": true }], 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 7d44d4938ee..fc4383f183d 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts @@ -97,14 +97,14 @@ const testCollectorExporter = (params: TestParams) => ); const credentials = params.useTLS ? grpc.ServerCredentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - [ - { - cert_chain: fs.readFileSync('./test/certs/server.crt'), - private_key: fs.readFileSync('./test/certs/server.key'), - }, - ] - ) + fs.readFileSync('./test/certs/ca.crt'), + [ + { + cert_chain: fs.readFileSync('./test/certs/server.crt'), + private_key: fs.readFileSync('./test/certs/server.key'), + }, + ] + ) : grpc.ServerCredentials.createInsecure(); server.bindAsync(address, credentials, () => { server.start(); @@ -120,10 +120,10 @@ const testCollectorExporter = (params: TestParams) => beforeEach(done => { const credentials = params.useTLS ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) + fs.readFileSync('./test/certs/ca.crt'), + fs.readFileSync('./test/certs/client.key'), + fs.readFileSync('./test/certs/client.crt') + ) : undefined; collectorExporter = new OTLPTraceExporter({ url: 'grpcs://' + address, @@ -203,12 +203,12 @@ const testCollectorExporter = (params: TestParams) => describe('export - with gzip compression', () => { beforeEach(() => { const credentials = params.useTLS - ? grpc.credentials.createSsl( + ? grpc.credentials.createSsl( fs.readFileSync('./test/certs/ca.crt'), fs.readFileSync('./test/certs/client.key'), fs.readFileSync('./test/certs/client.crt') ) - : undefined; + : undefined; collectorExporter = new OTLPTraceExporter({ url: 'grpcs://' + address, credentials, @@ -254,12 +254,12 @@ const testCollectorExporter = (params: TestParams) => const envSource = process.env; it('should return gzip compression algorithm on exporter', () => { const credentials = params.useTLS - ? grpc.credentials.createSsl( + ? grpc.credentials.createSsl( fs.readFileSync('./test/certs/ca.crt'), fs.readFileSync('./test/certs/client.key'), fs.readFileSync('./test/certs/client.crt') ) - : undefined; + : undefined; envSource.OTEL_EXPORTER_OTLP_COMPRESSION='gzip'; collectorExporter = new OTLPTraceExporter({ 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 28411089f6c..1f78f66ef68 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 @@ -52,9 +52,9 @@ export class OTLPTraceExporter return typeof config.url === 'string' ? config.url : getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT.length > 0 - ? getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0 - ? appendResourcePathToUrlIfNotPresent(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT, DEFAULT_COLLECTOR_RESOURCE_PATH) - : DEFAULT_COLLECTOR_URL; + ? getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0 + ? appendResourcePathToUrlIfNotPresent(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT, DEFAULT_COLLECTOR_RESOURCE_PATH) + : DEFAULT_COLLECTOR_URL; } } diff --git a/experimental/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts index bb26b949bcc..e2e98de3046 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts @@ -55,10 +55,10 @@ export class OTLPTraceExporter return typeof config.url === 'string' ? config.url : getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT.length > 0 - ? getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0 - ? appendResourcePathToUrlIfNotPresent(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT, DEFAULT_COLLECTOR_RESOURCE_PATH) - : DEFAULT_COLLECTOR_URL; + ? getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0 + ? appendResourcePathToUrlIfNotPresent(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT, DEFAULT_COLLECTOR_RESOURCE_PATH) + : DEFAULT_COLLECTOR_URL; } getServiceClientType() { diff --git a/experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts index 693547b7c2d..1dece570f33 100644 --- a/experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts +++ b/experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts @@ -29,7 +29,7 @@ // eslint-disable-next-line node/no-unsupported-features/es-builtins, no-undef export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : - typeof self === 'object' ? self : - typeof window === 'object' ? window : - typeof global === 'object' ? global : + typeof self === 'object' ? self : + typeof window === 'object' ? window : + typeof global === 'object' ? global : {} as typeof globalThis; 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 7e99662ada5..75a0617bec4 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -23,12 +23,12 @@ import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; export class OTLPMetricExporterBase> - implements PushMetricExporter { +implements PushMetricExporter { public _otlpExporter: T; protected _preferredAggregationTemporality: AggregationTemporality; constructor(exporter: T, - config: OTLPMetricExporterOptions = defaultOptions) { + config: OTLPMetricExporterOptions = defaultOptions) { this._otlpExporter = exporter; this._preferredAggregationTemporality = config.aggregationTemporality ?? AggregationTemporality.CUMULATIVE; } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/transformMetrics.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/transformMetrics.test.ts index f5b401f304e..6232752304a 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/transformMetrics.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/transformMetrics.test.ts @@ -50,114 +50,114 @@ describe('transformMetrics', () => { }); it('should convert counter', async () => { - const counter = mockCounter(); - counter.add(1); - const metrics = (await collect()); - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureCounterIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime) - ); - } + const counter = mockCounter(); + counter.add(1); + const metrics = (await collect()); + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureCounterIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime) + ); + } ); it('should convert double counter', async () => { - const doubleCounter = mockDoubleCounter(); - doubleCounter.add(8); - const metrics = (await collect()); - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureDoubleCounterIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime), - ); - } + const doubleCounter = mockDoubleCounter(); + doubleCounter.add(8); + const metrics = (await collect()); + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureDoubleCounterIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime), + ); + } ); it('should convert observable gauge', async () => { - let count = 0; - mockObservableGauge(observableResult => { - count++; - observableResult.observe(getValue(count), {}); - }); - - // collect three times. - await collect(); - await collect(); - const metrics = (await collect()); - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureObservableGaugeIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime), - -1, - ); - } + let count = 0; + mockObservableGauge(observableResult => { + count++; + observableResult.observe(getValue(count), {}); + }); + + // collect three times. + await collect(); + await collect(); + const metrics = (await collect()); + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureObservableGaugeIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime), + -1, + ); + } ); it('should convert observable counter', async () => { - mockObservableCounter(observableResult => { - observableResult.observe(1, {}); - }); - - // collect three times. - await collect(); - await collect(); - const metrics = (await collect()); - // TODO: Collect seems to not deliver the last observation -> why? - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureObservableCounterIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime), - 2, - ); - } + mockObservableCounter(observableResult => { + observableResult.observe(1, {}); + }); + + // collect three times. + await collect(); + await collect(); + const metrics = (await collect()); + // TODO: Collect seems to not deliver the last observation -> why? + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureObservableCounterIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime), + 2, + ); + } ); it('should convert observable up-down counter', async () => { - mockObservableUpDownCounter(observableResult => { - observableResult.observe(1, {}); - }); - - // collect three times. - await collect(); - await collect(); - const metrics = (await collect()); - // TODO: Collect seems to not deliver the last observation -> why? - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureObservableUpDownCounterIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime), - 2, - ); - } + mockObservableUpDownCounter(observableResult => { + observableResult.observe(1, {}); + }); + + // collect three times. + await collect(); + await collect(); + const metrics = (await collect()); + // TODO: Collect seems to not deliver the last observation -> why? + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureObservableUpDownCounterIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime), + 2, + ); + } ); it('should convert observable histogram', async () => { - const histogram = mockHistogram(); - histogram.record(7); - histogram.record(14); - - const metrics = (await collect()); - - const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; - ensureHistogramIsCorrect( - transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), - hrTimeToNanoseconds(metric.dataPoints[0].endTime), - hrTimeToNanoseconds(metric.dataPoints[0].startTime), - [0, 100], - [0, 2, 0] - ); - } + const histogram = mockHistogram(); + histogram.record(7); + histogram.record(14); + + const metrics = (await collect()); + + const metric = metrics.instrumentationLibraryMetrics[0].metrics[0]; + ensureHistogramIsCorrect( + transform.toCollectorMetric(metric, AggregationTemporality.CUMULATIVE), + hrTimeToNanoseconds(metric.dataPoints[0].endTime), + hrTimeToNanoseconds(metric.dataPoints[0].startTime), + [0, 100], + [0, 2, 0] + ); + } ); it('should convert metric attributes value to string', () => { diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts index a2852771a4b..a38db6ca832 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts @@ -133,13 +133,13 @@ export function mockHistogram(): Histogram { const name = 'int-histogram'; meterProvider.addView({ - aggregation: new ExplicitBucketHistogramAggregation([0, 100]) - }, - { - instrument: { - name: name - } - }); + aggregation: new ExplicitBucketHistogramAggregation([0, 100]) + }, + { + instrument: { + name: name + } + }); return meter.createHistogram(name, { description: 'sample histogram description', diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts index 0f3d507de9d..0a0747b1ef6 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts @@ -209,8 +209,8 @@ describe('PrometheusExporter', () => { ); let resolve: () => void; const deferred = new Promise(res => { - resolve = res; -}); + resolve = res; + }); mockResponse.end.callsFake(() => resolve()); exporter.getMetricsRequestHandler( (mockRequest as unknown) as http.IncomingMessage, diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts index ec83b35e14a..c71c01310a9 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts @@ -37,8 +37,8 @@ const attributes = { class TestMetricReader extends MetricReader { constructor() { - super(AggregationTemporality.CUMULATIVE); -} + super(AggregationTemporality.CUMULATIVE); + } async onForceFlush() {} async onShutdown() {} } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 5620f233dca..5564c7c964f 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -104,8 +104,8 @@ const checkEqual = (x: TestRequestResponse | TestRequestResponse[]) => ( x instanceof Array && y instanceof Array ? arrayIsEqual(requestEqual)(x as any)(y as any) : !(x instanceof Array) && !(y instanceof Array) - ? requestEqual(x)(y) - : false; + ? requestEqual(x)(y) + : false; export const runTests = ( plugin: GrpcInstrumentation, @@ -292,7 +292,7 @@ export const runTests = ( 'Unary Method Error', call.request.num ) as grpcJs.ServiceError - ) + ) : callback(null, { num: call.request.num }); }, @@ -304,7 +304,7 @@ export const runTests = ( 'Unary Method Error', call.request.num ) as grpcJs.ServiceError - ) + ) : callback(null, { num: call.request.num }); }, diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index 07dc688fac8..c0c01b762c1 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -683,7 +683,7 @@ export class HttpInstrumentation extends InstrumentationBase { private _callStartSpanHook( request: http.IncomingMessage | http.RequestOptions, hookFunc: Function | undefined, - ) { + ) { if(typeof hookFunc === 'function'){ return safeExecuteInTheMiddle( () => hookFunc(request), diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts index 6741d0a042d..c0f2adab342 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts @@ -16,7 +16,7 @@ import { Span, SpanAttributes, - } from '@opentelemetry/api'; +} from '@opentelemetry/api'; import type * as http from 'http'; import type * as https from 'https'; import { diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts index 3735e530f92..5f1c11d4a7f 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 @@ -100,10 +100,10 @@ describe('Packages', () => { const urlparsed = url.parse( name === 'got' && process.versions.node.startsWith('12') ? // there is an issue with got 9.6 version and node 12 when redirecting so url above will not work - // https://github.com/nock/nock/pull/1551 - // https://github.com/sindresorhus/got/commit/bf1aa5492ae2bc78cbbec6b7d764906fb156e6c2#diff-707a4781d57c42085155dcb27edb9ccbR258 - // TODO: check if this is still the case when new version - 'https://www.google.com' + // https://github.com/nock/nock/pull/1551 + // https://github.com/sindresorhus/got/commit/bf1aa5492ae2bc78cbbec6b7d764906fb156e6c2#diff-707a4781d57c42085155dcb27edb9ccbR258 + // TODO: check if this is still the case when new version + 'https://www.google.com' : 'https://www.google.com/search?q=axios&oq=axios&aqs=chrome.0.69i59l2j0l3j69i60.811j0j7&sourceid=chrome&ie=UTF-8' ); const result = await httpPackage.get(urlparsed.href!); diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts index 687b6115019..fb9f53fc706 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts @@ -30,7 +30,7 @@ import * as types from './types'; * Base abstract internal class for instrumenting node and web plugins */ export abstract class InstrumentationAbstract - implements types.Instrumentation { +implements types.Instrumentation { protected _config: types.InstrumentationConfig; private _tracer: Tracer; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts index 9014dcdeeb5..8d4885c7b9c 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts @@ -20,7 +20,7 @@ import { } from './types'; export class InstrumentationNodeModuleDefinition - implements InstrumentationModuleDefinition { +implements InstrumentationModuleDefinition { files: InstrumentationModuleFile[]; constructor( public name: string, diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts index bf5a9a71c1f..80b617c5d7a 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts @@ -18,7 +18,7 @@ import { InstrumentationModuleFile } from './types'; import { normalize } from 'path'; export class InstrumentationNodeModuleFile - implements InstrumentationModuleFile { +implements InstrumentationModuleFile { public name: string; constructor( name: string, diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/AlwaysSampleExemplarFilter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/AlwaysSampleExemplarFilter.ts index 83859dd326b..d2c52cdc0ed 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/AlwaysSampleExemplarFilter.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/AlwaysSampleExemplarFilter.ts @@ -27,6 +27,6 @@ export class AlwaysSampleExemplarFilter implements ExemplarFilter { _attributes: MetricAttributes, _ctx: Context ): boolean { - return true; + return true; } } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/ExemplarReservoir.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/ExemplarReservoir.ts index 6d1245d33b1..190976502ef 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/ExemplarReservoir.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/ExemplarReservoir.ts @@ -67,7 +67,7 @@ class ExemplarBucket { collect(pointAttributes: MetricAttributes): Exemplar | null { if (!this._offered) return null; const currentAttributes = this.attributes; - // filter attributes + // filter attributes Object.keys(pointAttributes).forEach(key => { if (pointAttributes[key] === currentAttributes[key]) { delete currentAttributes[key]; diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/NeverSampleExemplarFilter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/NeverSampleExemplarFilter.ts index 1f40143f1fd..374f35e52f3 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/NeverSampleExemplarFilter.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/exemplar/NeverSampleExemplarFilter.ts @@ -26,6 +26,6 @@ export class NeverSampleExemplarFilter implements ExemplarFilter { _attributes: MetricAttributes, _ctx: Context ): boolean { - return false; + return false; } } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/export/MetricExporter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/MetricExporter.ts index 2d84d94eac8..06375d4da52 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/export/MetricExporter.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/MetricExporter.ts @@ -41,9 +41,9 @@ export class ConsoleMetricExporter implements PushMetricExporter { export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void) { return resultCallback({ - code: ExportResultCode.FAILED, - error: new Error('Method not implemented') - }); + code: ExportResultCode.FAILED, + error: new Error('Method not implemented') + }); } getPreferredAggregationTemporality() { diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/utils.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/utils.ts index 3b08c43b78c..b1bdbf7bd76 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/src/utils.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/utils.ts @@ -83,11 +83,11 @@ export function callWithTimeout(promise: Promise, timeout: number): Promis }); return Promise.race([promise, timeoutPromise]).then(result => { - clearTimeout(timeoutHandle); - return result; - }, - reason => { - clearTimeout(timeoutHandle); - throw reason; - }); + clearTimeout(timeoutHandle); + return result; + }, + reason => { + clearTimeout(timeoutHandle); + throw reason; + }); } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts index 814044891a4..eff5223e290 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts @@ -116,13 +116,13 @@ describe('MeterProvider', () => { // Throws with wildcard character only. assert.throws(() => meterProvider.addView({ - name: 'renamed-instrument' - }, - { - instrument: { - name: '*' - } - })); + name: 'renamed-instrument' + }, + { + instrument: { + name: '*' + } + })); // Throws with wildcard character in instrument name. assert.throws(() => meterProvider.addView({ @@ -138,13 +138,13 @@ describe('MeterProvider', () => { const meterProvider = new MeterProvider({ resource: defaultResource }); assert.throws(() => meterProvider.addView({ - name: 'renamed-instrument' - }, - { - instrument: { - type: InstrumentType.COUNTER - } - })); + name: 'renamed-instrument' + }, + { + instrument: { + type: InstrumentType.COUNTER + } + })); }); it('with named view and no instrument selector should throw', () => { @@ -155,9 +155,9 @@ describe('MeterProvider', () => { })); assert.throws(() => meterProvider.addView({ - name: 'renamed-instrument' - }, - {})); + name: 'renamed-instrument' + }, + {})); }); it('with no view parameters should throw', () => { @@ -174,14 +174,14 @@ describe('MeterProvider', () => { // Add view to rename 'non-renamed-instrument' to 'renamed-instrument' meterProvider.addView({ - name: 'renamed-instrument', - description: 'my renamed instrument' + name: 'renamed-instrument', + description: 'my renamed instrument' + }, + { + instrument: { + name: 'non-renamed-instrument', }, - { - instrument: { - name: 'non-renamed-instrument', - }, - }); + }); // Create meter and instrument. const myMeter = meterProvider.getMeter('meter1', 'v1.0.0'); @@ -233,13 +233,13 @@ describe('MeterProvider', () => { // Add view to drop all attributes except 'attrib1' meterProvider.addView({ - attributeKeys: ['attrib1'] - }, - { - instrument: { - name: 'non-renamed-instrument', - } - }); + attributeKeys: ['attrib1'] + }, + { + instrument: { + name: 'non-renamed-instrument', + } + }); // Create meter and instrument. const myMeter = meterProvider.getMeter('meter1', 'v1.0.0'); @@ -289,13 +289,13 @@ describe('MeterProvider', () => { // Add view that renames 'test-counter' to 'renamed-instrument' meterProvider.addView({ - name: 'renamed-instrument' - }, - { - instrument: { - name: 'test-counter' - } - }); + name: 'renamed-instrument' + }, + { + instrument: { + name: 'test-counter' + } + }); // Create two meters. const meter1 = meterProvider.getMeter('meter1', 'v1.0.0'); @@ -354,16 +354,16 @@ describe('MeterProvider', () => { // Add view that renames 'test-counter' to 'renamed-instrument' on 'meter1' meterProvider.addView({ - name: 'renamed-instrument' + name: 'renamed-instrument' + }, + { + instrument: { + name: 'test-counter' }, - { - instrument: { - name: 'test-counter' - }, - meter: { - name: 'meter1' - } - }); + meter: { + name: 'meter1' + } + }); // Create two meters. const meter1 = meterProvider.getMeter('meter1', 'v1.0.0'); @@ -421,28 +421,28 @@ describe('MeterProvider', () => { // Add Views to rename both instruments (of different types) to the same name. meterProvider.addView({ - name: 'renamed-instrument' + name: 'renamed-instrument' + }, + { + instrument: { + name: 'test-counter' }, - { - instrument: { - name: 'test-counter' - }, - meter: { - name: 'meter1' - } - }); + meter: { + name: 'meter1' + } + }); meterProvider.addView({ - name: 'renamed-instrument' + name: 'renamed-instrument' + }, + { + instrument: { + name: 'test-histogram' }, - { - instrument: { - name: 'test-histogram' - }, - meter: { - name: 'meter1' - } - }); + meter: { + name: 'meter1' + } + }); // Create meter and instruments. const meter = meterProvider.getMeter('meter1', 'v1.0.0'); diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/test/export/PeriodicExportingMetricReader.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/PeriodicExportingMetricReader.test.ts index 1cde6184c28..f5f30e03ab5 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/test/export/PeriodicExportingMetricReader.test.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/PeriodicExportingMetricReader.test.ts @@ -108,10 +108,10 @@ describe('PeriodicExportingMetricReader', () => { it('should construct PeriodicExportingMetricReader without exceptions', () => { const exporter = new TestDeltaMetricExporter(); const reader = new PeriodicExportingMetricReader({ - exporter: exporter, - exportIntervalMillis: 4000, - exportTimeoutMillis: 3000 - } + exporter: exporter, + exportIntervalMillis: 4000, + exportTimeoutMillis: 3000 + } ); assert.strictEqual(reader.getPreferredAggregationTemporality(), exporter.getPreferredAggregationTemporality()); }); diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/test/state/MetricStorageRegistry.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/state/MetricStorageRegistry.test.ts index cd355a6d54d..163cd762ffa 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/test/state/MetricStorageRegistry.test.ts +++ b/experimental/packages/opentelemetry-sdk-metrics-base/test/state/MetricStorageRegistry.test.ts @@ -32,9 +32,9 @@ import { class TestMetricStorage extends MetricStorage { collect(collector: MetricCollectorHandle, - collectors: MetricCollectorHandle[], - sdkStartTime: HrTime, - collectionTime: HrTime, + collectors: MetricCollectorHandle[], + sdkStartTime: HrTime, + collectionTime: HrTime, ): Promise> { return Promise.resolve(undefined); } @@ -74,8 +74,8 @@ describe('MetricStorageRegistry', () => { }); function testConflictingRegistration(existingDescriptor: InstrumentDescriptor, - otherDescriptor: InstrumentDescriptor, - expectedLog: string) { + otherDescriptor: InstrumentDescriptor, + expectedLog: string) { const registry = new MetricStorageRegistry(); const storage = new TestMetricStorage(existingDescriptor); diff --git a/experimental/packages/otlp-transformer/src/metrics/index.ts b/experimental/packages/otlp-transformer/src/metrics/index.ts index e5a8560ded0..9022048c298 100644 --- a/experimental/packages/otlp-transformer/src/metrics/index.ts +++ b/experimental/packages/otlp-transformer/src/metrics/index.ts @@ -20,7 +20,7 @@ import type { IExportMetricsServiceRequest } from './types'; import { AggregationTemporality } from '@opentelemetry/sdk-metrics-base'; export function createExportMetricsServiceRequest(resourceMetrics: ResourceMetrics, - aggregationTemporality: AggregationTemporality): IExportMetricsServiceRequest | null { + aggregationTemporality: AggregationTemporality): IExportMetricsServiceRequest | null { return { resourceMetrics: [{ resource: { diff --git a/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts b/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts index 4eb200c0aae..7c8748f2589 100644 --- a/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts +++ b/packages/opentelemetry-context-async-hooks/src/AbstractAsyncHooksContextManager.ts @@ -37,7 +37,7 @@ const ADD_LISTENER_METHODS = [ ]; export abstract class AbstractAsyncHooksContextManager - implements ContextManager { +implements ContextManager { abstract active(): Context; abstract with ReturnType>( diff --git a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts index d612d4ca6b4..542221be590 100644 --- a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts +++ b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts @@ -272,13 +272,13 @@ describe('ZoneContextManager', () => { const fn: any = contextManager.bind( context, () => { - assert.strictEqual( - contextManager.active(), - context, - 'should have context' - ); - return done(); - }); + assert.strictEqual( + contextManager.active(), + context, + 'should have context' + ); + return done(); + }); fn(); }); diff --git a/packages/opentelemetry-core/src/baggage/utils.ts b/packages/opentelemetry-core/src/baggage/utils.ts index f75fe0cfc9d..390b143ca7f 100644 --- a/packages/opentelemetry-core/src/baggage/utils.ts +++ b/packages/opentelemetry-core/src/baggage/utils.ts @@ -26,7 +26,7 @@ type ParsedBaggageKeyValue = { key: string, value: string, metadata: BaggageEntr export function serializeKeyPairs(keyPairs: string[]): string { return keyPairs.reduce((hValue: string, current: string) => { const value = `${hValue}${hValue !== '' ? BAGGAGE_ITEMS_SEPARATOR : '' - }${current}`; + }${current}`; return value.length > BAGGAGE_MAX_TOTAL_LENGTH ? hValue : value; }, ''); } diff --git a/packages/opentelemetry-core/src/platform/browser/globalThis.ts b/packages/opentelemetry-core/src/platform/browser/globalThis.ts index 53dd1c3d02a..aa3c2fec6e7 100644 --- a/packages/opentelemetry-core/src/platform/browser/globalThis.ts +++ b/packages/opentelemetry-core/src/platform/browser/globalThis.ts @@ -29,7 +29,7 @@ // eslint-disable-next-line node/no-unsupported-features/es-builtins, no-undef export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : - typeof self === 'object' ? self : - typeof window === 'object' ? window : - typeof global === 'object' ? global : + typeof self === 'object' ? self : + typeof window === 'object' ? window : + typeof global === 'object' ? global : {} as typeof globalThis; diff --git a/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts b/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts index eebfb121e77..0811da9cf6b 100644 --- a/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts +++ b/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts @@ -15,5 +15,5 @@ */ export function defaultServiceName(): string { - return 'unknown_service'; + return 'unknown_service'; } diff --git a/packages/opentelemetry-resources/src/platform/node/default-service-name.ts b/packages/opentelemetry-resources/src/platform/node/default-service-name.ts index c1df6d22fb9..8b3b1a3b54f 100644 --- a/packages/opentelemetry-resources/src/platform/node/default-service-name.ts +++ b/packages/opentelemetry-resources/src/platform/node/default-service-name.ts @@ -15,5 +15,5 @@ */ export function defaultServiceName(): string { - return `unknown_service:${process.argv0}`; + return `unknown_service:${process.argv0}`; } 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 7918bbc951e..71453bb260f 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts @@ -67,14 +67,14 @@ describe('Tracer', () => { } class DummySpanProcessor implements SpanProcessor { - forceFlush () { - return Promise.resolve(); - } - onStart() {} - onEnd() {} - shutdown() { - return Promise.resolve(); - } + forceFlush () { + return Promise.resolve(); + } + onStart() {} + onEnd() {} + shutdown() { + return Promise.resolve(); + } } beforeEach(() => {