diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2020-11-03 04:55:05 +0000 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2020-11-03 04:55:05 +0000 |
| commit | ac9fee4d247c8af46c1a3cbaa7c1d453c5267b29 (patch) | |
| tree | d5cd9a71db77f9f8f1204b5517d69f740a8ba3d8 | |
| parent | dc7d87e870216a719643a6e927d6fd3e5b402d24 (diff) | |
| parent | 6b05bee11e61e27bdd401d9eb6a5f6996c684dcd (diff) | |
| download | gitlab-shell-ac9fee4d247c8af46c1a3cbaa7c1d453c5267b29.tar.gz | |
Merge branch 'sh-log-content-length-bytes' into 'master'
Log Content-Length bytes in API response
See merge request gitlab-org/gitlab-shell!427
| -rw-r--r-- | client/client_test.go | 2 | ||||
| -rw-r--r-- | client/gitlabnet.go | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/client/client_test.go b/client/client_test.go index 9895012..45d9819 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -94,6 +94,7 @@ func testSuccessfulGet(t *testing.T, client *GitlabNetClient) { require.Equal(t, logrus.InfoLevel, entries[0].Level) require.Contains(t, entries[0].Message, "method=GET") require.Contains(t, entries[0].Message, "status=200") + require.Contains(t, entries[0].Message, "content_length_bytes=") require.Contains(t, entries[0].Message, "Finished HTTP request") require.Contains(t, entries[0].Message, "correlation_id=") }) @@ -120,6 +121,7 @@ func testSuccessfulPost(t *testing.T, client *GitlabNetClient) { require.Equal(t, logrus.InfoLevel, entries[0].Level) require.Contains(t, entries[0].Message, "method=POST") require.Contains(t, entries[0].Message, "status=200") + require.Contains(t, entries[0].Message, "content_length_bytes=") require.Contains(t, entries[0].Message, "Finished HTTP request") require.Contains(t, entries[0].Message, "correlation_id=") }) diff --git a/client/gitlabnet.go b/client/gitlabnet.go index fcefb24..a5b22ee 100644 --- a/client/gitlabnet.go +++ b/client/gitlabnet.go @@ -156,6 +156,10 @@ func (c *GitlabNetClient) DoRequest(ctx context.Context, method, path string, da return nil, err } + if response.ContentLength >= 0 { + logger = logger.WithField("content_length_bytes", response.ContentLength) + } + logger.Info("Finished HTTP request") return response, nil |