Browse Source

Merge pull request #46573 from cpuguy83/double_trace_logs

Remove duplicated trace logs
Sebastiaan van Stijn 1 year ago
parent
commit
591c98cdbe
1 changed files with 0 additions and 2 deletions
  1. 0 2
      cmd/dockerd/daemon.go

+ 0 - 2
cmd/dockerd/daemon.go

@@ -57,7 +57,6 @@ import (
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/moby/buildkit/session"
-	"github.com/moby/buildkit/util/bklog"
 	"github.com/moby/buildkit/util/tracing/detect"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/pkg/errors"
@@ -247,7 +246,6 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
 	} else {
 		otel.SetTracerProvider(tp)
 		log.G(ctx).Logger.AddHook(tracing.NewLogrusHook())
-		bklog.G(ctx).Logger.AddHook(tracing.NewLogrusHook())
 	}
 
 	pluginStore := plugin.NewStore()