[XEN-3155] fix entrypoint scripts failing the json logging test because they do not report the correct fields for an application type log

Author: NotAPenguin0

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/80-java-opts.sh

@@ -34,7 +34,7 @@ fi
 IFS=$'\n'
 for I in $(env); do
     if [[ $I == JAVA_OPTS_* ]]; then
-        echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "' "-- collecting $I" '"}'
+        echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "' "-- collecting $I" '"}'
         VALUE=$(echo $I | cut -d '=' -f 2-)
         JAVA_OPTS="$JAVA_OPTS $VALUE"
     fi
@@ -43,4 +43,4 @@ done
 # Trim leading/trailing whitespace
 export JAVA_OPTS=$(echo $JAVA_OPTS | xargs echo)
 
-echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "' "Result: JAVA_OPTS=${JAVA_OPTS}" '"}'
+echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "' "Result: JAVA_OPTS=${JAVA_OPTS}" '"}'

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/89-check-validity.sh

@@ -2,11 +2,11 @@
 
 currentDate=$(date +%s)
 if [ -z "${BUILD_DATE}" ]; then
-  echo '{ "timestamp" : '"$(date -d @$currentDate +"%s")"' ,"severity" : "WARN", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "Unable to determine image age: BUILD_DATE is not set"}'
+  echo '{ "timestamp" : '"$(date -d @$currentDate +"%s")"' ,"severity" : "WARN", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "Unable to determine image age: BUILD_DATE is not set"}'
 else
   printf -v buildDate "%.0f\n" "$BUILD_DATE"
   timeelapsed=$(expr ${currentDate} - ${buildDate})
   if [ $timeelapsed -ge 2592000 ]; then # 30 days
-    echo '{ "timestamp" : '"$(date -d @$currentDate +"%s")"' ,"severity" : "WARN", "type" : "application","component" : "docker-entrypoint" , "fullMessage" : "This is an old image: BUILD_DATE='"$(date -d @$BUILD_DATE +"%Y-%m-%d %H:%M:%S")"' and currentDate='"$(date -d @$currentDate +"%Y-%m-%d %H:%M:%S")"'"}'
+    echo '{ "timestamp" : '"$(date -d @$currentDate +"%s")"' ,"severity" : "WARN", "type" : "entrypoint","component" : "docker-entrypoint" , "fullMessage" : "This is an old image: BUILD_DATE='"$(date -d @$BUILD_DATE +"%Y-%m-%d %H:%M:%S")"' and currentDate='"$(date -d @$currentDate +"%Y-%m-%d %H:%M:%S")"'"}'
   fi
 fi

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/90-logging-env-vars.sh

@@ -5,7 +5,7 @@ set -e
 # LOG_LEVEL_ environment variables and tells the Java process to use it.
 
 function log() {
-  echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'
+  echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'
 }
 
 if [ "$LOG4J_VERSION" = "1" ]; then

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.sh

@@ -5,12 +5,12 @@ DIR=/docker-entrypoint.d
 if [[ -d "$DIR" ]]
 then
   for SCRIPT in ${DIR}/*; do
-    echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "> Executing'"${SCRIPT}"'"}'
+    echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "> Executing'"${SCRIPT}"'"}'
     . "$SCRIPT"
   done
 fi
-echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "'"> Starting CMD: $@"'"}'
-echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "> exec '"$(eval eval echo $@)"'"}'
+echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "'"> Starting CMD: $@"'"}'
+echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "> exec '"$(eval eval echo $@)"'"}'
 # first 'eval' expands variables (like $JAVA_OPTS) in $@
 # second 'eval' flattens arguments, so that $JAVA_OPTS expanded into is not seen as a single argument (DOCKER-136)
 # which enables us to use exec-form with $JAVA_OPTS support: