bklog: only log tracing ids when span exporter not nil

moby · Sep 8, 2021 · 0509ac7 · 0509ac7
1 parent ea773f6
commit 0509ac7
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/util/bklog/log.go b/util/bklog/log.go
@@ -3,6 +3,7 @@ package bklog
 import (
 	"context"
 
+	"github.com/moby/buildkit/util/tracing/detect"
 	"github.com/sirupsen/logrus"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -12,6 +13,10 @@ var (
 	L = logrus.NewEntry(logrus.StandardLogger())
 )
 
+var (
+	spanExporter, _ = detect.Exporter()
+)
+
 type (
 	loggerKey struct{}
 )
@@ -33,13 +38,15 @@ func GetLogger(ctx context.Context) (l *logrus.Entry) {
 		l = L
 	}
 
-	spanContext := trace.SpanFromContext(ctx).SpanContext()
+	if spanExporter != nil {
+		spanContext := trace.SpanFromContext(ctx).SpanContext()
 
-	if spanContext.IsValid() {
-		return l.WithFields(logrus.Fields{
-			"traceID": spanContext.TraceID(),
-			"spanID":  spanContext.SpanID(),
-		})
+		if spanContext.IsValid() {
+			return l.WithFields(logrus.Fields{
+				"traceID": spanContext.TraceID(),
+				"spanID":  spanContext.SpanID(),
+			})
+		}
 	}
 
 	return l