@@ -809,6 +809,7 @@ func (a *API) GenerateCode() ([]byte, error) {
809809 "errors" ,
810810 "fmt" ,
811811 "io" ,
812+ "log/slog" ,
812813 "net/http" ,
813814 "net/url" ,
814815 "strconv" ,
@@ -820,6 +821,7 @@ func (a *API) GenerateCode() ([]byte, error) {
820821 if a .Name == "storage" {
821822 pn (" %q" , "github.com/googleapis/gax-go/v2" )
822823 }
824+ pn (" %q" , "github.com/googleapis/gax-go/v2/internallog" )
823825 for _ , imp := range []struct {
824826 pkg string
825827 lname string
@@ -895,7 +897,10 @@ func (a *API) GenerateCode() ([]byte, error) {
895897
896898 pn ("client, endpoint, err := htransport.NewClient(ctx, opts...)" )
897899 pn ("if err != nil { return nil, err }" )
898- pn ("s, err := New(client)" )
900+ pn ("s := &%s{client: client, BasePath: basePath, logger: internaloption.GetLogger(opts)}" , service )
901+ for _ , res := range a .doc .Resources { // add top level resources.
902+ pn ("s.%s = New%s(s)" , resourceGoField (res , nil ), resourceGoType (res ))
903+ }
899904 pn ("if err != nil { return nil, err }" )
900905 pn (`if endpoint != "" { s.BasePath = endpoint }` )
901906 pn ("return s, nil" )
@@ -908,15 +913,12 @@ func (a *API) GenerateCode() ([]byte, error) {
908913 pn ("// If you are using google.golang.org/api/googleapis/transport.APIKey, use option.WithAPIKey with NewService instead." )
909914 pn ("func New(client *http.Client) (*%s, error) {" , service )
910915 pn ("if client == nil { return nil, errors.New(\" client is nil\" ) }" )
911- pn ("s := &%s{client: client, BasePath: basePath}" , service )
912- for _ , res := range a .doc .Resources { // add top level resources.
913- pn ("s.%s = New%s(s)" , resourceGoField (res , nil ), resourceGoType (res ))
914- }
915- pn ("return s, nil" )
916+ pn ("return NewService(context.Background(), option.WithHTTPClient(client))" )
916917 pn ("}" )
917918
918919 pn ("\n type %s struct {" , service )
919920 pn (" client *http.Client" )
921+ pn (" logger *slog.Logger" )
920922 pn (" BasePath string // API endpoint base URL" )
921923 pn (" UserAgent string // optional additional User-Agent fragment" )
922924
@@ -995,6 +997,7 @@ func splitFileHeading(w io.Writer, pkg string) {
995997 "context" ,
996998 "fmt" ,
997999 "io" ,
1000+ "log/slog" ,
9981001 "net/http" ,
9991002 } {
10001003 pn (" %q" , imp )
@@ -2279,34 +2282,44 @@ func (meth *Method) generateCode() {
22792282 pn (` reqHeaders.Set("If-None-Match", c.ifNoneMatch_)` )
22802283 pn ("}" )
22812284 }
2282- pn ( " var body io.Reader = nil" )
2285+ var hasBody bool
22832286 if meth .IsRawRequest () {
2284- pn ("body = c.body_" )
2287+ pn ("body := bytes.NewBuffer(nil)" )
2288+ pn ("_, err := body.ReadFrom(c.body_)" )
2289+ pn ("if err != nil { return nil, err }" )
2290+ hasBody = true
22852291 } else if meth .IsProtoStructRequest () {
22862292 pn ("protoBytes, err := json.Marshal(c.req)" )
22872293 pn ("if err != nil { return nil, err }" )
2288- pn ("body = bytes.NewReader(protoBytes)" )
2294+ pn ("body := bytes.NewReader(protoBytes)" )
2295+ hasBody = true
22892296 } else {
22902297 if ba := args .bodyArg (); ba != nil && httpMethod != "GET" {
22912298 if meth .m .ID == "ml.projects.predict" {
22922299 // TODO(cbro): move ML API to rawHTTP (it will be a breaking change)
2293- // Skip JSONReader for APIs that require clients to pass in JSON already.
2294- pn ("body = strings.NewReader (c.%s.HttpBody.Data)" , ba .goname )
2300+ // Skip JSONBuffer for APIs that require clients to pass in JSON already.
2301+ pn ("body := bytes.NewBufferString (c.%s.HttpBody.Data)" , ba .goname )
22952302 } else {
22962303 style := "WithoutDataWrapper"
22972304 if a .needsDataWrapper () {
22982305 style = "WithDataWrapper"
22992306 }
2300- pn ("body, err := googleapi.%s.JSONReader (c.%s)" , style , ba .goname )
2307+ pn ("body, err := googleapi.%s.JSONBuffer (c.%s)" , style , ba .goname )
23012308 pn ("if err != nil { return nil, err }" )
23022309 }
2310+ hasBody = true
23032311 }
23042312 pn (`c.urlParams_.Set("alt", alt)` )
23052313 pn (`c.urlParams_.Set("prettyPrint", "false")` )
23062314 }
2315+ body := "nil"
2316+ if hasBody {
2317+ body = body
2318+ }
23072319
23082320 pn ("urls := googleapi.ResolveRelative(c.s.BasePath, %q)" , meth .m .Path )
23092321 if meth .supportsMediaUpload () {
2322+ body = "newBody"
23102323 pn ("if c.mediaInfo_ != nil {" )
23112324 pn (" urls = googleapi.ResolveRelative(c.s.BasePath, %q)" , meth .mediaUploadPath ())
23122325 pn (` c.urlParams_.Set("uploadType", c.mediaInfo_.UploadType())` )
@@ -2316,11 +2329,11 @@ func (meth *Method) generateCode() {
23162329 pn (" body = new(bytes.Buffer)" )
23172330 pn (` reqHeaders.Set("Content-Type", "application/json")` )
23182331 pn ("}" )
2319- pn ("body , getBody, cleanup := c.mediaInfo_.UploadRequest(reqHeaders, body)" )
2332+ pn ("newBody , getBody, cleanup := c.mediaInfo_.UploadRequest(reqHeaders, body)" )
23202333 pn ("defer cleanup()" )
23212334 }
23222335 pn (`urls += "?" + c.urlParams_.Encode()` )
2323- pn ("req, err := http.NewRequest(%q, urls, body )" , httpMethod )
2336+ pn ("req, err := http.NewRequest(%q, urls, %s )" , httpMethod , body )
23242337 pn ("if err != nil { return nil, err }" )
23252338 pn ("req.Header = reqHeaders" )
23262339 if meth .supportsMediaUpload () {
@@ -2337,12 +2350,18 @@ func (meth *Method) generateCode() {
23372350 }
23382351 pn (`})` )
23392352 }
2353+ logBody := "nil"
2354+ if hasBody {
2355+ logBody = "body.Bytes()"
2356+ }
23402357 if meth .supportsMediaUpload () && meth .api .Name == "storage" {
2358+ pn (`c.s.logger.DebugContext(c.ctx_, "api request", "serviceName", apiName, "rpcName", %q, "request", internallog.HTTPRequest(req, %s))` , meth .Id (), logBody )
23412359 pn ("if c.retry != nil {" )
23422360 pn (" return gensupport.SendRequestWithRetry(c.ctx_, c.s.client, req, c.retry)" )
23432361 pn ("}" )
23442362 pn ("return gensupport.SendRequest(c.ctx_, c.s.client, req)" )
23452363 } else {
2364+ pn (`c.s.logger.DebugContext(c.ctx_, "api request", "serviceName", apiName, "rpcName", %q, "request", internallog.HTTPRequest(req, %s))` , meth .Id (), logBody )
23462365 pn ("return gensupport.SendRequest(c.ctx_, c.s.client, req)" )
23472366 }
23482367 pn ("}" )
@@ -2421,6 +2440,7 @@ func (meth *Method) generateCode() {
24212440 pn ("}" )
24222441 }
24232442 if retTypeComma == "" {
2443+ pn (`c.s.logger.DebugContext(c.ctx_, "api response", "serviceName", apiName, "rpcName", %q, "response", internallog.HTTPResponse(res, nil))` , meth .Id ())
24242444 pn ("return nil" )
24252445 } else {
24262446 if meth .IsProtoStructResponse () {
@@ -2449,8 +2469,11 @@ func (meth *Method) generateCode() {
24492469 pn ("if err := res.Body.Close(); err != nil { return nil, err }" )
24502470 pn ("if err := json.NewDecoder(bytes.NewReader(b.Bytes())).Decode(target); err != nil { return nil, err }" )
24512471 pn ("ret.Data = b.String()" )
2472+ pn (`c.s.logger.DebugContext(c.ctx_, "api response", "serviceName", apiName, "rpcName", %q, "response", internallog.HTTPResponse(res, b.Bytes()))` , meth .Id ())
24522473 } else {
2453- pn ("if err := gensupport.DecodeResponse(target, res); err != nil { return nil, err }" )
2474+ pn ("b, err := gensupport.DecodeResponseBytes(target, res)" )
2475+ pn ("if err != nil { return nil, err }" )
2476+ pn (`c.s.logger.DebugContext(c.ctx_, "api response", "serviceName", apiName, "rpcName", %q, "response", internallog.HTTPResponse(res, b))` , meth .Id ())
24542477 }
24552478 pn ("return ret, nil" )
24562479 }
0 commit comments