From 4c4858e5a5e12497616b16f77a2c1b35ef2b16f5 Mon Sep 17 00:00:00 2001 From: xiang-xx Date: Wed, 4 Jan 2023 09:49:46 +0800 Subject: [PATCH] fix: code conflict --- rest/handler/tracinghandler.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rest/handler/tracinghandler.go b/rest/handler/tracinghandler.go index b882b1846dfb..7d6b285f15f9 100644 --- a/rest/handler/tracinghandler.go +++ b/rest/handler/tracinghandler.go @@ -104,11 +104,7 @@ func TracingHandler(serviceName, path string) func(http.Handler) http.Handler { if trw.code >= http.StatusBadRequest { span.SetStatus(codes.Error, http.StatusText(trw.code)) } else { -<<<<<<< HEAD span.SetStatus(codes.Ok, http.StatusText(trw.code)) -======= - span.SetStatus(codes.Ok, "") ->>>>>>> da8f51ec4eb5ec2bb78c282bcf5727833755ddc8 } }) }