Tracing: Standardize on otel tracing (#75528)
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
"go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
@@ -30,17 +31,18 @@ func TracingMiddleware(logger log.Logger, tracer tracing.Tracer) httpclient.Midd
|
||||
ctx = httptrace.WithClientTrace(ctx, otelhttptrace.NewClientTrace(ctx, otelhttptrace.WithoutSubSpans(), otelhttptrace.WithoutHeaders()))
|
||||
req = req.WithContext(ctx)
|
||||
for k, v := range opts.Labels {
|
||||
span.SetAttributes(k, v, attribute.Key(k).String(v))
|
||||
span.SetAttributes(attribute.String(k, v))
|
||||
}
|
||||
|
||||
tracer.Inject(ctx, req.Header, span)
|
||||
res, err := next.RoundTrip(req)
|
||||
|
||||
span.SetAttributes("http.url", req.URL.String(), attribute.String("http.url", req.URL.String()))
|
||||
span.SetAttributes("http.method", req.Method, attribute.String("http.method", req.Method))
|
||||
span.SetAttributes(semconv.HTTPURL(req.URL.String()))
|
||||
span.SetAttributes(semconv.HTTPMethod(req.Method))
|
||||
// ext.SpanKind.Set(span, ext.SpanKindRPCClientEnum)
|
||||
|
||||
if err != nil {
|
||||
span.SetStatus(codes.Error, "request failed")
|
||||
span.RecordError(err)
|
||||
return res, err
|
||||
}
|
||||
@@ -49,10 +51,10 @@ func TracingMiddleware(logger log.Logger, tracer tracing.Tracer) httpclient.Midd
|
||||
// we avoid measuring contentlength less than zero because it indicates
|
||||
// that the content size is unknown. https://godoc.org/github.com/badu/http#Response
|
||||
if res.ContentLength > 0 {
|
||||
span.SetAttributes(httpContentLengthTagKey, res.ContentLength, attribute.Key(httpContentLengthTagKey).Int64(res.ContentLength))
|
||||
span.SetAttributes(attribute.Int64(httpContentLengthTagKey, res.ContentLength))
|
||||
}
|
||||
|
||||
span.SetAttributes("http.status_code", res.StatusCode, attribute.Int("http.status_code", res.StatusCode))
|
||||
span.SetAttributes(semconv.HTTPStatusCode(res.StatusCode))
|
||||
if res.StatusCode >= 400 {
|
||||
span.SetStatus(codes.Error, fmt.Sprintf("error with HTTP status code %s", strconv.Itoa(res.StatusCode)))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user