fix naming

signalfx · Feb 6, 2025 · c431b11 · c431b11
1 parent c038ceb
commit c431b11
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/gateway/gateway.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/gateway/gateway.sh
@@ -65,8 +65,8 @@ while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     sleep $DELAY
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$GATEWAY_LOGS_DIR/splunk/splunkd.log" 200
-    safetail "$GATEWAY_LOGS_DIR/splunk/Splunk_TA_otel.log"
+    safe_tail "$GATEWAY_LOGS_DIR/splunk/splunkd.log" 200
+    safe_tail "$GATEWAY_LOGS_DIR/splunk/Splunk_TA_otel.log"
     echo "Failed to extract agent bundle after $MAX_ATTEMPTS attempts. Logs above."
     exit 1
 fi
@@ -76,16 +76,16 @@ DELAY=10
 ATTEMPT=1
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     scp -i ~/.orca/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r "$ORCA_SSH_USER@$GATEWAY_IPV4_ADDR":/opt/splunk/var/log/splunk/ "$GATEWAY_LOGS_DIR"
-    if safegrep "Everything is ready" "$GATEWAY_LOGS_DIR/splunk/otel.log"; then
+    if safe_grep_log "Everything is ready" "$GATEWAY_LOGS_DIR/splunk/otel.log"; then
         break
     fi
     echo "Did not see startup message according to otel.log... Retrying in $DELAY seconds"
     ATTEMPT=$((ATTEMPT + 1))
     sleep $DELAY
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$GATEWAY_LOGS_DIR/splunk/Splunk_TA_otel.log"
-    safetail "$GATEWAY_LOGS_DIR/splunk/otel.log"
+    safe_tail "$GATEWAY_LOGS_DIR/splunk/Splunk_TA_otel.log"
+    safe_tail "$GATEWAY_LOGS_DIR/splunk/otel.log"
     echo "Failed to see startup message in otel.log after $MAX_ATTEMPTS attempts. Logs above."
     exit 1
 fi
@@ -100,16 +100,16 @@ DELAY=10
 ATTEMPT=1
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     scp -i ~/.orca/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r "$ORCA_SSH_USER@$GATEWAY_AGENT_IPV4_ADDR":/opt/splunk/var/log/splunk/ "$GATEWAY_AGENT_LOGS_DIR"
-    if safegrep "Done extracting agent bundle" "$GATEWAY_AGENT_LOGS_DIR/splunk/Splunk_TA_otel.log"; then
+    if safe_grep_log "Done extracting agent bundle" "$GATEWAY_AGENT_LOGS_DIR/splunk/Splunk_TA_otel.log"; then
         break
     fi
     echo "Extraction not complete according to Splunk_TA_otel.log... Retrying in $DELAY seconds"
     ATTEMPT=$((ATTEMPT + 1))
     sleep $DELAY
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$GATEWAY_AGENT_LOGS_DIR/splunk/splunkd.log" 200
-    safetail "$GATEWAY_AGENT_LOGS_DIR/splunk/Splunk_TA_otel.log"
+    safe_tail "$GATEWAY_AGENT_LOGS_DIR/splunk/splunkd.log" 200
+    safe_tail "$GATEWAY_AGENT_LOGS_DIR/splunk/Splunk_TA_otel.log"
     echo "Failed to extract agent bundle after $MAX_ATTEMPTS attempts. Logs above if present."
     exit 1
 fi
@@ -119,7 +119,7 @@ DELAY=10
 ATTEMPT=1
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     scp -i ~/.orca/id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r "$ORCA_SSH_USER@$GATEWAY_AGENT_IPV4_ADDR":/opt/splunk/var/log/splunk/otel.log "$GATEWAY_AGENT_LOGS_DIR"
-    if safegrep "Everything is ready" "$GATEWAY_AGENT_LOGS_DIR/otel.log"; then
+    if safe_grep_log "Everything is ready" "$GATEWAY_AGENT_LOGS_DIR/otel.log"; then
         break
     fi
     echo "Did not see startup message according to otel.log... Retrying in $DELAY seconds"
@@ -128,7 +128,7 @@ while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
     echo "Failed to see startup message in otel.log after $MAX_ATTEMPTS attempts."
-    safetail "$GATEWAY_AGENT_LOGS_DIR/otel.log"
+    safe_tail "$GATEWAY_AGENT_LOGS_DIR/otel.log"
     exit 1
 fi
 

diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
@@ -25,17 +25,17 @@ DELAY=10
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     # Copy logs from container
     scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r -i ~/.orca/id_rsa "splunk@$ip_addr:/opt/splunk/var/log/splunk/" "$TEST_FOLDER"
-    if safegrep "Starting otel agent" "$TEST_FOLDER/splunk/Splunk_TA_otel.log" &&
-       safegrep "Everything is ready" "$TEST_FOLDER/splunk/otel.log"; then
+    if safe_grep_log "Starting otel agent" "$TEST_FOLDER/splunk/Splunk_TA_otel.log" &&
+       safe_grep_log "Everything is ready" "$TEST_FOLDER/splunk/otel.log"; then
         break
     fi
     ATTEMPT=$((ATTEMPT + 1))
     sleep "$DELAY"
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$TEST_FOLDER/splunk/splunkd.log" 200
-    safetail "$TEST_FOLDER/splunk/Splunk_TA_otel.log"
-    safetail "$TEST_FOLDER/splunk/otel.log"
+    safe_tail "$TEST_FOLDER/splunk/splunkd.log" 200
+    safe_tail "$TEST_FOLDER/splunk/Splunk_TA_otel.log"
+    safe_tail "$TEST_FOLDER/splunk/otel.log"
     echo "Failed to find successful startup message(s) after $MAX_ATTEMPTS attempts. Logs above."
     exit 1
 fi
@@ -61,8 +61,8 @@ while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     sleep $DELAY
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$TEST_FOLDER/splunk/otel.log"
-    safetail "$TEST_FOLDER/uptime.json"
+    safe_tail "$TEST_FOLDER/splunk/otel.log"
+    safe_tail "$TEST_FOLDER/uptime.json"
     echo "Failed to find metrics within $CUTOFF_DELTA after $MAX_ATTEMPTS attempts. Logs above."
     exit 1
 fi
@@ -82,7 +82,7 @@ fi
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r -i ~/.orca/id_rsa "splunk@$ip_addr:/opt/splunk/var/log/splunk/$restart_log_file" "$TEST_FOLDER/splunk/$restart_log_file"
     # There seems to be an issue on linux where it does not gracefully wait for the job to shut down, need to investigate further.
-    (safegrep "INFO Otel agent stop" "$TEST_FOLDER/splunk/$restart_log_file" || safegrep "INFO Stopping otel" "$TEST_FOLDER/splunk/$restart_log_file") && break
+    (safe_grep_log "INFO Otel agent stop" "$TEST_FOLDER/splunk/$restart_log_file" || safe_grep_log "INFO Stopping otel" "$TEST_FOLDER/splunk/$restart_log_file") && break
     ATTEMPT=$((ATTEMPT + 1))
     sleep $DELAY
 done
@@ -100,15 +100,15 @@ ATTEMPT=1
 while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
     scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r -i ~/.orca/id_rsa "splunk@$ip_addr:/opt/splunk/var/log/splunk/Splunk_TA_otel.log" "$TEST_FOLDER/splunk/Splunk_TA_otel.log"
     scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r -i ~/.orca/id_rsa "splunk@$ip_addr:/opt/splunk/var/log/splunk/otel.log" "$TEST_FOLDER/splunk/otel.log"
-    if safegrep "Starting otel agent" "$TEST_FOLDER/splunk/Splunk_TA_otel.log" && safegrep "Everything is ready" "$TEST_FOLDER/splunk/otel.log"; then
+    if safe_grep_log "Starting otel agent" "$TEST_FOLDER/splunk/Splunk_TA_otel.log" && safe_grep_log "Everything is ready" "$TEST_FOLDER/splunk/otel.log"; then
         break
     fi
     ATTEMPT=$((ATTEMPT + 1))
     sleep $DELAY
 done
 if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
-    safetail "$TEST_FOLDER/splunk/Splunk_TA_otel.log"
-    safetail "$TEST_FOLDER/splunk/otel.log"
+    safe_tail "$TEST_FOLDER/splunk/Splunk_TA_otel.log"
+    safe_tail "$TEST_FOLDER/splunk/otel.log"
     echo "Failed to see restarted log after $MAX_ATTEMPTS attempts. Logs above."
     exit 1
 fi

diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/test-utils.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/test-utils.sh
@@ -22,7 +22,6 @@ repack_with_access_token() {
     echo "$repacked"
     return 0
 }
-#!/bin/bash -eux
 
 safe_tail() {
     filename="$1"