Always add http status code to initial span (#1719)

* Always add http status code to initial span, fix #1145 Signed-off-by: Ruben Barilani <[email protected]> * Refactor use ctx.initialSpan also on proxy.errorResponse Signed-off-by: Ruben Barilani <[email protected]>
zalando · Feb 22, 2021 · de70c2b · de70c2b
1 parent fbde0f7
commit de70c2b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/proxy/context.go b/proxy/context.go
@@ -42,6 +42,7 @@ type context struct {
 	startServe           time.Time
 	metrics              *filterMetrics
 	tracer               opentracing.Tracer
+	initialSpan          opentracing.Span
 	proxySpan            opentracing.Span
 	parentSpan           opentracing.Span
 	proxy                *Proxy

diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -1177,6 +1177,8 @@ func (p *Proxy) serveResponse(ctx *context) {
 		p.tracing.setTag(ctx.proxySpan, ClientRequestStateTag, ClientRequestCanceled)
 	}
 
+	p.tracing.setTag(ctx.initialSpan, HTTPStatusCodeTag, uint16(ctx.response.StatusCode))
+
 	ctx.responseWriter.WriteHeader(ctx.response.StatusCode)
 	ctx.responseWriter.Flush()
 	n, err := copyStream(ctx.responseWriter, ctx.response.Body)
@@ -1224,13 +1226,10 @@ func (p *Proxy) errorResponse(ctx *context, err error) {
 		code = perr.code
 	}
 
-	if span := ot.SpanFromContext(ctx.Request().Context()); span != nil {
-		p.tracing.setTag(span, ErrorTag, true)
-		p.tracing.setTag(span, HTTPStatusCodeTag, uint16(code))
-		if err == errRouteLookupFailed {
-			span.LogKV("event", "error", "message", errRouteLookup.Error())
-		}
-
+	p.tracing.setTag(ctx.initialSpan, ErrorTag, true)
+	p.tracing.setTag(ctx.initialSpan, HTTPStatusCodeTag, uint16(code))
+	if err == errRouteLookupFailed {
+		ctx.initialSpan.LogKV("event", "error", "message", errRouteLookup.Error())
 	}
 
 	if p.flags.Debug() {
@@ -1415,6 +1414,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx = newContext(lw, r, p)
 	ctx.startServe = time.Now()
 	ctx.tracer = p.tracing.tracer
+	ctx.initialSpan = span
 
 	defer func() {
 		if ctx.response != nil && ctx.response.Body != nil {

diff --git a/proxy/tracing_test.go b/proxy/tracing_test.go
@@ -134,7 +134,7 @@ func TestTracingIngressSpan(t *testing.T) {
 	verifyTag(t, span, HTTPPathTag, "/hello")
 	verifyTag(t, span, HTTPHostTag, ps.Listener.Addr().String())
 	verifyTag(t, span, FlowIDTag, "test-flow-id")
-	verifyTag(t, span, HTTPStatusCodeTag, nil) // status tag is not set on ingress span
+	verifyTag(t, span, HTTPStatusCodeTag, uint16(200))
 }
 
 func TestTracingSpanName(t *testing.T) {