Skip to content

Names spans at stop #53

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

Merged
merged 1 commit into from
Aug 26, 2022
Merged

Names spans at stop #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...main/java/io/micrometer/tracing/handler/PropagatingReceiverTracingObservationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ public void onStart(T context) {
Span.Builder extractedSpan = this.propagator.extract(context.getCarrier(),
(carrier, key) -> context.getGetter().get(carrier, key));
extractedSpan.kind(Span.Kind.valueOf(context.getKind().name()));
String name = context.getContextualName() != null ? context.getContextualName() : context.getName();
extractedSpan.name(name);
getTracingContext(context).setSpan(customizeExtractedSpan(context, extractedSpan).start());
}

/**
* Customizes the extracted span (e.g. you can set the {@link Span.Kind} via
* {@link Span.Builder#kind(Span.Kind)}).
* @param context context
* @param builder span builder
* @return span builder
*/
Expand All @@ -77,6 +76,7 @@ public void onStop(T context) {
Span span = getRequiredSpan(context);
tagSpan(context, span);
customizeReceiverSpan(context, span);
span.name(getSpanName(context));
span.end();
}

Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/io/micrometer/tracing/handler/PropagatingSenderTracingObservationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ public Span createSenderSpan(T context) {
if (parentSpan != null) {
builder = builder.setParent(parentSpan.context());
}
String name = context.getContextualName() != null ? context.getContextualName() : context.getName();
if (context.getRemoteServiceName() != null) {
builder = builder.remoteServiceName(context.getRemoteServiceName());
}
return builder.name(name).start();
return builder.start();
}

@Override
Expand All @@ -83,6 +82,7 @@ public void onStop(T context) {
Span span = getRequiredSpan(context);
tagSpan(context, span);
customizeSenderSpan(context, span);
span.name(getSpanName(context));
span.end();
}

Expand Down