Use new socket address function in containerd

Signed-off-by: Derek McGowan <derek@mcg.dev>

Author: dmcgowan

internal/shim/manager/manager.go

@@ -24,12 +24,14 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	goruntime "runtime"
 	"strconv"
 	"syscall"
 	"time"
 
 	"github.com/containerd/containerd/api/types"
+	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/shim"
 	"github.com/containerd/errdefs"
@@ -129,8 +131,8 @@ func (s *shimSocket) Close() {
 	_ = shim.RemoveSocket(s.addr)
 }
 
-func newShimSocket(ctx context.Context, path, id string, debug bool) (*shimSocket, error) {
-	address, err := shim.SocketAddress(ctx, path, id, debug)
+func newShimSocket(ctx context.Context, root, path, id string, debug bool) (*shimSocket, error) {
+	address, err := shim.CreateSocketAddress(ctx, root, path, id, debug)
 	if err != nil {
 		return nil, err
 	}
@@ -195,8 +197,11 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ shi
 			}
 		}
 	}()
-
-	s, err := newShimSocket(ctx, opts.Address, grouping, false)
+	socketDir := opts.SocketDir
+	if socketDir == "" {
+		socketDir = filepath.Join(defaults.DefaultStateDir, "s")
+	}
+	s, err := newShimSocket(ctx, socketDir, opts.Address, grouping, false)
 	if err != nil {
 		if errdefs.IsAlreadyExists(err) {
 			params.Address = s.addr
@@ -208,7 +213,7 @@ func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ shi
 	cmd.ExtraFiles = append(cmd.ExtraFiles, s.f)
 
 	if opts.Debug {
-		s, err = newShimSocket(ctx, opts.Address, grouping, true)
+		s, err = newShimSocket(ctx, socketDir, opts.Address, grouping, true)
 		if err != nil {
 			return params, err
 		}