Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
65 changes: 28 additions & 37 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"context"
"crypto/tls"
"crypto/x509"
_ "embed"
"encoding/json"
"fmt"
"io"
Expand All @@ -22,7 +21,6 @@ import (
"strconv"
"strings"
"sync"
"text/template"
"time"
)

Expand Down Expand Up @@ -53,17 +51,29 @@ const (
APIDefaultCacheExpiration = time.Minute * 15
)

// Embed the log template files
//
//go:embed request_log_template.tmpl
var requestTemplateStr string

//go:embed response_log_template.tmpl
var responseTemplateStr string

var (
reqLogTemplate = template.Must(template.New("request").Parse(requestTemplateStr))
respLogTemplate = template.Must(template.New("response").Parse(responseTemplateStr))
// Debug log formats. These are deliberately plain fmt formats rather than text/template.
// Linking the template execution engine disables the Go linker's dead code elimination for
// methods in every consumer binary (see https://github.com/linode/linodego/issues/1022).
const (
requestLogFormat = `
============================================================================================
~~~ REQUEST ~~~
%v
HOST: %v
HEADERS: %v
BODY: %v
--------------------------------------------------------------------------------------------`

responseLogFormat = `
============================================================================================
~~~ RESPONSE ~~~
STATUS: %v
PROTO: %v
RECEIVED AT: %v
TIME DURATION: %v
HEADERS: %v
BODY: %v
--------------------------------------------------------------------------------------------`
)

type RequestLog struct {
Expand Down Expand Up @@ -737,17 +747,8 @@ func (c *Client) logRequest(req *http.Request) *http.Request {
}
}

var logBuf bytes.Buffer

err := reqLogTemplate.Execute(&logBuf, map[string]any{
"Request": reqLog.Request,
"Host": reqLog.Host,
"Headers": formatHeaders(reqLog.Headers),
"Body": body,
})
if err == nil {
c.logger.Debugf(sanitizeLogValue(logBuf.String()))
}
c.logger.Debugf(sanitizeLogValue(fmt.Sprintf(requestLogFormat,
reqLog.Request, reqLog.Host, formatHeaders(reqLog.Headers), body)))

return req
}
Expand Down Expand Up @@ -862,19 +863,9 @@ func (c *Client) logResponse(resp *http.Response, start, end time.Time) *http.Re
}
}

var logBuf bytes.Buffer

err := respLogTemplate.Execute(&logBuf, map[string]any{
"Status": respLog.Status,
"Proto": respLog.Proto,
"ReceivedAt": respLog.ReceivedAt,
"TimeDuration": respLog.TimeDuration,
"Headers": formatHeaders(redactHeaders(respLog.Headers)),
"Body": body,
})
if err == nil {
c.logger.Debugf(sanitizeLogValue(logBuf.String()))
}
c.logger.Debugf(sanitizeLogValue(fmt.Sprintf(responseLogFormat,
respLog.Status, respLog.Proto, respLog.ReceivedAt, respLog.TimeDuration,
formatHeaders(redactHeaders(respLog.Headers)), body)))

resp.Body = io.NopCloser(bytes.NewReader(respBody.Bytes()))

Expand Down
8 changes: 0 additions & 8 deletions request_log_template.tmpl

This file was deleted.

10 changes: 0 additions & 10 deletions response_log_template.tmpl

This file was deleted.

Loading