From 75dbff532855ab5ffffddd911a6f4e60b11974ce Mon Sep 17 00:00:00 2001 From: Ali Sabzevari Date: Mon, 9 Aug 2021 18:56:31 +0200 Subject: [PATCH 1/4] chore(propagator-jaeger): fix lint warnings --- .../opentelemetry-propagator-jaeger/src/JaegerPropagator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts b/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts index 252dc39fb5..f3a739f4b9 100644 --- a/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts +++ b/packages/opentelemetry-propagator-jaeger/src/JaegerPropagator.ts @@ -55,7 +55,7 @@ export class JaegerPropagator implements TextMapPropagator { this._jaegerTraceHeader = customTraceHeader || UBER_TRACE_ID_HEADER; } - inject(context: Context, carrier: unknown, setter: TextMapSetter) { + inject(context: Context, carrier: unknown, setter: TextMapSetter): void { const spanContext = trace.getSpanContext(context); const baggage = propagation.getBaggage(context); if (spanContext && isTracingSuppressed(context) === false) { From c05d19ab8a714bac80e4329288f8fb0c97f14d1b Mon Sep 17 00:00:00 2001 From: Ali Sabzevari Date: Mon, 9 Aug 2021 20:57:23 +0200 Subject: [PATCH 2/4] chore(propagator-b3): fix lint warnings --- packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts | 4 ++-- packages/opentelemetry-propagator-b3/src/B3Propagator.ts | 2 +- .../opentelemetry-propagator-b3/src/B3SinglePropagator.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts b/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts index 17b2a3859d..63189e1578 100644 --- a/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts @@ -42,7 +42,7 @@ function isValidSampledValue(sampled: TraceFlags | undefined): boolean { return sampled === TraceFlags.SAMPLED || sampled === TraceFlags.NONE; } -export function parseHeader(header: unknown) { +function parseHeader(header: unknown) { return Array.isArray(header) ? header[0] : header; } @@ -93,7 +93,7 @@ function getTraceFlags( * Based on: https://github.com/openzipkin/b3-propagation */ export class B3MultiPropagator implements TextMapPropagator { - inject(context: Context, carrier: unknown, setter: TextMapSetter) { + inject(context: Context, carrier: unknown, setter: TextMapSetter): void { const spanContext = trace.getSpanContext(context); if ( !spanContext || diff --git a/packages/opentelemetry-propagator-b3/src/B3Propagator.ts b/packages/opentelemetry-propagator-b3/src/B3Propagator.ts index 760752d84b..cc975ad49e 100644 --- a/packages/opentelemetry-propagator-b3/src/B3Propagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3Propagator.ts @@ -53,7 +53,7 @@ export class B3Propagator implements TextMapPropagator { } } - inject(context: Context, carrier: unknown, setter: TextMapSetter) { + inject(context: Context, carrier: unknown, setter: TextMapSetter): void { if (isTracingSuppressed(context)) { return; } diff --git a/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts b/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts index 6a26a93265..eb8ac46ac0 100644 --- a/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts +++ b/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts @@ -49,7 +49,7 @@ function convertToTraceFlags(samplingState: string | undefined): TraceFlags { * Based on: https://github.com/openzipkin/b3-propagation */ export class B3SinglePropagator implements TextMapPropagator { - inject(context: Context, carrier: unknown, setter: TextMapSetter) { + inject(context: Context, carrier: unknown, setter: TextMapSetter): void { const spanContext = trace.getSpanContext(context); if ( !spanContext || From 91b90de6e7d8ee68fb9e766c00a86fb40bf7c59e Mon Sep 17 00:00:00 2001 From: Ali Sabzevari Date: Mon, 9 Aug 2021 20:59:50 +0200 Subject: [PATCH 3/4] chore(resources): fix lint warnings --- .../src/platform/browser/default-service-name.ts | 4 ++-- .../src/platform/node/default-service-name.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 c31f3bedd9..eebfb121e7 100644 --- a/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts +++ b/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts @@ -14,6 +14,6 @@ * limitations under the License. */ -export function defaultServiceName() { +export function defaultServiceName(): string { return 'unknown_service'; -} \ No newline at end of file +} 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 0f5b870a63..c1df6d22fb 100644 --- a/packages/opentelemetry-resources/src/platform/node/default-service-name.ts +++ b/packages/opentelemetry-resources/src/platform/node/default-service-name.ts @@ -14,6 +14,6 @@ * limitations under the License. */ -export function defaultServiceName() { +export function defaultServiceName(): string { return `unknown_service:${process.argv0}`; -} \ No newline at end of file +} From 2439b248011e26fc683f24e35f8c0f563bc199ae Mon Sep 17 00:00:00 2001 From: Ali Sabzevari Date: Mon, 9 Aug 2021 21:06:55 +0200 Subject: [PATCH 4/4] chore(sdk-metrics-base): fix lint warnings --- .../opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts | 5 +++-- .../src/BatchObserverResult.ts | 2 +- packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts | 2 +- packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts | 1 + packages/opentelemetry-sdk-metrics-base/src/Metric.ts | 3 ++- .../opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts | 2 +- .../src/UpDownCounterMetric.ts | 2 +- .../src/ValueRecorderMetric.ts | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts b/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts index a3098f119c..6f48df49bf 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts @@ -14,6 +14,7 @@ * limitations under the License. */ import * as api from '@opentelemetry/api-metrics'; +import { Observation } from '@opentelemetry/api-metrics'; import { InstrumentationLibrary } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; import { BoundObserver } from './BoundInstrument'; @@ -64,14 +65,14 @@ export abstract class BaseObserverMetric return super.getMetricRecord(); } - protected _processResults(observerResult: ObserverResult) { + protected _processResults(observerResult: ObserverResult): void { observerResult.values.forEach((value, labels) => { const instrument = this.bind(labels); instrument.update(value); }); } - observation(value: number) { + observation(value: number): Observation { return { value, observer: this as BaseObserverMetric, diff --git a/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts b/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts index da6d5367e0..4e2c0c8b28 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts @@ -35,7 +35,7 @@ export class BatchObserverResult implements api.BatchObserverResult { * updated * @param [callback] */ - onObserveCalled(callback?: () => void) { + onObserveCalled(callback?: () => void): void { this._callback = callback; } diff --git a/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts b/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts index 36b4fb70c7..4f4fe3f04d 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts @@ -48,7 +48,7 @@ export class CounterMetric extends Metric implements api.Counter { * @param [labels = {}] key-values pairs that are associated with a specific metric * that you want to record. */ - add(value: number, labels: api.Labels = {}) { + add(value: number, labels: api.Labels = {}): void { this.bind(labels).add(value); } } diff --git a/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts b/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts index 1d0cf1f098..226ff63aa6 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts @@ -54,6 +54,7 @@ export class MeterProvider implements api.MeterProvider { ); } + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion return this._meters.get(key)!; } diff --git a/packages/opentelemetry-sdk-metrics-base/src/Metric.ts b/packages/opentelemetry-sdk-metrics-base/src/Metric.ts index b753b322ea..fc3cc06664 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/Metric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/Metric.ts @@ -59,6 +59,7 @@ export abstract class Metric */ bind(labels: api.Labels): T { const hash = hashLabels(labels); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion if (this._instruments.has(hash)) return this._instruments.get(hash)!; const instrument = this._makeInstrument(labels); @@ -88,7 +89,7 @@ export abstract class Metric return this._kind; } - getAggregationTemporality() { + getAggregationTemporality(): api.AggregationTemporality { return this._aggregationTemporality; } diff --git a/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts b/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts index 7244bc88d4..8f58727ceb 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts @@ -45,7 +45,7 @@ export class SumObserverMetric ); } - protected override _processResults(observerResult: ObserverResult) { + protected override _processResults(observerResult: ObserverResult): void { observerResult.values.forEach((value, labels) => { const instrument = this.bind(labels); // SumObserver is monotonic which means it should only accept values diff --git a/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts b/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts index 36650b2336..491a4647dc 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts @@ -56,7 +56,7 @@ export class UpDownCounterMetric * @param [labels = {}] key-values pairs that are associated with a specific * metric that you want to record. */ - add(value: number, labels: api.Labels = {}) { + add(value: number, labels: api.Labels = {}): void { this.bind(labels).add(value); } } diff --git a/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts b/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts index cda854d8ed..28e9d7e1b2 100644 --- a/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts +++ b/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts @@ -51,7 +51,7 @@ export class ValueRecorderMetric ); } - record(value: number, labels: api.Labels = {}) { + record(value: number, labels: api.Labels = {}): void { this.bind(labels).record(value); } }