diff --git a/containerd.spec b/containerd.spec index 4091bee7d6a235e08cb646250a1c8f257ea9007d..3ed7a42b37d9a1977ef514c6ac3a5eeb8e04d263 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 - 1.6.22-18 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:do not report error log when skip otlp plugin + * Thu Jun 19 2025 dongyuzhen - 1.6.22-17 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index a086988fb716edd2ccdff5744b1e53751b7c8abc..f9580427a8c690805c4ea18355bd19fbe4b2cd23 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -8c223877fc14d8fb848531af79ebca0be78a9d9a +481de7cbe78b24fee27c0be4929a9fdc5648954b diff --git a/patch/0040-containerd-do-not-report-error-log-when-skip-otlp-pl.patch b/patch/0040-containerd-do-not-report-error-log-when-skip-otlp-pl.patch new file mode 100644 index 0000000000000000000000000000000000000000..5b165ab413d1f2b38938fcb7a1598bea86e30f30 --- /dev/null +++ b/patch/0040-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 +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 883fe59474e423481b90376eac46175852aded4b..940ce180c85c19e16f473717febd07c3c08685a6 100644 --- a/series.conf +++ b/series.conf @@ -36,3 +36,4 @@ patch/0036-containerd-modify-makefile-options.patch patch/0037-containerd-fix-CVE-2024-40635.patch patch/0038-containerd-Prevent-panic-in-Docker-pusher.patch patch/0039-containerd-client-fix-returned-error-in-the-defer-function.patch +patch/0040-containerd-do-not-report-error-log-when-skip-otlp-pl.patch