Skip to content

Commit 23e79a2

Browse files
committed
c8d/prune: Add OTEL spans
Signed-off-by: Paweł Gronowski <[email protected]>
1 parent e4c2eb9 commit 23e79a2

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

daemon/containerd/image_prune.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"strings"
66

77
containerdimages "github.com/containerd/containerd/images"
8+
"github.com/containerd/containerd/tracing"
89
cerrdefs "github.com/containerd/errdefs"
910
"github.com/containerd/log"
1011
"github.com/distribution/reference"
@@ -75,6 +76,10 @@ func (i *ImageService) ImagesPrune(ctx context.Context, fltrs filters.Args) (*im
7576
// In case a digested and tagged reference was used (e.g. `docker run alpine:latest@sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1`),
7677
// the alpine:latest image will be kept.
7778
func (i *ImageService) pruneUnused(ctx context.Context, filterFunc imageFilterFunc, danglingOnly bool) (*image.PruneReport, error) {
79+
ctx, span := tracing.StartSpan(ctx, "ImageService.pruneUnused")
80+
span.SetAttributes(tracing.Attribute("danglingOnly", danglingOnly))
81+
defer span.End()
82+
7883
allImages, err := i.images.List(ctx)
7984
if err != nil {
8085
return nil, err
@@ -125,6 +130,10 @@ func filterImagesUsedByContainers(ctx context.Context,
125130
allContainers []*container.Container,
126131
imagesToPrune map[string]containerdimages.Image,
127132
) (usedDigests map[digest.Digest]struct{}) {
133+
ctx, span := tracing.StartSpan(ctx, "filterImagesUsedByContainers")
134+
span.SetAttributes(tracing.Attribute("count", len(allContainers)))
135+
defer span.End()
136+
128137
// Image specified by digests that are used by containers.
129138
usedDigests = map[digest.Digest]struct{}{}
130139

@@ -179,6 +188,10 @@ func filterImagesUsedByContainers(ctx context.Context,
179188
func (i *ImageService) pruneAll(ctx context.Context, imagesToPrune map[string]containerdimages.Image) (*image.PruneReport, error) {
180189
report := image.PruneReport{}
181190

191+
ctx, span := tracing.StartSpan(ctx, "ImageService.pruneAll")
192+
span.SetAttributes(tracing.Attribute("count", len(imagesToPrune)))
193+
defer span.End()
194+
182195
possiblyDeletedConfigs := map[digest.Digest]struct{}{}
183196
var errs error
184197

0 commit comments

Comments
 (0)