@@ -849,14 +849,15 @@ func (daemon *Daemon) initNetworkController(cfg *config.Config, activeSandboxes

 		return err

 	}

-	daemon.netController, err = libnetwork.New(netOptions...)

+	ctx := context.TODO()

+	daemon.netController, err = libnetwork.New(ctx, netOptions...)

 	if err != nil {

 		return fmt.Errorf("error obtaining controller instance: %v", err)

 	}

 	if len(activeSandboxes) > 0 {

-		log.G(context.TODO()).Info("there are running containers, updated network configuration will not take affect")

-	} else if err := configureNetworking(daemon.netController, cfg); err != nil {

+		log.G(ctx).Info("there are running containers, updated network configuration will not take affect")

+	} else if err := configureNetworking(ctx, daemon.netController, cfg); err != nil {

 		return err

 	}

@@ -865,17 +866,17 @@ func (daemon *Daemon) initNetworkController(cfg *config.Config, activeSandboxes

 	return nil

 }

-func configureNetworking(controller *libnetwork.Controller, conf *config.Config) error {

+func configureNetworking(ctx context.Context, controller *libnetwork.Controller, conf *config.Config) error {

 	// Create predefined network "none"

 	if n, _ := controller.NetworkByName(network.NetworkNone); n == nil {

-		if _, err := controller.NewNetwork(context.TODO(), "null", network.NetworkNone, "", libnetwork.NetworkOptionPersist(true)); err != nil {

+		if _, err := controller.NewNetwork(ctx, "null", network.NetworkNone, "", libnetwork.NetworkOptionPersist(true)); err != nil {

 			return errors.Wrapf(err, `error creating default %q network`, network.NetworkNone)

 		}

 	}

 	// Create predefined network "host"

 	if n, _ := controller.NetworkByName(network.NetworkHost); n == nil {

-		if _, err := controller.NewNetwork(context.TODO(), "host", network.NetworkHost, "", libnetwork.NetworkOptionPersist(true)); err != nil {

+		if _, err := controller.NewNetwork(ctx, "host", network.NetworkHost, "", libnetwork.NetworkOptionPersist(true)); err != nil {

 			return errors.Wrapf(err, `error creating default %q network`, network.NetworkHost)

 		}

 	}

@@ -892,7 +893,7 @@ func configureNetworking(controller *libnetwork.Controller, conf *config.Config)

 	if !conf.DisableBridge {

 		// Initialize default driver "bridge"

-		if err := initBridgeDriver(controller, conf.BridgeConfig); err != nil {

+		if err := initBridgeDriver(ctx, controller, conf.BridgeConfig); err != nil {

 			return err

 		}

 	} else {

@@ -981,7 +982,7 @@ type defBrOpts interface {

 	defGw() (gw net.IP, optName, auxAddrLabel string)

 }

-func initBridgeDriver(controller *libnetwork.Controller, cfg config.BridgeConfig) error {

+func initBridgeDriver(ctx context.Context, controller *libnetwork.Controller, cfg config.BridgeConfig) error {

 	bridgeName, userManagedBridge := getDefaultBridgeName(cfg)

 	netOption := map[string]string{

 		bridge.BridgeName:         bridgeName,

@@ -1009,7 +1010,7 @@ func initBridgeDriver(controller *libnetwork.Controller, cfg config.BridgeConfig

 	}

 	// Initialize default network on "bridge" with the same name

-	_, err = controller.NewNetwork(context.TODO(), "bridge", network.NetworkBridge, "",

+	_, err = controller.NewNetwork(ctx, "bridge", network.NetworkBridge, "",

 		libnetwork.NetworkOptionEnableIPv4(true),

 		libnetwork.NetworkOptionEnableIPv6(cfg.EnableIPv6),

 		libnetwork.NetworkOptionDriverOpts(netOption),

@@ -237,7 +237,7 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand

 	if err != nil {

 		return err

 	}

-	daemon.netController, err = libnetwork.New(netOptions...)

+	daemon.netController, err = libnetwork.New(context.TODO(), netOptions...)

 	if err != nil {

 		return errors.Wrap(err, "error obtaining controller instance")

 	}

@@ -28,7 +28,7 @@ func setupFakeDaemon(t *testing.T, c *container.Container) *Daemon {

 	err := os.MkdirAll(rootfs, 0o755)

 	assert.NilError(t, err)

-	netController, err := libnetwork.New(nwconfig.OptionDataDir(t.TempDir()))

+	netController, err := libnetwork.New(context.Background(), nwconfig.OptionDataDir(t.TempDir()))

 	assert.NilError(t, err)

 	d := &Daemon{

@@ -1,6 +1,7 @@

 package daemon // import "github.com/docker/docker/daemon"

 import (

+	"context"

 	"os"

 	"testing"

@@ -310,7 +311,7 @@ func TestDaemonReloadNetworkDiagnosticPort(t *testing.T) {

 	if err != nil {

 		t.Fatal(err)

 	}

-	controller, err := libnetwork.New(netOptions...)

+	controller, err := libnetwork.New(context.Background(), netOptions...)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -54,6 +54,7 @@ import (

 	"time"

 	"github.com/containerd/log"

+	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/libnetwork/cluster"

 	"github.com/docker/docker/libnetwork/config"

 	"github.com/docker/docker/libnetwork/datastore"

@@ -140,7 +141,13 @@ type Controller struct {

 }

 // New creates a new instance of network controller.

-func New(cfgOptions ...config.Option) (*Controller, error) {

+func New(ctx context.Context, cfgOptions ...config.Option) (_ *Controller, retErr error) {

+	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.New")

+	defer func() {

+		otelutil.RecordStatus(span, retErr)

+		span.End()

+	}()

+

 	cfg := config.New(cfgOptions...)

 	store, err := datastore.New(cfg.DataDir, cfg.DatastoreBucket)

 	if err != nil {

@@ -179,8 +186,8 @@ func New(cfgOptions ...config.Option) (*Controller, error) {

 	c.WalkNetworks(func(nw *Network) bool {

 		if n := nw; n.hasSpecialDriver() && !n.ConfigOnly() {

-			if err := n.getController().addNetwork(context.TODO(), n); err != nil {

-				log.G(context.TODO()).Warnf("Failed to populate network %q with driver %q", nw.Name(), nw.Type())

+			if err := n.getController().addNetwork(ctx, n); err != nil {

+				log.G(ctx).Warnf("Failed to populate network %q with driver %q", nw.Name(), nw.Type())

 			}

 		}

 		return false

@@ -192,12 +199,12 @@ func New(cfgOptions ...config.Option) (*Controller, error) {

 	c.reservePools()

 	if err := c.sandboxRestore(c.cfg.ActiveSandboxes); err != nil {

-		log.G(context.TODO()).WithError(err).Error("error during sandbox cleanup")

+		log.G(ctx).WithError(err).Error("error during sandbox cleanup")

 	}

 	// Cleanup resources

 	if err := c.cleanupLocalEndpoints(); err != nil {

-		log.G(context.TODO()).WithError(err).Warnf("error during endpoint cleanup")

+		log.G(ctx).WithError(err).Warnf("error during endpoint cleanup")

 	}

 	c.networkCleanup()

@@ -13,7 +13,7 @@ import (

 func TestEndpointStore(t *testing.T) {

 	configOption := config.OptionDataDir(t.TempDir())

-	c, err := New(configOption)

+	c, err := New(context.Background(), configOption)

 	assert.NilError(t, err)

 	defer c.Stop()

@@ -1,6 +1,7 @@

 package libnetwork

 import (

+	"context"

 	"fmt"

 	"strings"

 	"testing"

@@ -60,6 +61,7 @@ func TestUserChain(t *testing.T) {

 			defer resetIptables(t)

 			c, err := New(

+				context.Background(),

 				config.OptionDataDir(t.TempDir()),

 				config.OptionDriverConfig("bridge", map[string]any{

 					netlabel.GenericData: options.Generic{

@@ -322,7 +322,7 @@ func compareNwLists(a, b []*net.IPNet) bool {

 func TestAuxAddresses(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()))

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()))

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -398,7 +398,7 @@ func TestUpdateSvcRecord(t *testing.T) {

 	for _, tc := range tests {

 		t.Run(tc.name, func(t *testing.T) {

 			defer netnsutils.SetupTestOSContext(t)()

-			ctrlr, err := New(config.OptionDataDir(t.TempDir()))

+			ctrlr, err := New(context.Background(), config.OptionDataDir(t.TempDir()))

 			assert.NilError(t, err)

 			defer ctrlr.Stop()

@@ -477,7 +477,7 @@ func TestSRVServiceQuery(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()),

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()),

 		config.OptionDefaultAddressPoolConfig(ipamutils.GetLocalScopeDefaultNetworks()))

 	if err != nil {

 		t.Fatal(err)

@@ -578,7 +578,7 @@ func TestServiceVIPReuse(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()),

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()),

 		config.OptionDefaultAddressPoolConfig(ipamutils.GetLocalScopeDefaultNetworks()))

 	if err != nil {

 		t.Fatal(err)

@@ -699,7 +699,7 @@ func TestIpamReleaseOnNetDriverFailures(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()))

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()))

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -46,6 +46,7 @@ const (

 func newController(t *testing.T) *libnetwork.Controller {

 	t.Helper()

 	c, err := libnetwork.New(

+		context.Background(),

 		config.OptionDataDir(t.TempDir()),

 		config.OptionDriverConfig(bridgeNetType, map[string]interface{}{

 			netlabel.GenericData: options.Generic{

@@ -888,7 +889,7 @@ func TestInvalidRemoteDriver(t *testing.T) {

 	err = os.WriteFile(filepath.Join(specPath, "invalid-network-driver.spec"), []byte(server.URL), 0o644)

 	assert.NilError(t, err)

-	ctrlr, err := libnetwork.New(config.OptionDataDir(t.TempDir()))

+	ctrlr, err := libnetwork.New(context.Background(), config.OptionDataDir(t.TempDir()))

 	assert.NilError(t, err)

 	defer ctrlr.Stop()

@@ -13,7 +13,7 @@ import (

 func TestNetworkStore(t *testing.T) {

 	configOption := config.OptionDataDir(t.TempDir())

-	c, err := New(configOption)

+	c, err := New(context.Background(), configOption)

 	assert.NilError(t, err)

 	defer c.Stop()

@@ -16,7 +16,7 @@ import (

 // test only works on linux

 func TestDNSIPQuery(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()),

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()),

 		config.OptionDefaultAddressPoolConfig(ipamutils.GetLocalScopeDefaultNetworks()))

 	if err != nil {

 		t.Fatal(err)

@@ -114,7 +114,8 @@ func TestDNSProxyServFail(t *testing.T) {

 	osctx := netnsutils.SetupTestOSContextEx(t)

 	defer osctx.Cleanup(t)

-	c, err := New(config.OptionDataDir(t.TempDir()),

+	c, err := New(context.Background(),

+		config.OptionDataDir(t.TempDir()),

 		config.OptionDefaultAddressPoolConfig(ipamutils.GetLocalScopeDefaultNetworks()))

 	if err != nil {

 		t.Fatal(err)

@@ -13,7 +13,7 @@ import (

 )

 func TestDNSOptions(t *testing.T) {

-	c, err := New(config.OptionDataDir(t.TempDir()))

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()))

 	assert.NilError(t, err)

 	sb, err := c.NewSandbox(context.Background(), "cnt1", nil)

@@ -22,6 +22,7 @@ import (

 func getTestEnv(t *testing.T, opts ...[]NetworkOption) (*Controller, []*Network) {

 	const netType = "bridge"

 	c, err := New(

+		context.Background(),

 		config.OptionDataDir(t.TempDir()),

 		config.OptionDriverConfig(netType, map[string]any{

 			netlabel.GenericData: options.Generic{"EnableIPForwarding": true},

@@ -15,7 +15,7 @@ import (

 func TestCleanupServiceDiscovery(t *testing.T) {

 	defer netnsutils.SetupTestOSContext(t)()

-	c, err := New(config.OptionDataDir(t.TempDir()),

+	c, err := New(context.Background(), config.OptionDataDir(t.TempDir()),

 		config.OptionDefaultAddressPoolConfig(ipamutils.GetLocalScopeDefaultNetworks()))

 	assert.NilError(t, err)

 	defer c.Stop()

@@ -17,7 +17,7 @@ func TestBoltdbBackend(t *testing.T) {

 func TestNoPersist(t *testing.T) {

 	configOption := config.OptionDataDir(t.TempDir())

-	testController, err := New(configOption)

+	testController, err := New(context.Background(), configOption)

 	if err != nil {

 		t.Fatalf("Error creating new controller: %v", err)

 	}

@@ -34,7 +34,7 @@ func TestNoPersist(t *testing.T) {

 	// Create a new controller using the same database-file. The network

 	// should not have persisted.

-	testController, err = New(configOption)

+	testController, err = New(context.Background(), configOption)

 	if err != nil {

 		t.Fatalf("Error creating new controller: %v", err)

 	}

@@ -18,7 +18,7 @@ func testLocalBackend(t *testing.T, path, bucket string) {

 		}),

 	}

-	testController, err := New(cfgOptions...)

+	testController, err := New(context.Background(), cfgOptions...)

 	if err != nil {

 		t.Fatalf("Error new controller: %v", err)

 	}

@@ -52,7 +52,7 @@ func testLocalBackend(t *testing.T, path, bucket string) {

 	testController.Stop()

 	// test restore of local store

-	testController, err = New(cfgOptions...)

+	testController, err = New(context.Background(), cfgOptions...)

 	if err != nil {

 		t.Fatalf("Error creating controller: %v", err)

 	}