AIRSHIP-2978 Sort log lines

uswitch · Jul 12, 2023 · c13c019 · c13c019
1 parent 19041d8
commit c13c019
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/docs/ACCESSLOG.md b/docs/ACCESSLOG.md
@@ -6,24 +6,24 @@ The Access log format is configurable via the Yggdrasil config file only. It is
 {
     "accessLogger": {
         "format": {
-            "start_time":                "%START_TIME(%s.%3f)%",
             "bytes_received":            "%BYTES_RECEIVED%",
-            "protocol":                  "%PROTOCOL%",
-            "response_code":             "%RESPONSE_CODE%",
             "bytes_sent":                "%BYTES_SENT%",
+            "downstream_local_address":  "%DOWNSTREAM_LOCAL_ADDRESS%",
+            "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
             "duration":                  "%DURATION%",
+            "forwarded_for":             "%REQ(X-FORWARDED-FOR)%",
+            "protocol":                  "%PROTOCOL%",
+            "request_id":                "%REQ(X-REQUEST-ID)%",
+            "request_method":            "%REQ(:METHOD)%",
+            "request_path":              "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+            "response_code":             "%RESPONSE_CODE%",
             "response_flags":            "%RESPONSE_FLAGS%",
-            "upstream_host":             "%UPSTREAM_HOST%",
+            "start_time":                "%START_TIME(%s.%3f)%",
             "upstream_cluster":          "%UPSTREAM_CLUSTER%",
+            "upstream_host":             "%UPSTREAM_HOST%",
             "upstream_local_address":    "%UPSTREAM_LOCAL_ADDRESS%",
-            "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-            "downstream_local_address":  "%DOWNSTREAM_LOCAL_ADDRESS%",
-            "request_method":            "%REQ(:METHOD)%",
-            "request_path":              "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
             "upstream_service_time":     "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-            "forwarded_for":             "%REQ(X-FORWARDED-FOR)%",
-            "user_agent":                "%REQ(USER-AGENT)%",
-            "request_id":                "%REQ(X-REQUEST-ID)%"
+            "user_agent":                "%REQ(USER-AGENT)%"
         }
     }
 }

diff --git a/pkg/envoy/boilerplate.go b/pkg/envoy/boilerplate.go
@@ -34,24 +34,24 @@ var (
 	allowedRetryOns map[string]bool
 
 	DefaultAccessLogFormat = map[string]interface{}{
-		"start_time":                "%START_TIME(%s.%3f)%",
 		"bytes_received":            "%BYTES_RECEIVED%",
-		"protocol":                  "%PROTOCOL%",
-		"response_code":             "%RESPONSE_CODE%",
 		"bytes_sent":                "%BYTES_SENT%",
+		"downstream_local_address":  "%DOWNSTREAM_LOCAL_ADDRESS%",
+		"downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
 		"duration":                  "%DURATION%",
+		"forwarded_for":             "%REQ(X-FORWARDED-FOR)%",
+		"protocol":                  "%PROTOCOL%",
+		"request_id":                "%REQ(X-REQUEST-ID)%",
+		"request_method":            "%REQ(:METHOD)%",
+		"request_path":              "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+		"response_code":             "%RESPONSE_CODE%",
 		"response_flags":            "%RESPONSE_FLAGS%",
-		"upstream_host":             "%UPSTREAM_HOST%",
+		"start_time":                "%START_TIME(%s.%3f)%",
 		"upstream_cluster":          "%UPSTREAM_CLUSTER%",
+		"upstream_host":             "%UPSTREAM_HOST%",
 		"upstream_local_address":    "%UPSTREAM_LOCAL_ADDRESS%",
-		"downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-		"downstream_local_address":  "%DOWNSTREAM_LOCAL_ADDRESS%",
-		"request_method":            "%REQ(:METHOD)%",
-		"request_path":              "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
 		"upstream_service_time":     "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-		"forwarded_for":             "%REQ(X-FORWARDED-FOR)%",
 		"user_agent":                "%REQ(USER-AGENT)%",
-		"request_id":                "%REQ(X-REQUEST-ID)%",
 	}
 )