Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update buildkit upstream to master #6428

Merged
merged 2 commits into from
Jan 18, 2024
Merged

chore: update buildkit upstream to master #6428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193dd6e
chore: update buildkit to master@9d84cdcda004
jedevc Jan 16, 2024
069fdbd
chore: re-order go.mod
jedevc Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/engine/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
12 changes: 6 additions & 6 deletions engine/buildkit/containerimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions engine/buildkit/filesync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down
3 changes: 1 addition & 2 deletions engine/client/buildkit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading