Fix missing Body.Close() calls on push to docker remote

coryb · thaJeztah · commit 0515f9d2d8b0 · 2021-07-12T20:51:25.000+02:00
Discovered this while using HTTP tracing via OpenTelemetry inside of buildkitd, where the trace spans were not being reported for the registry PUT http requests. The spans are only reported on the Close for the Body, after adding these Close calls, the spans are reported as expected. Signed-off-by: coryb <cbennett@netflix.com> (cherry picked from commit 894b6ae) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -190,6 +190,7 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str
 				return nil, err
 			}
 		}
+		defer resp.Body.Close()
 
 		switch resp.StatusCode {
 		case http.StatusOK, http.StatusAccepted, http.StatusNoContent:
@@ -382,6 +383,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
 	if resp.err != nil {
 		return resp.err
 	}
+	defer resp.Response.Body.Close()
 
 	// 201 is specified return status, some registries return
 	// 200, 202 or 204.

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str`
`190`	`190`	`return nil, err`
`191`	`191`	`}`
`192`	`192`	`}`
	`193`	`+ defer resp.Body.Close()`
`193`	`194`
`194`	`195`	`switch resp.StatusCode {`
`195`	`196`	`case http.StatusOK, http.StatusAccepted, http.StatusNoContent:`
`@@ -382,6 +383,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di`
`382`	`383`	`if resp.err != nil {`
`383`	`384`	`return resp.err`
`384`	`385`	`}`
	`386`	`+ defer resp.Response.Body.Close()`
`385`	`387`
`386`	`388`	`// 201 is specified return status, some registries return`
`387`	`389`	`// 200, 202 or 204.`