diff options
author | Igor Drozdov <idrozdov@gitlab.com> | 2020-07-31 12:58:42 +0000 |
---|---|---|
committer | Igor Drozdov <idrozdov@gitlab.com> | 2020-07-31 12:58:42 +0000 |
commit | e0a8b72bc3a9dbfcbe4d32be08f66efb12f24bcd (patch) | |
tree | 6a28feda2a62ec88e889593d7fbf3ae950659e35 /client/client_test.go | |
parent | 701ebca0b5d4a8451afe677c3bdb19cc92a5a2f0 (diff) | |
parent | 87402ed127d9855b8123e5e08a4c89d373cc79e8 (diff) | |
download | gitlab-shell-e0a8b72bc3a9dbfcbe4d32be08f66efb12f24bcd.tar.gz |
Merge branch 'sh-inject-and-log-correlation-di' into 'master'
Generate and log correlation IDs
See merge request gitlab-org/gitlab-shell!400
Diffstat (limited to 'client/client_test.go')
-rw-r--r-- | client/client_test.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/client_test.go b/client/client_test.go index 5c5fda8..d520bbb 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -130,6 +130,7 @@ func testSuccessfulGet(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=GET") assert.Contains(t, entries[0].Message, "status=200") assert.Contains(t, entries[0].Message, "Finished HTTP request") + assert.Contains(t, entries[0].Message, "correlation_id=") }) } @@ -155,6 +156,7 @@ func testSuccessfulPost(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=POST") assert.Contains(t, entries[0].Message, "status=200") assert.Contains(t, entries[0].Message, "Finished HTTP request") + assert.Contains(t, entries[0].Message, "correlation_id=") }) } @@ -172,6 +174,7 @@ func testMissing(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=GET") assert.Contains(t, entries[0].Message, "status=404") assert.Contains(t, entries[0].Message, "Internal API error") + assert.Contains(t, entries[0].Message, "correlation_id=") }) t.Run("Missing error for POST", func(t *testing.T) { @@ -187,6 +190,7 @@ func testMissing(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=POST") assert.Contains(t, entries[0].Message, "status=404") assert.Contains(t, entries[0].Message, "Internal API error") + assert.Contains(t, entries[0].Message, "correlation_id=") }) } @@ -219,6 +223,7 @@ func testBrokenRequest(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=GET") assert.NotContains(t, entries[0].Message, "status=") assert.Contains(t, entries[0].Message, "Internal API unreachable") + assert.Contains(t, entries[0].Message, "correlation_id=") }) t.Run("Broken request for POST", func(t *testing.T) { @@ -235,6 +240,7 @@ func testBrokenRequest(t *testing.T, client *GitlabNetClient) { assert.Contains(t, entries[0].Message, "method=POST") assert.NotContains(t, entries[0].Message, "status=") assert.Contains(t, entries[0].Message, "Internal API unreachable") + assert.Contains(t, entries[0].Message, "correlation_id=") }) } |