diff --git a/src/metrics_server/test_integration_action.sh b/src/metrics_server/test_integration_action.sh index 78b51c49..73782ddc 100755 --- a/src/metrics_server/test_integration_action.sh +++ b/src/metrics_server/test_integration_action.sh @@ -22,8 +22,6 @@ CONNECTIONS_TABLE=connections_v1 FEATURES_TABLE=feature_metrics METRICS_URL=https://dev.metrics.getoutline.org -CONNECTIONS_PATH=connections -FEATURES_PATH=features TMPDIR="$(mktemp -d)" CONNECTIONS_REQUEST="$TMPDIR/connections.json" @@ -85,14 +83,14 @@ EOF echo "Connections request:" cat $CONNECTIONS_REQUEST -curl -X POST -H "Content-Type: application/json" -d @$CONNECTIONS_REQUEST $METRICS_URL/$CONNECTIONS_PATH && echo +curl -X POST -H "Content-Type: application/json" -d @$CONNECTIONS_REQUEST $METRICS_URL/connections && echo sleep 5 bq --project_id $BIGQUERY_PROJECT --format json query --nouse_legacy_sql 'SELECT serverId, userId, bytesTransferred, countries FROM `'"$BIGQUERY_DATASET.$CONNECTIONS_TABLE"'` WHERE serverId = "'"$SERVER_ID"'" ORDER BY bytesTransferred DESC LIMIT 2' > $CONNECTIONS_RESPONSE diff $CONNECTIONS_RESPONSE $CONNECTIONS_EXPECTED_RESPONSE echo "Features request:" cat $FEATURES_REQUEST -curl -X POST -H "Content-Type: application/json" -d @$FEATURES_REQUEST $METRICS_URL/$FEATURES_PATH && echo +curl -X POST -H "Content-Type: application/json" -d @$FEATURES_REQUEST $METRICS_URL/features && echo sleep 5 bq --project_id $BIGQUERY_PROJECT --format json query --nouse_legacy_sql 'SELECT serverId, serverVersion, dataLimit FROM `'"$BIGQUERY_DATASET.$FEATURES_TABLE"'` WHERE serverId = "'"$SERVER_ID"'" ORDER BY timestamp DESC LIMIT 1' > $FEATURES_RESPONSE diff $FEATURES_RESPONSE $FEATURES_EXPECTED_RESPONSE