| Lorenz Brun | d13c1c6 | 2022-03-30 19:58:58 +0200 | [diff] [blame] | 1 | From 26ac5a008b349b77288d29cc483ea5d6129f298c Mon Sep 17 00:00:00 2001 |
| 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Wed, 16 Mar 2022 18:35:44 +0100 |
| 4 | Subject: [PATCH] Disable tracing for otel compatibility |
| 5 | |
| 6 | --- |
| 7 | cmd/containerd/builtins.go | 1 - |
| 8 | cmd/containerd/command/main.go | 2 -- |
| 9 | 2 files changed, 3 deletions(-) |
| 10 | |
| 11 | diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins.go |
| 12 | index 8c6f1fe86..dd8b1d3d9 100644 |
| 13 | --- a/cmd/containerd/builtins.go |
| 14 | +++ b/cmd/containerd/builtins.go |
| 15 | @@ -36,5 +36,4 @@ import ( |
| 16 | _ "github.com/containerd/containerd/services/snapshots" |
| 17 | _ "github.com/containerd/containerd/services/tasks" |
| 18 | _ "github.com/containerd/containerd/services/version" |
| 19 | - _ "github.com/containerd/containerd/tracing/plugin" |
| 20 | ) |
| 21 | diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go |
| 22 | index f549e08a3..dfde3599e 100644 |
| 23 | --- a/cmd/containerd/command/main.go |
| 24 | +++ b/cmd/containerd/command/main.go |
| 25 | @@ -35,7 +35,6 @@ import ( |
| 26 | "github.com/containerd/containerd/services/server" |
| 27 | srvconfig "github.com/containerd/containerd/services/server/config" |
| 28 | "github.com/containerd/containerd/sys" |
| 29 | - "github.com/containerd/containerd/tracing" |
| 30 | "github.com/containerd/containerd/version" |
| 31 | "github.com/sirupsen/logrus" |
| 32 | "github.com/urfave/cli" |
| 33 | @@ -370,7 +369,6 @@ func setLogFormat(config *srvconfig.Config) error { |
| 34 | } |
| 35 | |
| 36 | func setLogHooks() { |
| 37 | - logrus.StandardLogger().AddHook(tracing.NewLogrusHook()) |
| 38 | } |
| 39 | |
| 40 | func dumpStacks(writeToFile bool) { |
| 41 | -- |
| 42 | 2.25.1 |
| 43 | |