Skip to content

Commit 218b290

Browse files
dyladanMark Wolff
and
Mark Wolff
authored
chore: lint api package (open-telemetry#771)
Co-Authored-By: Mark Wolff <[email protected]>
1 parent 92b41bc commit 218b290

File tree

7 files changed

+35
-25
lines changed

7 files changed

+35
-25
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ jobs:
174174
name: Check code style and linting
175175
command: npm run check
176176
- run:
177-
name: Install API dependencies
178-
command: lerna bootstrap --scope @opentelemetry/api --include-filtered-dependencies
177+
name: Install doc dependencies
178+
command: lerna bootstrap --no-ci --scope @opentelemetry/api --include-filtered-dependencies -- --only dev
179179
- run:
180180
name: Docs tests
181181
command: npm run docs-test
@@ -185,7 +185,7 @@ jobs:
185185
- out
186186
- run:
187187
name: Install minimal modules to lint examples
188-
command: npm i -D eslint eslint-plugin-import eslint-config-airbnb-base
188+
command: npm i --no-save eslint eslint-plugin-import eslint-config-airbnb-base
189189
- run:
190190
name: Lint examples
191191
command: npm run lint-examples

packages/opentelemetry-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"compile": "npm run version:update && tsc -p .",
1818
"fix": "gts fix",
1919
"docs-test": "linkinator docs/out --silent --skip david-dm.org",
20-
"docs": "typedoc --tsconfig tsconfig.json",
20+
"docs": "typedoc --tsconfig tsconfig.json --exclude test/**/*.ts",
2121
"prepare": "npm run compile"
2222
},
2323
"keywords": [

packages/opentelemetry-api/src/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@ export * from './metrics/BoundInstrument';
2525
export * from './metrics/Meter';
2626
export * from './metrics/MeterProvider';
2727
export * from './metrics/Metric';
28+
export * from './metrics/NoopMeter';
29+
export * from './metrics/NoopMeterProvider';
2830
export * from './trace/attributes';
2931
export * from './trace/Event';
3032
export * from './trace/instrumentation/Plugin';
3133
export * from './trace/link';
34+
export * from './trace/NoopSpan';
35+
export * from './trace/NoopTracer';
36+
export * from './trace/NoopTracerProvider';
3237
export * from './trace/Sampler';
33-
export * from './trace/span';
34-
export * from './trace/SpanOptions';
3538
export * from './trace/span_context';
3639
export * from './trace/span_kind';
40+
export * from './trace/span';
41+
export * from './trace/SpanOptions';
3742
export * from './trace/status';
3843
export * from './trace/TimedEvent';
39-
export * from './trace/tracer';
40-
export * from './trace/tracer_provider';
4144
export * from './trace/trace_flags';
4245
export * from './trace/trace_state';
43-
export * from './trace/NoopSpan';
44-
export * from './trace/NoopTracer';
45-
export * from './trace/NoopTracerProvider';
46-
export * from './metrics/NoopMeterProvider';
47-
export * from './metrics/NoopMeter';
46+
export * from './trace/tracer_provider';
47+
export * from './trace/tracer';
4848

4949
export { Context } from '@opentelemetry/scope-base';
5050

packages/opentelemetry-api/test/api/api.test.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@
1515
*/
1616

1717
import * as assert from 'assert';
18-
import api, { TraceFlags, NoopSpan, NoopTracerProvider, NoopTracer, SpanOptions, Span } from '../../src';
18+
import api, {
19+
TraceFlags,
20+
NoopSpan,
21+
NoopTracerProvider,
22+
NoopTracer,
23+
SpanOptions,
24+
Span,
25+
} from '../../src';
1926

2027
describe('API', () => {
2128
const functions = [
@@ -27,7 +34,7 @@ describe('API', () => {
2734
];
2835

2936
it('should expose a tracer provider via getTracerProvider', () => {
30-
const tracer = api.trace.getTracerProvider();
37+
const tracer = api.trace.getTracerProvider();
3138
assert.ok(tracer);
3239
assert.strictEqual(typeof tracer, 'object');
3340
});
@@ -46,7 +53,7 @@ describe('API', () => {
4653

4754
it('should not crash', () => {
4855
functions.forEach(fn => {
49-
const tracer = api.trace.getTracerProvider();
56+
const tracer = api.trace.getTracerProvider();
5057
try {
5158
((tracer as unknown) as { [fn: string]: Function })[fn](); // Try to run the function
5259
assert.ok(true, fn);
@@ -60,16 +67,13 @@ describe('API', () => {
6067

6168
it('should use the global tracer provider', () => {
6269
api.trace.initGlobalTracerProvider(new TestTracerProvider());
63-
const tracer = api.trace.getTracerProvider().getTracer('name');
70+
const tracer = api.trace.getTracerProvider().getTracer('name');
6471
const span = tracer.startSpan('test');
6572
assert.deepStrictEqual(span, dummySpan);
6673
});
6774

6875
class TestTracer extends NoopTracer {
69-
startSpan(
70-
name: string,
71-
options?: SpanOptions | undefined
72-
): Span {
76+
startSpan(name: string, options?: SpanOptions): Span {
7377
return dummySpan;
7478
}
7579
}

packages/opentelemetry-api/test/noop-implementations/noop-meter.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ import {
2323
NOOP_BOUND_MEASURE,
2424
NOOP_COUNTER_METRIC,
2525
NOOP_GAUGE_METRIC,
26-
NOOP_MEASURE_METRIC
26+
NOOP_MEASURE_METRIC,
2727
} from '../../src';
2828

29-
3029
describe('NoopMeter', () => {
3130
it('should not crash', () => {
3231
const meter = new NoopMeterProvider().getMeter('test-noop');

packages/opentelemetry-api/test/noop-implementations/noop-span.test.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@
1515
*/
1616

1717
import * as assert from 'assert';
18-
import { CanonicalCode, INVALID_SPAN_ID, INVALID_TRACE_ID, NoopSpan, TraceFlags } from '../../src';
18+
import {
19+
CanonicalCode,
20+
INVALID_SPAN_ID,
21+
INVALID_TRACE_ID,
22+
NoopSpan,
23+
TraceFlags,
24+
} from '../../src';
1925

2026
describe('NoopSpan', () => {
2127
it('do not crash', () => {

packages/opentelemetry-api/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"outDir": "build"
66
},
77
"include": [
8-
"src/**/*.ts"
8+
"src/**/*.ts",
9+
"test/**/*.ts"
910
],
1011
"typedocOptions": {
1112
"name": "OpenTelemetry API for JavaScript",

0 commit comments

Comments
 (0)