Logging format cherry-picks (#7253)

---------

Co-authored-by: Ryan McCormick <[email protected]>

Author: nnshah1

docs/protocol/extension_logging.md

@@ -69,7 +69,7 @@ the `$string` representation of the log setting and the “value” is a `$strin
 `$bool`, or `$number` representation of the setting value. Currently, the
 following log settings are defined:
 
-- "log_file" : a `$string` parameter defining the file where the log outputs will be saved. If an empty string is specified, log outputs will stream to the console.
+- "log_file" : a `$string` log file location where the log outputs will be saved. If empty, log outputs are streamed to the console.
 
 - "log_info" : a `$boolean` parameter that controls whether the Triton server logs INFO level messages.
 
@@ -117,8 +117,14 @@ $log_setting_request =
 }
 ```
 
-When a `$log_setting` JSON is received (defined above), only the specified
-settings will be updated.
+When a `$log_setting` JSON is received (defined above), only the
+specified settings will be updated. Currently, the following log
+settings (described above) can be updated:
+- "log_info"
+- "log_warning"
+- "log_error"
+- "log_verbose_level"
+- "log_format"
 
 ### Example Usage
 The logging protocol extension can be invoked using the curl library in the following manner (assuming
@@ -196,3 +202,74 @@ message LogSettingsResponse
   map<string, SettingValue> settings = 1;
 }
 ```
+
+## Logging Formats
+
+The logging extension offers two logging formats. The formats have a
+common set of fields but differ in how the timestamp for a log entry
+is represented. Messages are serialized according to JSON encoding
+rules by default. This behavior can be disabled by setting the
+environment variable TRITON_SERVER_ESCAPE_LOG_MESSAGES to "0" when
+launching the server but can not be changed through the logging
+extension.
+
+Log entries can be single-line or multi-line. Multi-line entries have
+a single optional heading followed by the structured representation of
+an object such as a table or protobuf message. Multi-line entries end
+when the next log entry begins.
+
+1. TRITONSERVER_LOG_DEFAULT
+
+### Single-line Entry
+```
+<level><month><day><hour>:<min>:<sec>.<usec> <pid> <file>:<line>] <message>
+```
+Example:
+```
+I0520 20:03:25.829575 3355 model_lifecycle.cc:441] "AsyncLoad() 'simple'"
+```
+### Multi-line Entry
+```
+<level><month><day><hour>:<min>:<sec>.<usec> <pid> <file>:<line>] <heading>
+<object>
+```
+Example:
+
+```
+I0520 20:03:25.912303 3355 server.cc:676]
++--------+---------+--------+
+| Model  | Version | Status |
++--------+---------+--------+
+| simple | 1       | READY  |
++--------+---------+--------+
+```
+
+
+2. TRITONSERVER_LOG_ISO8601
+
+### Single-line Entry
+```
+<year>-<month>-<day>T<hour>:<min>:<sec>Z <level> <pid> <file>:<line>] <message>
+```
+
+Example:
+```
+2024-05-20T20:03:26Z I 3415 model_lifecycle.cc:441] "AsyncLoad() 'simple'"
+```
+
+### Multi-line Entry
+```
+<year>-<month>-<day>T<hour>:<min>:<sec>Z <level> <pid> <file>:<line>] <heading>
+<object>
+```
+
+Example:
+
+```
+2024-05-20T20:03:26Z I 3415 server.cc:676]
++--------+---------+--------+
+| Model  | Version | Status |
++--------+---------+--------+
+| simple | 1       | READY  |
++--------+---------+--------+
+```

qa/L0_backend_config/test.sh

@@ -25,6 +25,23 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Parses default-max-batch-size log record
+#
+# Example log record:
+# I0521 02:12:37.402353 161 backend_model.cc:503] "Adding default backend config setting: default-max-batch-size,4
+parse_default_max_batch_size() {
+    echo $(python3 -c "print('$1'.split(',')[1].strip('\"'))")
+}
+
+# Returns backend configuration json
+# message from server log file path
+#
+# Example: config_map = $(get_config_map server.log)
+get_config_map() {
+    BACKEND_CONFIG_MAP=$(grep "backend configuration:" $1)
+    echo $(python3 -c "backend_config='$BACKEND_CONFIG_MAP'.split('] \"backend configuration:\n')[1].rstrip('\"');print(backend_config)")
+}
+
 REPO_VERSION=${NVIDIA_TRITON_SERVER_VERSION}
 if [ "$#" -ge 1 ]; then
     REPO_VERSION=$1
@@ -88,7 +105,7 @@ else
     if [ "$RESULT_LOG_LINE" != "" ]; then
 
         # Pick out the logged value of the default-max-batch-size which gets passed into model creation
-        RESOLVED_DEFAULT_MAX_BATCH_SIZE=$(awk -v line="$RESULT_LOG_LINE" 'BEGIN {split(line, a, "]"); split(a[2], b, ": "); split(b[2], c, ","); print c[2]}')
+        RESOLVED_DEFAULT_MAX_BATCH_SIZE=$(parse_default_max_batch_size "${RESULT_LOG_LINE}")
 
         if [ "$RESOLVED_DEFAULT_MAX_BATCH_SIZE" != "4" ]; then
             echo "*** FAILED: Found default-max-batch-size not equal to the expected default-max-batch-size. Expected: default-max-batch-size,4, Found: $RESOLVED_DEFAULT_MAX_BATCH_SIZE \n"
@@ -117,7 +134,7 @@ for ((i=0; i < ${#POSITIVE_TEST_ARGS[@]}; i++)); do
         if [ "$RESULT_LOG_LINE" != "" ]; then
 
             # Pick out the logged value of the default-max-batch-size which gets passed into model creation
-            RESOLVED_DEFAULT_MAX_BATCH_SIZE=$(awk -v line="$RESULT_LOG_LINE" 'BEGIN {split(line, a, "]"); split(a[2], b, ": "); split(b[2], c, ","); print c[2]}')
+            RESOLVED_DEFAULT_MAX_BATCH_SIZE=$(parse_default_max_batch_size "${RESULT_LOG_LINE}")
 
             if [ "$RESOLVED_DEFAULT_MAX_BATCH_SIZE" != "${POSITIVE_TEST_ANSWERS[$i]}" ]; then
                 echo "*** FAILED: Found default-max-batch-size not equal to the expected default-max-batch-size. Expected: ${POSITIVE_TEST_ANSWERS[$i]}, Found: $RESOLVED_DEFAULT_MAX_BATCH_SIZE \n"
@@ -330,8 +347,8 @@ if [ "$SERVER_PID" == "0" ]; then
 
 else
     # Count number of default configs
-    BACKEND_CONFIG_MAP=$(grep -a "backend configuration:" $SERVER_LOG -A 1  | grep -v "backend configuration")
-    DEFAULT_CONFIG_COUNT=$(echo $BACKEND_CONFIG_MAP | jq -r | jq '.["cmdline"]' | jq 'length')
+    BACKEND_CONFIG_MAP=$(get_config_map $SERVER_LOG)
+    DEFAULT_CONFIG_COUNT=$(echo $BACKEND_CONFIG_MAP | jq -r | jq '.["cmdline"]' | jq length)
     if [ $DEFAULT_CONFIG_COUNT -lt 4 ]; then
         echo "*** FAILED: Expected number of default configs to be at least 4 but found: $DEFAULT_CONFIG_COUNT\n"
         RET=1
@@ -361,7 +378,7 @@ if [ "$SERVER_PID" == "0" ]; then
 
 else
     # Count number of default configs
-    BACKEND_CONFIG_MAP=$(grep -a "backend configuration:" $SERVER_LOG -A 1  | grep -v "backend configuration")
+    BACKEND_CONFIG_MAP=$(get_config_map $SERVER_LOG)
     CONFIG_VALUE=$(echo $BACKEND_CONFIG_MAP | jq -r | jq '.["cmdline"]' | jq -r '.["min-compute-capability"]')
 
     if [ $CONFIG_VALUE != $MIN_COMPUTE_CAPABILITY ]; then
@@ -385,7 +402,7 @@ if [ "$SERVER_PID" == "0" ]; then
 
 else
     # Count number of default configs
-    BACKEND_CONFIG_MAP=$(grep -a "backend configuration:" $SERVER_LOG -A 1  | grep -v "backend configuration")
+    BACKEND_CONFIG_MAP=$(get_config_map $SERVER_LOG)
     TOTAL_CONFIG_COUNT=$(echo $BACKEND_CONFIG_MAP | jq -r | jq '.["cmdline"]' | jq 'length')
 
     if [ $TOTAL_CONFIG_COUNT -ne $EXPECTED_CONFIG_COUNT ]; then