-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Implemented changes for uniform Log-Format fields * Fixed null pointer exception at requestField "tls" * Adjusted changelog, reset changes in couper.hcl * Inclusion of access log test with more test cases * Implemented renaming and rearranging from meeting * Added upstream log test * Tests done, reset upstream tls/status to rsp field * Moved line 106 as instructed, reset workspace * Removed response.tls, renamed and moved realtime * Moved declaration of timings.total, removed realtime
- Loading branch information
Showing
5 changed files
with
404 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| package logging_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "reflect" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/sirupsen/logrus" | ||
|
|
||
| "github.com/avenga/couper/config/request" | ||
| "github.com/avenga/couper/internal/test" | ||
| "github.com/avenga/couper/logging" | ||
| "github.com/avenga/couper/server/writer" | ||
| ) | ||
|
|
||
| func TestAccessLog_ServeHTTP(t *testing.T) { | ||
| logger, hook := test.NewLogger() | ||
|
|
||
| defer func() { | ||
| if t.Failed() { | ||
| for _, e := range hook.AllEntries() { | ||
| t.Log(e.String()) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| accessLog := logging.NewAccessLog(logging.DefaultConfig, logger) | ||
|
|
||
| handler := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { | ||
| rw.WriteHeader(http.StatusNoContent) | ||
| }) | ||
|
|
||
| type testcase struct { | ||
| description string | ||
| url string | ||
| expFields logrus.Fields | ||
| } | ||
|
|
||
| testcases := []testcase{ | ||
| { | ||
| description: "pathless url", | ||
| url: "http://test.com", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "path": "", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| description: "proto https", | ||
| url: "https://example.com", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "tls": true, | ||
| "proto": "https", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| description: "proto http", | ||
| url: "http://example.com", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "tls": false, | ||
| "proto": "http", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| description: "method status constant", | ||
| url: "http://example.com", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "method": http.MethodGet, | ||
| "status": 204, | ||
| }, | ||
| "method": http.MethodGet, | ||
| "status": 204, | ||
| }, | ||
| }, | ||
| { | ||
| description: "explicit port", | ||
| url: "http://localhost:8080/", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "host": "localhost", | ||
| "origin": "localhost:8080", | ||
| "path": "/", | ||
| }, | ||
| "port": "8080", | ||
| }, | ||
| }, | ||
| { | ||
| description: "implicit port https", | ||
| url: "https://couper.io/", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "host": "couper.io", | ||
| "origin": "couper.io", | ||
| "path": "/", | ||
| }, | ||
| "port": "443", | ||
| }, | ||
| }, | ||
| { | ||
| description: "implicit port http", | ||
| url: "http://example.com", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "host": "example.com", | ||
| "origin": "example.com", | ||
| "path": "", | ||
| }, | ||
| "port": "80", | ||
| }, | ||
| }, | ||
| { | ||
| description: "required request fields", | ||
| url: "http://localhost:8080/test", | ||
| expFields: logrus.Fields{ | ||
| "request": logrus.Fields{ | ||
| "tls": false, | ||
| "host": "localhost", | ||
| "origin": "localhost:8080", | ||
| "path": "/test", | ||
| "method": http.MethodGet, | ||
| "status": 204, | ||
| "proto": "http", | ||
| }, | ||
| "method": http.MethodGet, | ||
| "port": "8080", | ||
| "uid": "veryRandom123", | ||
| "status": 204, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testcases { | ||
| t.Run(tc.description, func(st *testing.T) { | ||
|
|
||
| hook.Reset() | ||
|
|
||
| req := httptest.NewRequest(http.MethodGet, tc.url, nil) | ||
|
|
||
| ctx := context.Background() | ||
| ctx = context.WithValue(ctx, request.UID, "veryRandom123") | ||
| //ctx = context.WithValue(ctx, request.ServerName, "myTestServer") | ||
| req = req.WithContext(ctx) | ||
|
|
||
| rec := httptest.NewRecorder() | ||
| rw := writer.NewResponseWriter(rec, "") | ||
| accessLog.ServeHTTP(rw, req, handler, time.Now()) | ||
|
|
||
| entry := hook.LastEntry() | ||
| for key, expFields := range tc.expFields { | ||
| value, exist := entry.Data[key] | ||
| if !exist { | ||
| st.Errorf("Expected log field %s, got nothing", key) | ||
| } | ||
|
|
||
| switch ef := expFields.(type) { | ||
| case logrus.Fields: | ||
| for k, expected := range ef { | ||
| var result interface{} | ||
| switch fields := value.(type) { | ||
| case logging.Fields: | ||
| r, ok := fields[k] | ||
| if !ok { | ||
| st.Errorf("Expected log field %s.%s, got nothing", key, k) | ||
| } | ||
| result = r | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(expected, result) { | ||
| st.Errorf("Want: %v for key %s, got: %v", expected, k, result) | ||
| } | ||
| } | ||
| default: | ||
| if !reflect.DeepEqual(expFields, value) { | ||
| st.Errorf("Want: %v for key %s, got: %v", expFields, key, value) | ||
| } | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.