feat: add metric for image push duration

Author: ankittk

internal/build/imgsrc/buildpacks_builder.go

@@ -9,13 +9,14 @@ import (
 	packclient "github.com/buildpacks/pack/pkg/client"
 	projectTypes "github.com/buildpacks/pack/pkg/project/types"
 	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/superfly/flyctl/internal/cmdfmt"
 	"github.com/superfly/flyctl/internal/metrics"
 	"github.com/superfly/flyctl/internal/tracing"
 	"github.com/superfly/flyctl/iostreams"
 	"github.com/superfly/flyctl/terminal"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
 )
 
 type buildpacksBuilder struct{}
@@ -158,7 +159,9 @@ func (*buildpacksBuilder) Run(ctx context.Context, dockerFactory *dockerClientFa
 		build.PushStart()
 		cmdfmt.PrintBegin(streams.ErrOut, "Pushing image to fly")
 
-		if err := pushToFly(ctx, docker, streams, opts.Tag); err != nil {
+		builderType, builderRegion := getBuilderInfo(ctx, dockerFactory)
+
+		if err := pushToFly(ctx, docker, streams, opts.Tag, builderType, builderRegion); err != nil {
 			build.PushFinish()
 			return nil, "", err
 		}

internal/build/imgsrc/builtin_builder.go

@@ -1,11 +1,11 @@
 package imgsrc
 
 import (
-	"fmt"
-
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
+
 	"github.com/superfly/flyctl/internal/build/imgsrc/builtins"
 	"github.com/superfly/flyctl/internal/cmdfmt"
 	"github.com/superfly/flyctl/internal/metrics"
@@ -126,7 +126,9 @@ func (*builtinBuilder) Run(ctx context.Context, dockerFactory *dockerClientFacto
 		build.PushStart()
 		cmdfmt.PrintBegin(streams.ErrOut, "Pushing image to fly")
 
-		if err := pushToFly(ctx, docker, streams, opts.Tag); err != nil {
+		builderType, builderRegion := getBuilderInfo(ctx, dockerFactory)
+
+		if err := pushToFly(ctx, docker, streams, opts.Tag, builderType, builderRegion); err != nil {
 			build.PushFinish()
 			return nil, "", err
 		}

internal/build/imgsrc/dockerfile_builder.go

@@ -25,6 +25,10 @@ import (
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
 	"github.com/moby/buildkit/session/secrets/secretsprovider"
 	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/superfly/flyctl/helpers"
 	"github.com/superfly/flyctl/internal/buildinfo"
 	"github.com/superfly/flyctl/internal/cmdfmt"
@@ -34,9 +38,6 @@ import (
 	"github.com/superfly/flyctl/internal/tracing"
 	"github.com/superfly/flyctl/iostreams"
 	"github.com/superfly/flyctl/terminal"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/sync/errgroup"
 )
 
 type dockerfileBuilder struct{}
@@ -270,10 +271,12 @@ func (*dockerfileBuilder) Run(ctx context.Context, dockerFactory *dockerClientFa
 	build.BuildFinish()
 	cmdfmt.PrintDone(streams.ErrOut, "Building image done")
 
+	builderType, builderRegion := getBuilderInfo(ctx, dockerFactory)
+
 	if opts.Publish {
 		build.PushStart()
 		tb := render.NewTextBlock(ctx, "Pushing image to fly")
-		if err := pushToFly(ctx, docker, streams, opts.Tag); err != nil {
+		if err := pushToFly(ctx, docker, streams, opts.Tag, builderType, builderRegion); err != nil {
 			build.PushFinish()
 			return nil, "", err
 		}
@@ -521,7 +524,7 @@ func runBuildKitBuild(ctx context.Context, docker *dockerclient.Client, opts Ima
 	return res.ExporterResponse[exptypes.ExporterImageDigestKey], nil
 }
 
-func pushToFly(ctx context.Context, docker *dockerclient.Client, streams *iostreams.IOStreams, tag string) (err error) {
+func pushToFly(ctx context.Context, docker *dockerclient.Client, streams *iostreams.IOStreams, tag string, builderType string, builderRegion string) (err error) {
 	ctx, span := tracing.GetTracer().Start(ctx, "push_image_to_registry", trace.WithAttributes(attribute.String("tag", tag)))
 	defer span.End()
 
@@ -531,6 +534,12 @@ func pushToFly(ctx context.Context, docker *dockerclient.Client, streams *iostre
 		}
 	}()
 
+	// Add builder type and region to span attributes
+	span.SetAttributes(
+		attribute.String("builder.type", builderType),
+		attribute.String("builder.region", builderRegion),
+	)
+
 	metrics.Started(ctx, "image_push")
 	sendImgPushMetrics := metrics.StartTiming(ctx, "image_push/duration")
 
@@ -543,6 +552,9 @@ func pushToFly(ctx context.Context, docker *dockerclient.Client, streams *iostre
 		return errors.Wrap(err, "error pushing image to registry")
 	}
 	defer pushResp.Close() // skipcq: GO-S2307
+
+	// Send enhanced metrics with builder type and region
+	SendEnhancedImagePushMetrics(ctx, builderType, builderRegion)
 	sendImgPushMetrics()
 
 	err = jsonmessage.DisplayJSONMessagesStream(pushResp, streams.ErrOut, streams.StderrFd(), streams.IsStderrTTY(), nil)
@@ -559,3 +571,12 @@ func pushToFly(ctx context.Context, docker *dockerclient.Client, streams *iostre
 
 	return nil
 }
+
+// SendEnhancedImagePushMetrics sends enhanced metrics for image push operations
+// with builder type and region information
+func SendEnhancedImagePushMetrics(ctx context.Context, builderType, builderRegion string) {
+	metrics.Send(ctx, "image_push/enhanced", map[string]interface{}{
+		"builder_type":   builderType,
+		"builder_region": builderRegion,
+	})
+}

internal/build/imgsrc/local_image_resolver.go

@@ -10,11 +10,12 @@ import (
 	dockerclient "github.com/docker/docker/client"
 	dockerparser "github.com/novln/docker-parser"
 	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel/attribute"
+
 	"github.com/superfly/flyctl/internal/cmdfmt"
 	"github.com/superfly/flyctl/internal/tracing"
 	"github.com/superfly/flyctl/iostreams"
 	"github.com/superfly/flyctl/terminal"
-	"go.opentelemetry.io/otel/attribute"
 )
 
 type localImageResolver struct{}
@@ -96,7 +97,9 @@ func (*localImageResolver) Run(ctx context.Context, dockerFactory *dockerClientF
 
 		cmdfmt.PrintBegin(streams.ErrOut, "Pushing image to fly")
 
-		if err := pushToFly(ctx, docker, streams, opts.Tag); err != nil {
+		builderType, builderRegion := getBuilderInfo(ctx, dockerFactory)
+
+		if err := pushToFly(ctx, docker, streams, opts.Tag, builderType, builderRegion); err != nil {
 			build.PushFinish()
 			return nil, "", err
 		}

internal/build/imgsrc/nixpacks_builder.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+
 	"github.com/superfly/flyctl/agent"
 	"github.com/superfly/flyctl/flyctl"
 	"github.com/superfly/flyctl/iostreams"
@@ -216,7 +217,9 @@ func (*nixpacksBuilder) Run(ctx context.Context, dockerFactory *dockerClientFact
 	build.BuildFinish()
 
 	build.PushStart()
-	if err := pushToFly(ctx, docker, streams, opts.Tag); err != nil {
+	builderType, builderRegion := getBuilderInfo(ctx, dockerFactory)
+
+	if err := pushToFly(ctx, docker, streams, opts.Tag, builderType, builderRegion); err != nil {
 		build.PushFinish()
 		return nil, "", err
 	}