diff --git a/client/pull.go b/client/pull.go index 9f94701bb..fd4c8bce6 100644 --- a/client/pull.go +++ b/client/pull.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/tracing" ) const ( diff --git a/cmd/containerd/builtins/tracing.go b/cmd/containerd/builtins/tracing.go index 23ecdfb5e..0926cd52d 100644 --- a/cmd/containerd/builtins/tracing.go +++ b/cmd/containerd/builtins/tracing.go @@ -19,5 +19,5 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/tracing/plugin" + _ "github.com/containerd/containerd/v2/pkg/tracing/plugin" ) diff --git a/core/remotes/docker/resolver.go b/core/remotes/docker/resolver.go index ecff062fc..177c47e4a 100644 --- a/core/remotes/docker/resolver.go +++ b/core/remotes/docker/resolver.go @@ -34,7 +34,7 @@ import ( remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/reference" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index 05dfc8d31..b51930d74 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index b534fd8c2..60389c869 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -49,7 +49,7 @@ import ( crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/errdefs" snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" ) // For image management: diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 7ca4a5540..7c5b7b8b7 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -23,7 +23,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/images/image_status.go b/pkg/cri/server/images/image_status.go index 6ad945c41..3990c0e9a 100644 --- a/pkg/cri/server/images/image_status.go +++ b/pkg/cri/server/images/image_status.go @@ -26,7 +26,7 @@ import ( imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/log" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/tracing/helpers.go b/pkg/tracing/helpers.go similarity index 100% rename from tracing/helpers.go rename to pkg/tracing/helpers.go diff --git a/tracing/log.go b/pkg/tracing/log.go similarity index 100% rename from tracing/log.go rename to pkg/tracing/log.go diff --git a/tracing/plugin/otlp.go b/pkg/tracing/plugin/otlp.go similarity index 99% rename from tracing/plugin/otlp.go rename to pkg/tracing/plugin/otlp.go index 37474086a..b972a0e54 100644 --- a/tracing/plugin/otlp.go +++ b/pkg/tracing/plugin/otlp.go @@ -25,8 +25,8 @@ import ( "time" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/tracing" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/sirupsen/logrus" diff --git a/tracing/plugin/otlp_test.go b/pkg/tracing/plugin/otlp_test.go similarity index 100% rename from tracing/plugin/otlp_test.go rename to pkg/tracing/plugin/otlp_test.go diff --git a/tracing/tracing.go b/pkg/tracing/tracing.go similarity index 100% rename from tracing/tracing.go rename to pkg/tracing/tracing.go diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 0624e05b1..204739f3a 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -37,8 +37,8 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity"