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

Change names of servlet based server spans #428

Merged
merged 5 commits into from
May 25, 2020
Merged

Change names of servlet based server spans #428

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58df836
Add documentation describing non-obvious points of Servlet instrument…
iNikem May 22, 2020
6404e59
Change names of servlet based server spans
iNikem May 22, 2020
8be103b
Polish
iNikem May 25, 2020
bb9c06a
Merge remote-tracking branch 'upstream/master' into servlet-spans
iNikem May 25, 2020
43620e4
Update instrumentation/servlet/src/main/java/io/opentelemetry/auto/in…
trask May 25, 2020
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
2 changes: 1 addition & 1 deletion ...-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static SpanWithScope onEnter(

final HttpServletRequest httpServletRequest = (HttpServletRequest) request;

// TODO this logic should be moved to Servle2 specific Decorator
// TODO this logic should be moved to Servlet2 specific Decorator
if (response instanceof HttpServletResponse) {
// For use by HttpServletResponseInstrumentation:
InstrumentationContext.get(HttpServletResponse.class, HttpServletRequest.class)
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

// Please read README.md to understand what is this instrumentation.
// Please read README.md of this subproject to understand what is this instrumentation.
@AutoService(Instrumenter.class)
public final class HttpServletInstrumentation extends Instrumenter.Default {
public HttpServletInstrumentation() {
Expand Down Expand Up @@ -98,7 +98,7 @@ public static SpanWithScope start(@Advice.Origin final Method method) {
final Span span =
TRACER
.spanBuilder(DECORATE.spanNameForMethod(method))
.setSpanKind(Kind.SERVER)
.setSpanKind(Kind.INTERNAL)
trask marked this conversation as resolved.
Show resolved Hide resolved
.startSpan();
DECORATE.afterStart(span);

Expand Down