pkg/dmesg: deprecate, and use internal utility instead

thaJeztah · thaJeztah · commit 805ccd23656e · 2024-06-16T12:41:39.000+02:00
This package was originally added in 46833ee for use in the devicemapper graphdriver. The devicemapper graphdriver was deprecated and has been removed. The only remaining consumer is an integration test. Deprecate the package and mark it for removal in the next release. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/integration/container/overlayfs_linux_test.go b/integration/container/overlayfs_linux_test.go
@@ -8,7 +8,7 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/integration/internal/container"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/dmesg"
+	"golang.org/x/sys/unix"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/skip"
 )
@@ -81,9 +81,15 @@ func TestNoOverlayfsWarningsAboutUndefinedBehaviors(t *testing.T) {
 	}
 }
 
-func dmesgLines(bytes int) []string {
-	data := dmesg.Dmesg(bytes)
-	return strings.Split(strings.TrimSpace(string(data)), "\n")
+// dmesgLines returns last messages from the kernel log, up to size bytes,
+// and splits the output by newlines.
+func dmesgLines(size int) []string {
+	data := make([]byte, size)
+	amt, err := unix.Klogctl(unix.SYSLOG_ACTION_READ_ALL, data)
+	if err != nil {
+		return []string{}
+	}
+	return strings.Split(strings.TrimSpace(string(data[:amt])), "\n")
 }
 
 func diffDmesg(prev, next []string) []string {
diff --git a/pkg/dmesg/dmesg_linux.go b/pkg/dmesg/dmesg_linux.go
@@ -4,7 +4,9 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-// Dmesg returns last messages from the kernel log, up to size bytes
+// Dmesg returns last messages from the kernel log, up to size bytes.
+//
+// Deprecated: the dmesg package is no longer used, and will be removed in the next release.
 func Dmesg(size int) []byte {
 	b := make([]byte, size)
 	amt, err := unix.Klogctl(unix.SYSLOG_ACTION_READ_ALL, b)
