Skip to content

Commit e9996cd

Browse files
committed
chore(sdk-trace-base): fix lint warnings
1 parent 6a00988 commit e9996cd

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export class BasicTracerProvider implements TracerProvider {
9696
this._tracers.set(key, new Tracer({ name, version }, this._config, this));
9797
}
9898

99+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
99100
return this._tracers.get(key)!;
100101
}
101102

@@ -133,7 +134,7 @@ export class BasicTracerProvider implements TracerProvider {
133134
*
134135
* @param config Configuration object for SDK registration
135136
*/
136-
register(config: SDKRegistrationConfig = {}) {
137+
register(config: SDKRegistrationConfig = {}): void {
137138
trace.setGlobalTracerProvider(this);
138139
if (config.propagator === undefined) {
139140
config.propagator = this._buildPropagatorFromEnv();
@@ -197,7 +198,7 @@ export class BasicTracerProvider implements TracerProvider {
197198
});
198199
}
199200

200-
shutdown() {
201+
shutdown(): Promise<void> {
201202
return this.activeSpanProcessor.shutdown();
202203
}
203204

packages/opentelemetry-sdk-trace-base/src/Span.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class Span implements api.Span, ReadableSpan {
188188
return this._ended === false;
189189
}
190190

191-
recordException(exception: api.Exception, time: api.TimeInput = hrTime()) {
191+
recordException(exception: api.Exception, time: api.TimeInput = hrTime()): void {
192192
const attributes: api.SpanAttributes = {};
193193
if (typeof exception === 'string') {
194194
attributes[SemanticAttributes.EXCEPTION_MESSAGE] = exception;

packages/opentelemetry-sdk-trace-base/src/Tracer.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { BasicTracerProvider } from './BasicTracerProvider';
2727
import { Span } from './Span';
2828
import { SpanLimits, TracerConfig } from './types';
2929
import { mergeConfig } from './utility';
30+
import { SpanProcessor } from './SpanProcessor';
3031

3132
/**
3233
* This class represents a basic tracer.
@@ -216,7 +217,7 @@ export class Tracer implements api.Tracer {
216217
return this._spanLimits;
217218
}
218219

219-
getActiveSpanProcessor() {
220+
getActiveSpanProcessor(): SpanProcessor {
220221
return this._tracerProvider.getActiveSpanProcessor();
221222
}
222223
}

packages/opentelemetry-sdk-trace-base/src/config.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ export const DEFAULT_CONFIG = {
4848

4949
/**
5050
* Based on environment, builds a sampler, complies with specification.
51-
* @param env optional, by default uses getEnv(), but allows passing a value to reuse parsed environment
51+
* @param environment optional, by default uses getEnv(), but allows passing a value to reuse parsed environment
5252
*/
5353
export function buildSamplerFromEnv(
54-
env: Required<ENVIRONMENT> = getEnv()
54+
environment: Required<ENVIRONMENT> = getEnv()
5555
): Sampler {
56-
switch (env.OTEL_TRACES_SAMPLER) {
56+
switch (environment.OTEL_TRACES_SAMPLER) {
5757
case TracesSamplerValues.AlwaysOn:
5858
return new AlwaysOnSampler();
5959
case TracesSamplerValues.AlwaysOff:
@@ -67,44 +67,44 @@ export function buildSamplerFromEnv(
6767
root: new AlwaysOffSampler(),
6868
});
6969
case TracesSamplerValues.TraceIdRatio:
70-
return new TraceIdRatioBasedSampler(getSamplerProbabilityFromEnv(env));
70+
return new TraceIdRatioBasedSampler(getSamplerProbabilityFromEnv(environment));
7171
case TracesSamplerValues.ParentBasedTraceIdRatio:
7272
return new ParentBasedSampler({
73-
root: new TraceIdRatioBasedSampler(getSamplerProbabilityFromEnv(env)),
73+
root: new TraceIdRatioBasedSampler(getSamplerProbabilityFromEnv(environment)),
7474
});
7575
default:
7676
diag.error(
77-
`OTEL_TRACES_SAMPLER value "${env.OTEL_TRACES_SAMPLER} invalid, defaulting to ${FALLBACK_OTEL_TRACES_SAMPLER}".`
77+
`OTEL_TRACES_SAMPLER value "${environment.OTEL_TRACES_SAMPLER} invalid, defaulting to ${FALLBACK_OTEL_TRACES_SAMPLER}".`
7878
);
7979
return new AlwaysOnSampler();
8080
}
8181
}
8282

8383
function getSamplerProbabilityFromEnv(
84-
env: Required<ENVIRONMENT>
84+
environment: Required<ENVIRONMENT>
8585
): number | undefined {
8686
if (
87-
env.OTEL_TRACES_SAMPLER_ARG === undefined ||
88-
env.OTEL_TRACES_SAMPLER_ARG === ''
87+
environment.OTEL_TRACES_SAMPLER_ARG === undefined ||
88+
environment.OTEL_TRACES_SAMPLER_ARG === ''
8989
) {
9090
diag.error(
9191
`OTEL_TRACES_SAMPLER_ARG is blank, defaulting to ${DEFAULT_RATIO}.`
9292
);
9393
return DEFAULT_RATIO;
9494
}
9595

96-
const probability = Number(env.OTEL_TRACES_SAMPLER_ARG);
96+
const probability = Number(environment.OTEL_TRACES_SAMPLER_ARG);
9797

9898
if (isNaN(probability)) {
9999
diag.error(
100-
`OTEL_TRACES_SAMPLER_ARG=${env.OTEL_TRACES_SAMPLER_ARG} was given, but it is invalid, defaulting to ${DEFAULT_RATIO}.`
100+
`OTEL_TRACES_SAMPLER_ARG=${environment.OTEL_TRACES_SAMPLER_ARG} was given, but it is invalid, defaulting to ${DEFAULT_RATIO}.`
101101
);
102102
return DEFAULT_RATIO;
103103
}
104104

105105
if (probability < 0 || probability > 1) {
106106
diag.error(
107-
`OTEL_TRACES_SAMPLER_ARG=${env.OTEL_TRACES_SAMPLER_ARG} was given, but it is out of range ([0..1]), defaulting to ${DEFAULT_RATIO}.`
107+
`OTEL_TRACES_SAMPLER_ARG=${environment.OTEL_TRACES_SAMPLER_ARG} was given, but it is out of range ([0..1]), defaulting to ${DEFAULT_RATIO}.`
108108
);
109109
return DEFAULT_RATIO;
110110
}

packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class InMemorySpanExporter implements SpanExporter {
5151
return Promise.resolve();
5252
}
5353

54-
reset() {
54+
reset(): void {
5555
this._finishedSpans = [];
5656
}
5757

packages/opentelemetry-sdk-trace-base/src/utility.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { TracerConfig } from './types';
2121
* Function to merge Default configuration (as specified in './config') with
2222
* user provided configurations.
2323
*/
24-
export function mergeConfig(userConfig: TracerConfig) {
24+
export function mergeConfig(userConfig: TracerConfig): TracerConfig {
2525
const perInstanceDefaults: Partial<TracerConfig> = {
2626
sampler: buildSamplerFromEnv(),
2727
};

packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
} from '../../src';
4747

4848
describe('BasicTracerProvider', () => {
49-
let removeEvent: Function | undefined;
49+
let removeEvent: (() => void) | undefined;
5050
const envSource = (typeof window !== 'undefined'
5151
? window
5252
: process.env) as any;
@@ -267,7 +267,7 @@ describe('BasicTracerProvider', () => {
267267
provider.register();
268268
assert.ok(
269269
errorStub.getCall(0).args[0] ===
270-
'Exporter "missing-exporter" requested through environment variable is unavailable.'
270+
'Exporter "missing-exporter" requested through environment variable is unavailable.'
271271
);
272272
errorStub.restore();
273273
});

packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class TestProcessor implements SpanProcessor {
4545
}
4646

4747
describe('MultiSpanProcessor', () => {
48-
let removeEvent: Function | undefined;
48+
let removeEvent: (() => void) | undefined;
4949
afterEach(() => {
5050
if (removeEvent) {
5151
removeEvent();

0 commit comments

Comments
 (0)