Merge pull request #22171 from mlaventure/always-disable-metrics

Always disable containerd metrics when started by docker

libcontainerd/remote_linux.go

@@ -349,9 +349,9 @@ func (r *remote) runContainerdDaemon() error {
 	}
 
 	// Start a new instance
-	args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
+	args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc", "--metrics-interval=0"}
 	if r.debugLog {
-		args = append(args, "--debug", "--metrics-interval=0")
+		args = append(args, "--debug")
 	}
 	if len(r.runtimeArgs) > 0 {
 		for _, v := range r.runtimeArgs {