Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: zipkin-exporter: don't export after shutdown #526

Merged
merged 4 commits into from
Nov 19, 2019
Merged

fix: zipkin-exporter: don't export after shutdown #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb5d416
fix: zipkin-exporter: don't export after shutdown
Flarna Nov 13, 2019
808ad65
chore: use setTimeout instead setImmediate for browsers
Flarna Nov 13, 2019
8f85cd2
chore: rename shutdown to isShutdown
Flarna Nov 15, 2019
6ae5d63
Merge branch 'master' into fix_zipkin-export_shutdown
mayurkale22 Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/opentelemetry-exporter-zipkin/src/zipkin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export class ZipkinExporter implements SpanExporter {
private readonly _statusCodeTagName: string;
private readonly _statusDescriptionTagName: string;
private readonly _reqOpts: http.RequestOptions;
private _isShutdown: boolean;

constructor(config: zipkinTypes.ExporterConfig) {
const urlStr = config.url || ZipkinExporter.DEFAULT_URL;
Expand All @@ -60,6 +61,7 @@ export class ZipkinExporter implements SpanExporter {
this._statusCodeTagName = config.statusCodeTagName || statusCodeTagName;
this._statusDescriptionTagName =
config.statusDescriptionTagName || statusDescriptionTagName;
this._isShutdown = false;
}

/**
Expand All @@ -70,6 +72,10 @@ export class ZipkinExporter implements SpanExporter {
resultCallback: (result: ExportResult) => void
) {
this._logger.debug('Zipkin exporter export');
if (this._isShutdown) {
setTimeout(() => resultCallback(ExportResult.FAILED_NOT_RETRYABLE));
return;
}
return this._sendSpans(spans, resultCallback);
}

Expand All @@ -78,6 +84,10 @@ export class ZipkinExporter implements SpanExporter {
*/
shutdown() {
this._logger.debug('Zipkin exporter shutdown');
if (this._isShutdown) {
return;
}
this._isShutdown = true;
// Make an optimistic flush.
if (this._forceFlush) {
// @todo get spans from span processor (batch)
Expand Down
14 changes: 14 additions & 0 deletions packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,20 @@ describe('ZipkinExporter', () => {
assert.strictEqual(result, ExportResult.FAILED_RETRYABLE);
});
});

it('should return FailedNonRetryable after shutdown', done => {
const exporter = new ZipkinExporter({
serviceName: 'my-service',
logger: new NoopLogger(),
});

exporter.shutdown();

exporter.export([getReadableSpan()], (result: ExportResult) => {
assert.strictEqual(result, ExportResult.FAILED_NOT_RETRYABLE);
done();
});
});
});

describe('shutdown', () => {
Expand Down