@@ -52,8 +52,8 @@ import (

 	"github.com/containerd/log"

 	"github.com/docker/docker/daemon/cluster/controllers/plugin"

 	executorpkg "github.com/docker/docker/daemon/cluster/executor"

+	"github.com/docker/docker/daemon/internal/stack"

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

-	"github.com/docker/docker/pkg/stack"

 	"github.com/moby/moby/api/types/network"

 	types "github.com/moby/moby/api/types/swarm"

 	swarmapi "github.com/moby/swarmkit/v2/api"

@@ -9,10 +9,10 @@ import (

 	"github.com/containerd/log"

 	"github.com/docker/docker/daemon/cluster/convert"

+	"github.com/docker/docker/daemon/internal/stack"

 	"github.com/docker/docker/daemon/pkg/opts"

 	"github.com/docker/docker/daemon/server/backend"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/pkg/stack"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/filters"

 	types "github.com/moby/moby/api/types/swarm"

@@ -8,7 +8,7 @@ import (

 	"os/signal"

 	"github.com/containerd/log"

-	"github.com/docker/docker/pkg/stack"

+	"github.com/docker/docker/daemon/internal/stack"

 	"golang.org/x/sys/unix"

 )

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

 	"unsafe"

 	"github.com/containerd/log"

-	"github.com/docker/docker/pkg/stack"

+	"github.com/docker/docker/daemon/internal/stack"

 	"golang.org/x/sys/windows"

 )

new file mode 100644

@@ -0,0 +1,59 @@

+package stack

+

+import (

+	"fmt"

+	"os"

+	"path/filepath"

+	"runtime"

+	"strings"

+	"time"

+

+	"github.com/pkg/errors"

+)

+

+const stacksLogNameTemplate = "goroutine-stacks-%s.log"

+

+// Dump outputs the runtime stack to os.StdErr.

+func Dump() {

+	_ = dump(os.Stderr)

+}

+

+// DumpToFile appends the runtime stack into a file named "goroutine-stacks-<timestamp>.log"

+// in dir and returns the full path to that file. If no directory name is

+// provided, it outputs to os.Stderr.

+func DumpToFile(dir string) (string, error) {

+	var f *os.File

+	if dir != "" {

+		path := filepath.Join(dir, fmt.Sprintf(stacksLogNameTemplate, strings.ReplaceAll(time.Now().Format(time.RFC3339), ":", "")))

+		var err error

+		f, err = os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o666)

+		if err != nil {

+			return "", errors.Wrap(err, "failed to open file to write the goroutine stacks")

+		}

+		defer func() {

+			_ = f.Sync()

+			_ = f.Close()

+		}()

+	} else {

+		f = os.Stderr

+	}

+	return f.Name(), dump(f)

+}

+

+func dump(f *os.File) error {

+	var (

+		buf       []byte

+		stackSize int

+	)

+	bufferLen := 16384

+	for stackSize == len(buf) {

+		buf = make([]byte, bufferLen)

+		stackSize = runtime.Stack(buf, true)

+		bufferLen *= 2

+	}

+	buf = buf[:stackSize]

+	if _, err := f.Write(buf); err != nil {

+		return errors.Wrap(err, "failed to write goroutine stacks")

+	}

+	return nil

+}

new file mode 100644

@@ -0,0 +1,28 @@

+package stack

+

+import (

+	"os"

+	"testing"

+

+	"gotest.tools/v3/assert"

+	is "gotest.tools/v3/assert/cmp"

+)

+

+func TestDump(t *testing.T) {

+	Dump()

+}

+

+func TestDumpToFile(t *testing.T) {

+	tmpDir := t.TempDir()

+	dumpPath, err := DumpToFile(tmpDir)

+	assert.Check(t, err)

+	readFile, _ := os.ReadFile(dumpPath)

+	fileData := string(readFile)

+	assert.Check(t, is.Contains(fileData, "goroutine"))

+}

+

+func TestDumpToFileWithEmptyInput(t *testing.T) {

+	path, err := DumpToFile("")

+	assert.Check(t, err)

+	assert.Check(t, is.Equal(os.Stderr.Name(), path))

+}

deleted file mode 100644

@@ -1,59 +0,0 @@

-package stack

-

-import (

-	"fmt"

-	"os"

-	"path/filepath"

-	"runtime"

-	"strings"

-	"time"

-

-	"github.com/pkg/errors"

-)

-

-const stacksLogNameTemplate = "goroutine-stacks-%s.log"

-

-// Dump outputs the runtime stack to os.StdErr.

-func Dump() {

-	_ = dump(os.Stderr)

-}

-

-// DumpToFile appends the runtime stack into a file named "goroutine-stacks-<timestamp>.log"

-// in dir and returns the full path to that file. If no directory name is

-// provided, it outputs to os.Stderr.

-func DumpToFile(dir string) (string, error) {

-	var f *os.File

-	if dir != "" {

-		path := filepath.Join(dir, fmt.Sprintf(stacksLogNameTemplate, strings.ReplaceAll(time.Now().Format(time.RFC3339), ":", "")))

-		var err error

-		f, err = os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o666)

-		if err != nil {

-			return "", errors.Wrap(err, "failed to open file to write the goroutine stacks")

-		}

-		defer func() {

-			_ = f.Sync()

-			_ = f.Close()

-		}()

-	} else {

-		f = os.Stderr

-	}

-	return f.Name(), dump(f)

-}

-

-func dump(f *os.File) error {

-	var (

-		buf       []byte

-		stackSize int

-	)

-	bufferLen := 16384

-	for stackSize == len(buf) {

-		buf = make([]byte, bufferLen)

-		stackSize = runtime.Stack(buf, true)

-		bufferLen *= 2

-	}

-	buf = buf[:stackSize]

-	if _, err := f.Write(buf); err != nil {

-		return errors.Wrap(err, "failed to write goroutine stacks")

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,28 +0,0 @@

-package stack

-

-import (

-	"os"

-	"testing"

-

-	"gotest.tools/v3/assert"

-	is "gotest.tools/v3/assert/cmp"

-)

-

-func TestDump(t *testing.T) {

-	Dump()

-}

-

-func TestDumpToFile(t *testing.T) {

-	tmpDir := t.TempDir()

-	dumpPath, err := DumpToFile(tmpDir)

-	assert.Check(t, err)

-	readFile, _ := os.ReadFile(dumpPath)

-	fileData := string(readFile)

-	assert.Check(t, is.Contains(fileData, "goroutine"))

-}

-

-func TestDumpToFileWithEmptyInput(t *testing.T) {

-	path, err := DumpToFile("")

-	assert.Check(t, err)

-	assert.Check(t, is.Equal(os.Stderr.Name(), path))

-}