[CONSUL-443] Create dogstatsd Function (#59)

hashicorp · Dec 21, 2022 · 7b10dde · 7b10dde
1 parent 460fe8a
commit 7b10dde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats b/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats
@@ -29,14 +29,11 @@ load helpers
 }
 
 @test "s1 proxy should be sending metrics to statsd" {
-  run retry_default cat /workdir/primary/statsd/statsd.log
+  run retry_default must_match_in_statsd_logs '^envoy\.' primary  
 
-  echo "METRICS:"
-  echo "$output"
-  echo "COUNT: $(echo "$output" | grep -Ec '^envoy\.')"
+  echo "METRICS: $output"
 
-  [ "$status" == 0 ]
-  [ $(echo $output | grep -Ec '^envoy\.') -gt "0" ]
+  [ "$status" == 0 ]  
 }
 
 @test "s1 proxy should be sending dogstatsd tagged metrics" {

diff --git a/test/integration/connect/envoy/helpers.windows.bash b/test/integration/connect/envoy/helpers.windows.bash
@@ -623,8 +623,13 @@ function kill_envoy {
 function split_lines_in_stats {
   local MATCH=$1
   local FILE=$2
-
-  sed -i "s/$MATCH/\n$MATCH/g" $FILE
+  local LINE_COUNT=$( sed -n '$=' $FILE )
+  if [[ $LINE_COUNT == "1" ]]
+  then
+    sed -i "s/$MATCH/\n$MATCH/g" $FILE
+  else
+    return 0
+  fi    
 }
 
 function must_match_in_statsd_logs {