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

feat(exporter-zipkin): per-span service name #1789

Merged
merged 7 commits into from
Jan 15, 2021
Merged

feat(exporter-zipkin): per-span service name #1789

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e05188
fix(exporter-zipkin): support per-span service name either from its o…
sfishel-splunk Jan 5, 2021
d241930
fix: add tests, fix failing tests for persistent service name
sfishel-splunk Jan 12, 2021
9079b08
fix: remove any type
sfishel-splunk Jan 12, 2021
8cd349d
Merge branch 'master' into support-service-name-per-span
sfishel-splunk Jan 12, 2021
e126bc8
Merge branch 'master' into support-service-name-per-span
sfishel-splunk Jan 12, 2021
2603763
Merge branch 'master' into support-service-name-per-span
sfishel-splunk Jan 13, 2021
f96fec0
Merge branch 'master' into support-service-name-per-span
dyladan Jan 15, 2021
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
11 changes: 6 additions & 5 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 @@ -59,10 +59,7 @@ export class ZipkinExporter implements SpanExporter {
resultCallback: (result: ExportResult) => void
) {
if (typeof this._serviceName !== 'string') {
this._serviceName = String(
spans[0].resource.attributes[SERVICE_RESOURCE.NAME] ||
this.DEFAULT_SERVICE_NAME
);
this._serviceName = this.DEFAULT_SERVICE_NAME;
}
this._logger.debug('Zipkin exporter export');
if (this._isShutdown) {
Expand Down Expand Up @@ -109,7 +106,11 @@ export class ZipkinExporter implements SpanExporter {
const zipkinSpans = spans.map(span =>
toZipkinSpan(
span,
serviceName,
String(
span.attributes[SERVICE_RESOURCE.NAME] ||
span.resource.attributes[SERVICE_RESOURCE.NAME] ||
serviceName
),
this._statusCodeTagName,
this._statusDescriptionTagName
)
Expand Down