From 63b6c670fc2e6104323371c7458244c470844169 Mon Sep 17 00:00:00 2001
From: dongyuzhen <dongyuzhen@h-partners.com>
Date: Mon, 30 Jun 2025 16:34:54 +0800
Subject: [PATCH] do not report error log when skip otlp plugin

---
 containerd.spec                               |  8 +++++-
 git-commit                                    |  2 +-
 ...t-report-error-log-when-skip-otlp-pl.patch | 25 +++++++++++++++++++
 series.conf                                   |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch

diff --git a/containerd.spec b/containerd.spec
index 0b134dc..580c099 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.6.22
 Name:           containerd
-Release:        17
+Release:        18
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %exclude %{_bindir}/containerd-stress
 
 %changelog
+* Mon Jun 30 2025 dongyuzhen <dongyuzhen@h-partners.com> - 1.6.22-18
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:do not report error log when skip otlp plugin
+
 * Wed Jun 18 2025 dongyuzhen <dongyuzhen@h-partners.com> - 1.6.22-17
 - Type:bugfix
 - ID:NA
diff --git a/git-commit b/git-commit
index 36f5748..2c68893 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-0f8b198b013bf2e9a1028179595ad044d18acf43
+e0b68a854fa5dda8a38b60888cf73a72ac1547e0
diff --git a/patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch b/patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch
new file mode 100644
index 0000000..5b165ab
--- /dev/null
+++ b/patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch
@@ -0,0 +1,25 @@
+From 655fff1e4966163870728f12f2a5f81e017544e2 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Thu, 12 Jun 2025 14:42:14 +0800
+Subject: [PATCH] containerd:do not report error log when skip otlp plugin
+
+---
+ tracing/plugin/otlp.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go
+index 95bf5509..8f921bef 100644
+--- a/tracing/plugin/otlp.go
++++ b/tracing/plugin/otlp.go
+@@ -155,7 +155,7 @@ func newTracer(ic *plugin.InitContext) (io.Closer, error) {
+ 	for id, pctx := range ls {
+ 		p, err := pctx.Instance()
+ 		if err != nil {
+-			log.G(ctx).WithError(err).Errorf("failed to initialize a tracing processor %q", id)
++			log.G(ctx).WithError(err).Warnf("failed to initialize a tracing processor %q", id)
+ 			continue
+ 		}
+ 		proc := p.(sdktrace.SpanProcessor)
+-- 
+2.33.0
+
diff --git a/series.conf b/series.conf
index 4a76f49..b3f86a6 100644
--- a/series.conf
+++ b/series.conf
@@ -37,3 +37,4 @@ patch/0037-fix-build-error-for-loong64.patch
 patch/0038-containerd-fix-CVE-2024-40635.patch
 patch/0039-containerd-Prevent-panic-in-Docker-pusher.patch
 patch/0040-containerd-client-fix-returned-error-in-the-defer-function.patch
+patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch
-- 
Gitee