log with traceID and spanID

Signed-off-by: Morlay <[email protected]>

cmd/buildkitd/main.go

@@ -38,6 +38,7 @@ import (
 	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
 	"github.com/moby/buildkit/frontend/gateway"
 	"github.com/moby/buildkit/frontend/gateway/forwarder"
+	_ "github.com/moby/buildkit/util/log"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/solver/bboltcachestorage"
 	"github.com/moby/buildkit/util/apicaps"

util/log/log.go

@@ -0,0 +1,28 @@
+package log
+
+import (
+	"context"
+	"github.com/containerd/containerd/log"
+	"github.com/sirupsen/logrus"
+	"go.opentelemetry.io/otel/trace"
+)
+
+
+func init()  {
+	log.G = GetLogger
+}
+
+func GetLogger(ctx context.Context) *logrus.Entry {
+	l := log.GetLogger(ctx)
+
+	spanContext := trace.SpanFromContext(ctx).SpanContext()
+
+	if spanContext.IsValid() {
+		return l.WithFields(logrus.Fields{
+			"traceID": spanContext.TraceID(),
+			"spanID":  spanContext.SpanID(),
+		})
+	}
+
+	return l
+}