Merge pull request #1065 from jonjohnsonjr/more-span

Add more spans around potentially slow ops

pkg/build/apk.go

@@ -19,11 +19,15 @@ import (
 	"fmt"
 	"regexp"
 
+	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 func (bc *Context) initializeApk(ctx context.Context) error {
+	ctx, span := otel.Tracer("apko").Start(ctx, "iniializeApk")
+	defer span.End()
+
 	alpineVersions := parseOptionsFromRepositories(bc.ic.Contents.Repositories)
 	if err := bc.apk.InitDB(ctx, alpineVersions...); err != nil {
 		return fmt.Errorf("failed to initialize apk database: %w", err)

pkg/build/build.go

@@ -80,6 +80,10 @@ func (bc *Context) GetBuildDateEpoch() (time.Time, error) {
 
 func (bc *Context) BuildImage(ctx context.Context) error {
 	log := clog.FromContext(ctx)
+
+	ctx, span := otel.Tracer("apko").Start(ctx, "BuildImage")
+	defer span.End()
+
 	if err := bc.buildImage(ctx); err != nil {
 		log.Debugf("buildImage failed: %v", err)
 		b, err2 := yaml.Marshal(bc.ic)
@@ -192,6 +196,10 @@ func NewOptions(opts ...Option) (*options.Options, *types.ImageConfiguration, er
 // overwrite the provided timestamp if present.
 func New(ctx context.Context, fs apkfs.FullFS, opts ...Option) (*Context, error) {
 	log := clog.FromContext(ctx)
+
+	ctx, span := otel.Tracer("apko").Start(ctx, "New")
+	defer span.End()
+
 	bc := Context{
 		o:  options.Default,
 		fs: fs,

pkg/build/build_implementation.go

@@ -119,9 +119,6 @@ func (bc *Context) BuildTarball(ctx context.Context) (string, hash.Hash, hash.Ha
 func (bc *Context) buildImage(ctx context.Context) error {
 	log := clog.FromContext(ctx)
 
-	ctx, span := otel.Tracer("apko").Start(ctx, "buildImage")
-	defer span.End()
-
 	if bc.o.Lockfile != "" {
 		lock, err := lock.FromFile(bc.o.Lockfile)
 		if err != nil {