From 14906f802303194ef2025c7b420ca825df92379d Mon Sep 17 00:00:00 2001
From: Rob Murray <rob.murray@docker.com>
Date: Sun, 30 Nov 2025 17:34:21 +0000
Subject: [PATCH] NRI: use the daemon's logger

Signed-off-by: Rob Murray <rob.murray@docker.com>
---
 daemon/internal/nri/logshim.go | 29 +++++++++++++++++++++++++++++
 daemon/internal/nri/nri.go     |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 daemon/internal/nri/logshim.go

diff --git a/daemon/internal/nri/logshim.go b/daemon/internal/nri/logshim.go
new file mode 100644
index 0000000000..262c55777d
--- /dev/null
+++ b/daemon/internal/nri/logshim.go
@@ -0,0 +1,29 @@
+package nri
+
+import (
+	"context"
+
+	"github.com/containerd/log"
+	nrilog "github.com/containerd/nri/pkg/log"
+)
+
+type logShim struct{}
+
+// logShim implements interface nrilog.Logger.
+var _ nrilog.Logger = (*logShim)(nil)
+
+func (nls *logShim) Debugf(ctx context.Context, format string, args ...any) {
+	log.G(ctx).Debugf("NRI: "+format, args...)
+}
+
+func (nls *logShim) Infof(ctx context.Context, format string, args ...any) {
+	log.G(ctx).Infof("NRI: "+format, args...)
+}
+
+func (nls *logShim) Warnf(ctx context.Context, format string, args ...any) {
+	log.G(ctx).Warnf("NRI: "+format, args...)
+}
+
+func (nls *logShim) Errorf(ctx context.Context, format string, args ...any) {
+	log.G(ctx).Errorf("NRI: "+format, args...)
+}
diff --git a/daemon/internal/nri/nri.go b/daemon/internal/nri/nri.go
index b525d400a3..93155d3160 100644
--- a/daemon/internal/nri/nri.go
+++ b/daemon/internal/nri/nri.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/containerd/nri/pkg/adaptation"
+	nrilog "github.com/containerd/nri/pkg/log"
 	"github.com/moby/moby/v2/daemon/container"
 	"github.com/moby/moby/v2/daemon/internal/rootless"
 	"github.com/moby/moby/v2/daemon/pkg/opts"
@@ -57,6 +58,7 @@ func NewNRI(ctx context.Context, cfg Config) (*NRI, error) {
 		"pluginConfigPath": n.cfg.DaemonConfig.PluginConfigPath,
 		"socketPath":       n.cfg.DaemonConfig.SocketPath,
 	}).Info("Starting NRI")
+	nrilog.Set(&logShim{})
 
 	var err error
 	n.nri, err = adaptation.New("docker", dockerversion.Version, n.syncFn, n.updateFn, nriOptions(n.cfg.DaemonConfig)...)