Skip to content

Fix flaky serverless integration test #3418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 20, 2023
Merged

Fix flaky serverless integration test #3418

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d22678
try to fix flaky test
thedavl Jul 19, 2023
1ede7fe
Update test-gcloud-function.sh
thedavl Jul 19, 2023
f306214
Update test-gcloud-function.sh
thedavl Jul 19, 2023
998113a
Update test-gcloud-function.sh
thedavl Jul 19, 2023
f2d0d15
Update test-gcloud-function.sh
thedavl Jul 19, 2023
35cc5b2
Merge branch 'master' into david.lee/fix-sls-integration-test
thedavl Jul 19, 2023
eb8a4c8
Merge branch 'master' into david.lee/fix-sls-integration-test
thedavl Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions integration-tests/serverless/test-gcloud-function.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,33 @@ ls "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/"
STAGE=$(xxd -l 4 -c 4 -p </dev/random)

function cleanup {
gcloud functions delete dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --quiet
gcloud functions delete dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --quiet --project datadog-sandbox
}
trap cleanup EXIT

echo "Deploying integration test cloud function"

gcloud functions deploy dd-trace-js-sls-mini-agent-integration-test-${STAGE} \
DEPLOY_OUTPUT=$(gcloud functions deploy dd-trace-js-sls-mini-agent-integration-test-${STAGE} \
--gen2 \
--runtime=nodejs18 \
--region=us-east1 \
--project=datadog-sandbox \
--source "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/" \
--entry-point=helloGET \
--trigger-http \
--allow-unauthenticated \
--env-vars-file "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/.env.yaml"
--env-vars-file "${SERVERLESS_INTEGRATION_DIR_PATH}/test-project/.env.yaml")

INVOKE_URL=$(echo "$DEPLOY_OUTPUT" | awk 'END {print $NF}')

echo "Calling deployed cloud function"

curl -s "https://us-east1-datadog-sandbox.cloudfunctions.net/dd-trace-js-sls-mini-agent-integration-test-${STAGE}"
curl -s "${INVOKE_URL}"

echo "Waiting 1 minute before tailing logs"
echo "Waiting 60 seconds before tailing logs"
sleep 60

LOGS=$(gcloud functions logs read dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --limit 1000)
LOGS=$(gcloud functions logs read dd-trace-js-sls-mini-agent-integration-test-${STAGE} --region us-east1 --gen2 --limit 1000 --project datadog-sandbox)

echo "$LOGS"

Expand Down