From 57fbeba1a1c06b49035c1a169222635a4321611b Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Mon, 4 Dec 2023 13:25:25 +0100
Subject: [PATCH] pkg/discovery/kubernetes: Better logging for container
 runtime discovery

Previously even with debug logging enabled when multiple paths existed
for users it was difficult to debug and understand the situation even
with log level on debug.
---
 pkg/discovery/kubernetes/kubernetes.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/discovery/kubernetes/kubernetes.go b/pkg/discovery/kubernetes/kubernetes.go
index 49c5c6485d..8585b74ad7 100644
--- a/pkg/discovery/kubernetes/kubernetes.go
+++ b/pkg/discovery/kubernetes/kubernetes.go
@@ -108,6 +108,7 @@ func newCRIClient(logger log.Logger, node *v1.Node, socketPath string) (containe
 	switch criType {
 	case "docker":
 		if socketPath == "" {
+			level.Debug(logger).Log("msg", "no docker socket path provided, using default", "path", docker.DefaultSocketPath)
 			socketPath = docker.DefaultSocketPath
 		}
 		if _, err := os.Stat(socketPath); err != nil {
@@ -117,9 +118,15 @@ func newCRIClient(logger log.Logger, node *v1.Node, socketPath string) (containe
 	case "containerd":
 		if socketPath == "" {
 			if _, err := os.Stat(containerd.DefaultSocketPath); err == nil {
+				level.Debug(logger).Log("msg", "no containerd socket path provided, using default", "path", containerd.DefaultSocketPath)
 				socketPath = containerd.DefaultSocketPath
 			}
 			if _, err := os.Stat(containerd.DefaultK3SSocketPath); err == nil {
+				if socketPath != "" {
+					level.Warn(logger).Log("msg", "multiple containerd socket paths found, using k3s", "path", containerd.DefaultK3SSocketPath)
+				} else {
+					level.Debug(logger).Log("msg", "no k3s containerd socket path provided, using default", "path", containerd.DefaultK3SSocketPath)
+				}
 				socketPath = containerd.DefaultK3SSocketPath
 			}
 		}
@@ -129,6 +136,7 @@ func newCRIClient(logger log.Logger, node *v1.Node, socketPath string) (containe
 		return containerd.NewContainerdClient(socketPath)
 	case "cri-o":
 		if socketPath == "" {
+			level.Debug(logger).Log("msg", "no cri-o socket path provided, using default", "path", crio.DefaultSocketPath)
 			socketPath = crio.DefaultSocketPath
 		}
 		if _, err := os.Stat(socketPath); err != nil {