Skip to content

Commit 42e10a5

Browse files
mayurkale22danielkhan
authored andcommitted
refactor: move ExportResult to @opentelemetry/sdk-base (#409)
1 parent 82b5fad commit 42e10a5

File tree

15 files changed

+17
-28
lines changed

15 files changed

+17
-28
lines changed

packages/opentelemetry-exporter-jaeger/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
},
5252
"dependencies": {
5353
"@opentelemetry/core": "^0.1.0",
54+
"@opentelemetry/sdk-base": "^0.1.0",
5455
"@opentelemetry/tracer-basic": "^0.1.0",
5556
"@opentelemetry/types": "^0.1.0",
5657
"jaeger-client": "^3.15.0"

packages/opentelemetry-exporter-jaeger/src/jaeger.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {
18-
SpanExporter,
19-
ReadableSpan,
20-
ExportResult,
21-
} from '@opentelemetry/tracer-basic';
17+
import { SpanExporter, ReadableSpan } from '@opentelemetry/tracer-basic';
18+
import { ExportResult } from '@opentelemetry/sdk-base';
2219
import * as jaegerTypes from './types';
2320
import { NoopLogger } from '@opentelemetry/core';
2421
import * as types from '@opentelemetry/types';

packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import { JaegerExporter } from '../src';
1919
import { NoopLogger } from '@opentelemetry/core';
2020
import * as types from '@opentelemetry/types';
2121
import { ThriftProcess } from '../src/types';
22-
import { ExportResult, ReadableSpan } from '@opentelemetry/tracer-basic';
22+
import { ReadableSpan } from '@opentelemetry/tracer-basic';
23+
import { ExportResult } from '@opentelemetry/sdk-base';
2324

2425
describe('JaegerExporter', () => {
2526
describe('constructor', () => {

packages/opentelemetry-exporter-zipkin/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
},
5454
"dependencies": {
5555
"@opentelemetry/core": "^0.1.0",
56+
"@opentelemetry/sdk-base": "^0.1.0",
5657
"@opentelemetry/tracer-basic": "^0.1.0",
5758
"@opentelemetry/types": "^0.1.0"
5859
}

packages/opentelemetry-exporter-zipkin/src/zipkin.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ import * as http from 'http';
1919
import * as https from 'https';
2020
import * as url from 'url';
2121
import { NoopLogger } from '@opentelemetry/core';
22-
import {
23-
SpanExporter,
24-
ReadableSpan,
25-
ExportResult,
26-
} from '@opentelemetry/tracer-basic';
27-
22+
import { SpanExporter, ReadableSpan } from '@opentelemetry/tracer-basic';
23+
import { ExportResult } from '@opentelemetry/sdk-base';
2824
import * as zipkinTypes from './types';
2925
import {
3026
toZipkinSpan,

packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
import * as assert from 'assert';
1818
import * as nock from 'nock';
19-
import { ExportResult, ReadableSpan } from '@opentelemetry/tracer-basic';
19+
import { ReadableSpan } from '@opentelemetry/tracer-basic';
20+
import { ExportResult } from '@opentelemetry/sdk-base';
2021
import { NoopLogger, hrTimeToMicroseconds } from '@opentelemetry/core';
2122
import * as types from '@opentelemetry/types';
2223
import { ZipkinExporter } from '../src';

packages/opentelemetry-metrics/src/export/types.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
import { HrTime } from '@opentelemetry/types';
26-
import { Resource } from '@opentelemetry/sdk-base';
26+
import { Resource, ExportResult } from '@opentelemetry/sdk-base';
2727

2828
export interface ReadableMetric {
2929
/**
@@ -348,12 +348,3 @@ export interface MetricExporter {
348348
resultCallback: (result: ExportResult) => void
349349
): void;
350350
}
351-
352-
/**
353-
* @TODO: Wait on https://github.com/open-telemetry/opentelemetry-js/issues/309
354-
*/
355-
export enum ExportResult {
356-
SUCCESS,
357-
FAILED_NOT_RETRYABLE,
358-
FAILED_RETRYABLE,
359-
}

packages/opentelemetry-sdk-base/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
*/
1616

1717
export * from './resources/Resource';
18+
export * from './ExportResult';

packages/opentelemetry-tracer-basic/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"dependencies": {
6868
"@opentelemetry/core": "^0.1.0",
6969
"@opentelemetry/scope-base": "^0.1.0",
70+
"@opentelemetry/sdk-base": "^0.1.0",
7071
"@opentelemetry/types": "^0.1.0"
7172
}
7273
}

0 commit comments

Comments
 (0)