github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move tracing to pkg/tracing

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:56:25 -08:00
parent 6be90158cd
commit 8f0eb26311
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
13 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pull.go
View File

@ -29,9 +29,9 @@ import (
"github.com/containerd/containerd/v2/core/remotes/docker" "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/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/errdefs"
"github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/pkg/unpack"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/tracing"
) )
const ( const (

2
cmd/containerd/builtins/tracing.go
View File

@ -19,5 +19,5 @@
package builtins package builtins
import ( import (
_ "github.com/containerd/containerd/v2/tracing/plugin" _ "github.com/containerd/containerd/v2/pkg/tracing/plugin"
) )

2
core/remotes/docker/resolver.go
View File

@ -34,7 +34,7 @@ import (
remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/reference" "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/containerd/v2/version"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
pkg/cri/instrument/instrumented_service.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/log" "github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

2
pkg/cri/server/images/image_pull.go
View File

@ -49,7 +49,7 @@ import (
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" snpkg "github.com/containerd/containerd/v2/pkg/snapshotters"
"github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/pkg/tracing"
) )
// For image management: // For image management:

2
pkg/cri/server/images/image_remove.go
View File

@ -23,7 +23,7 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/errdefs" "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" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

2
pkg/cri/server/images/image_status.go
View File

@ -26,7 +26,7 @@ import (
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/log" "github.com/containerd/log"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"

0
tracing/helpers.go → pkg/tracing/helpers.go
View File

0
tracing/log.go → pkg/tracing/log.go
View File

2
tracing/plugin/otlp.go → pkg/tracing/plugin/otlp.go
View File

@ -25,8 +25,8 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/plugins"
"github.com/containerd/containerd/v2/tracing"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

0
tracing/plugin/otlp_test.go → pkg/tracing/plugin/otlp_test.go
View File

0
tracing/tracing.go → pkg/tracing/tracing.go
View File

2
pkg/unpack/unpacker.go
View File

@ -37,8 +37,8 @@ import (
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/kmutex"
"github.com/containerd/containerd/v2/pkg/labels" "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/platforms"
"github.com/containerd/containerd/v2/tracing"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"