Send push timings to the server #2152
+135
−448
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,22 +2,58 @@ package docker | |||||||
|
|
||||||||
| import ( | ||||||||
| "context" | ||||||||
| "fmt" | ||||||||
| "math/rand/v2" | ||||||||
| "strings" | ||||||||
| "time" | ||||||||
|
|
||||||||
| "github.com/replicate/cog/pkg/docker/command" | ||||||||
| "github.com/replicate/cog/pkg/http" | ||||||||
| "github.com/replicate/cog/pkg/monobeam" | ||||||||
| "github.com/replicate/cog/pkg/util/console" | ||||||||
| "github.com/replicate/cog/pkg/web" | ||||||||
| ) | ||||||||
|
|
||||||||
| func Push(image string, fast bool, projectDir string, command command.Command, buildTime time.Duration) error { | ||||||||
| ctx := context.Background() | ||||||||
| client, err := http.ProvideHTTPClient(command) | ||||||||
| if err != nil { | ||||||||
| return err | ||||||||
| } | ||||||||
| webClient := web.NewClient(command, client) | ||||||||
|
|
||||||||
| // For the timing flow, on error we will just log and continue since | ||||||||
| // this is just a loss of push timing information | ||||||||
| imageID := "" | ||||||||
| if fast { | ||||||||
| // Generate 256 bit random hash (4x64 bits) to use as an upload ID | ||||||||
| for i := 0; i < 4; i++ { | ||||||||
| // Ignoring the linter warning about math/rand/v2 not being cryptographically secure | ||||||||
| // because this just needs to be a "unique enough" ID for a cache between when the | ||||||||
| // push starts and ends, which should only be ~a week max. | ||||||||
| imageID = fmt.Sprintf("%s%x", imageID, rand.Int64()) //nolint:gosec | ||||||||
| } | ||||||||
|
There was a problem hiding this comment.
|
||||||||
| } else { | ||||||||
| imageMeta, err := command.Inspect(image) | ||||||||
| if err != nil { | ||||||||
| console.Warnf("Failed to inspect image: %v", err) | ||||||||
| } | ||||||||
| parts := strings.Split(imageMeta.ID, ":") | ||||||||
| if len(parts) != 2 { | ||||||||
| console.Warn("Image ID was not of the form sha:hash") | ||||||||
| } else { | ||||||||
| imageID = parts[1] | ||||||||
| } | ||||||||
|
There was a problem hiding this comment. nit: Ooh! Use strings.Cut instead! |
||||||||
| } | ||||||||
|
|
||||||||
| err = webClient.PostBuildStart(ctx, imageID, buildTime) | ||||||||
| if err != nil { | ||||||||
|
There was a problem hiding this comment. nit: I don't see
Suggested change
|
||||||||
| console.Warnf("Failed to send build timings to server: %v", err) | ||||||||
| } | ||||||||
|
|
||||||||
| if fast { | ||||||||
| monobeamClient := monobeam.NewClient(client) | ||||||||
| return FastPush(ctx, image, projectDir, command, webClient, monobeamClient, imageID) | ||||||||
| } | ||||||||
| return StandardPush(image, command) | ||||||||
| } | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like maybe your
asdfinstallation isn't happy 🤔 Thetoolchainshould stay in lockstep with what is in.tool-versions.