chore: update buildkit upstream to master (#6428)

* chore: update buildkit to master@9d84cdcda004 Signed-off-by: Justin Chadwell <me@jedevc.com> * chore: re-order go.mod Signed-off-by: Justin Chadwell <me@jedevc.com> --------- Signed-off-by: Justin Chadwell <me@jedevc.com>
dagger · Jan 18, 2024 · 50bd60f · 50bd60f
1 parent 75155ef
commit 50bd60f
Show file tree

Hide file tree

Showing 8 changed files with 155 additions and 143 deletions.
diff --git a/cmd/engine/main.go b/cmd/engine/main.go
@@ -726,7 +726,7 @@ func newController(ctx context.Context, c *cli.Context, cfg *config.Config) (*se
 		return nil, nil, err
 	}
 
-	tc, err := detect.Exporter()
+	tc, _, err := detect.Exporter()
 	if err != nil {
 		// just log it, this can happen when there's mismatching versions of otel libraries in your
 		// module dependency DAG...

diff --git a/engine/buildkit/containerimage.go b/engine/buildkit/containerimage.go
@@ -46,12 +46,12 @@ func (c *Client) PublishContainerImage(
 		return nil, err
 	}
 
-	expInstance, err := exporter.Resolve(ctx, opts)
+	expInstance, err := exporter.Resolve(ctx, 0, opts)
 	if err != nil {
 		return nil, fmt.Errorf("failed to resolve exporter: %s", err)
 	}
 
-	resp, descRef, err := expInstance.Export(ctx, combinedResult, c.ID())
+	resp, descRef, err := expInstance.Export(ctx, combinedResult, nil, c.ID())
 	if err != nil {
 		return nil, fmt.Errorf("failed to export: %s", err)
 	}
@@ -93,7 +93,7 @@ func (c *Client) ExportContainerImage(
 		return nil, err
 	}
 
-	expInstance, err := exporter.Resolve(ctx, opts)
+	expInstance, err := exporter.Resolve(ctx, 0, opts)
 	if err != nil {
 		return nil, fmt.Errorf("failed to resolve exporter: %s", err)
 	}
@@ -109,7 +109,7 @@ func (c *Client) ExportContainerImage(
 		IsFileStream: true,
 	}.AppendToOutgoingContext(ctx)
 
-	resp, descRef, err := expInstance.Export(ctx, combinedResult, clientMetadata.ClientID)
+	resp, descRef, err := expInstance.Export(ctx, combinedResult, nil, clientMetadata.ClientID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to export: %s", err)
 	}
@@ -147,7 +147,7 @@ func (c *Client) ContainerImageToTarball(
 		return nil, err
 	}
 
-	expInstance, err := exporter.Resolve(ctx, opts)
+	expInstance, err := exporter.Resolve(ctx, 0, opts)
 	if err != nil {
 		return nil, fmt.Errorf("failed to resolve exporter: %s", err)
 	}
@@ -165,7 +165,7 @@ func (c *Client) ContainerImageToTarball(
 		IsFileStream: true,
 	}.AppendToOutgoingContext(ctx)
 
-	_, descRef, err := expInstance.Export(ctx, combinedResult, c.ID())
+	_, descRef, err := expInstance.Export(ctx, combinedResult, nil, c.ID())
 	if err != nil {
 		return nil, fmt.Errorf("failed to export: %s", err)
 	}

diff --git a/engine/buildkit/filesync.go b/engine/buildkit/filesync.go
@@ -253,7 +253,7 @@ func (c *Client) LocalDirExport(
 		return err
 	}
 
-	expInstance, err := exporter.Resolve(ctx, nil)
+	expInstance, err := exporter.Resolve(ctx, 0, nil)
 	if err != nil {
 		return fmt.Errorf("failed to resolve exporter: %s", err)
 	}
@@ -268,7 +268,7 @@ func (c *Client) LocalDirExport(
 		Path:         destPath,
 	}.AppendToOutgoingContext(ctx)
 
-	_, descRef, err := expInstance.Export(ctx, cacheRes, clientMetadata.ClientID)
+	_, descRef, err := expInstance.Export(ctx, cacheRes, nil, clientMetadata.ClientID)
 	if err != nil {
 		return fmt.Errorf("failed to export: %s", err)
 	}

diff --git a/engine/client/buildkit.go b/engine/client/buildkit.go
@@ -47,11 +47,10 @@ func newBuildkitClient(ctx context.Context, rec *progrock.VertexRecorder, remote
 
 func buildkitConnectDefault(ctx context.Context, rec *progrock.VertexRecorder, remote *url.URL) (*bkclient.Client, error) {
 	opts := []bkclient.ClientOpt{
-		bkclient.WithFailFast(),
 		bkclient.WithTracerProvider(otel.GetTracerProvider()),
 	}
 
-	exp, err := detect.Exporter()
+	exp, _, err := detect.Exporter()
 	if err == nil {
 		if td, ok := exp.(bkclient.TracerDelegate); ok {
 			opts = append(opts, bkclient.WithTracerDelegate(td))