open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't set span status to unset (#2956)

This commit is contained in:
Lauri Tulmin 2021-05-12 02:14:19 +03:00 committed by GitHub
parent 0b854a5eb6
commit d29bf39428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
View File

@ -12,6 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.InstrumentationVersion;
@ -156,7 +157,10 @@ public class Instrumenter<REQUEST, RESPONSE> {
span.recordException(error);
}
span.setStatus(spanStatusExtractor.extract(request, response, error));
StatusCode statusCode = spanStatusExtractor.extract(request, response, error);
if (statusCode != StatusCode.UNSET) {
span.setStatus(statusCode);
}
if (endTimeExtractor != null) {
span.end(endTimeExtractor.extract(response));

6
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java
View File

@ -12,6 +12,7 @@ import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapSetter;
import io.opentelemetry.instrumentation.api.tracer.net.NetPeerAttributes;
@ -211,7 +212,10 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
Integer status = status(response);
if (status != null) {
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, (long) status);
span.setStatus(HttpStatusConverter.statusFromHttpStatus(status));
StatusCode statusCode = HttpStatusConverter.statusFromHttpStatus(status);
if (statusCode != StatusCode.UNSET) {
span.setStatus(statusCode);
}
}
}
}

8
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java
View File

@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@ -252,9 +253,10 @@ public abstract class HttpServerTracer<REQUEST, RESPONSE, CONNECTION, STORAGE> e
private static void setStatus(Span span, int status) {
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, (long) status);
// TODO status_message
// See https://github.com/open-telemetry/opentelemetry-specification/issues/950
span.setStatus(HttpStatusConverter.statusFromHttpStatus(status));
StatusCode statusCode = HttpStatusConverter.statusFromHttpStatus(status);
if (statusCode != StatusCode.UNSET) {
span.setStatus(statusCode);
}
}
@Nullable

6
instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/HttpClientTracerTest.groovy
View File

@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.api.tracer
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
import io.opentelemetry.api.trace.StatusCode
import io.opentelemetry.context.propagation.TextMapSetter
import io.opentelemetry.instrumentation.api.tracer.net.NetPeerAttributes
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
@ -110,6 +111,7 @@ class HttpClientTracerTest extends BaseTracerTest {
def "test onResponse"() {
setup:
def tracer = newTracer()
def statusCode = status != null ? HttpStatusConverter.statusFromHttpStatus(status) : null
when:
tracer.onResponse(span, resp)
@ -117,7 +119,9 @@ class HttpClientTracerTest extends BaseTracerTest {
then:
if (status) {
1 * span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, status)
1 * span.setStatus(HttpStatusConverter.statusFromHttpStatus(status))
}
if (statusCode != null && statusCode != StatusCode.UNSET) {
1 * span.setStatus(statusCode)
}
0 * _

7
instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java
View File

@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapGetter;
import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer;
@ -45,8 +46,10 @@ class DubboTracer extends RpcServerTracer<RpcInvocation> {
}
public void end(Context context, Result result) {
Span span = Span.fromContext(context);
span.setStatus(DubboHelper.statusFromResult(result));
StatusCode statusCode = DubboHelper.statusFromResult(result);
if (statusCode != StatusCode.UNSET) {
Span.fromContext(context).setStatus(statusCode);
}
end(context);
}

12
instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcClientTracer.java
View File

@ -10,6 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT;
import io.grpc.Status;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.tracer.RpcClientTracer;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@ -36,8 +37,10 @@ final class GrpcClientTracer extends RpcClientTracer {
}
public void end(Context context, Status status) {
Span.fromContext(context)
.setStatus(GrpcHelper.statusFromGrpcStatus(status), status.getDescription());
StatusCode statusCode = GrpcHelper.statusFromGrpcStatus(status);
if (statusCode != StatusCode.UNSET) {
Span.fromContext(context).setStatus(statusCode, status.getDescription());
}
end(context);
}
@ -45,7 +48,10 @@ final class GrpcClientTracer extends RpcClientTracer {
public void onException(Context context, Throwable throwable) {
Status grpcStatus = Status.fromThrowable(throwable);
Span span = Span.fromContext(context);
span.setStatus(GrpcHelper.statusFromGrpcStatus(grpcStatus), grpcStatus.getDescription());
StatusCode statusCode = GrpcHelper.statusFromGrpcStatus(grpcStatus);
if (statusCode != StatusCode.UNSET) {
span.setStatus(statusCode, grpcStatus.getDescription());
}
span.recordException(unwrapThrowable(grpcStatus.getCause()));
}

6
instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java
View File

@ -18,6 +18,7 @@ import static net.bytebuddy.matcher.ElementMatchers.not;
import com.google.auto.service.AutoService;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
@ -164,7 +165,10 @@ public class HttpUrlConnectionInstrumentationModule extends InstrumentationModul
if (httpUrlState != null) {
Span span = Java8BytecodeBridge.spanFromContext(httpUrlState.context);
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, returnValue);
span.setStatus(HttpStatusConverter.statusFromHttpStatus(returnValue));
StatusCode statusCode = HttpStatusConverter.statusFromHttpStatus(returnValue);
if (statusCode != StatusCode.UNSET) {
span.setStatus(statusCode);
}
}
}
}

2
instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy
View File

@ -13,6 +13,7 @@ import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTra
import io.opentelemetry.api.trace.Span
import io.opentelemetry.api.trace.SpanKind
import io.opentelemetry.api.trace.StatusCode
import io.opentelemetry.instrumentation.test.AgentTestTrait
import io.opentelemetry.instrumentation.test.base.HttpServerTest
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
@ -155,6 +156,7 @@ class UndertowServerTest extends HttpServerTest<Undertow> implements AgentTestTr
hasNoParent()
name "HTTP GET"
kind SpanKind.SERVER
status StatusCode.ERROR
event(0) {
eventName "before-event"