Skip to content

Commit

Permalink
[testing] Simplify log and metric collection
Browse files Browse the repository at this point in the history
Update to use the avalanchego nix flake to install promtail and
prometheus and have tmpnet run them, removing the need for the
run_prometheus.sh and run_promtail.sh scripts.
  • Loading branch information
maru-ava committed Feb 2, 2025
1 parent a1bfa0e commit 190ef64
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 252 deletions.
28 changes: 20 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: ${{ env.min_go_version }}
- name: Install nix
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Install flake dependencies
run: ./scripts/nix_develop.sh --command echo "dependencies installed"
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -147,12 +153,12 @@ jobs:
shell: bash
run: ./scripts/build.sh
- name: Run Warp E2E Tests
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@15c496b09
with:
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_warp.sh
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/nix_develop.sh --impure --command ./scripts/run_ginkgo_warp.sh --enable-collectors
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
loki_id: ${{ secrets.LOKI_ID || '' }}
loki_username: ${{ secrets.LOKI_ID || '' }}
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
- name: Upload tmpnet network dir for warp testing
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
Expand All @@ -171,19 +177,25 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: ${{ env.min_go_version }}
- name: Install nix
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Install flake dependencies
run: ./scripts/nix_develop.sh --command echo "dependencies installed"
- name: Install AvalancheGo Release
shell: bash
run: BASEDIR=/tmp/e2e-test AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/install_avalanchego_release.sh
- name: Build Subnet-EVM Plugin Binary
shell: bash
run: ./scripts/build.sh
- name: Run E2E Load Tests
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@15c496b09
with:
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_load.sh
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/nix_develop.sh --impure --command ./scripts/run_ginkgo_load.sh --enable-collectors
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
loki_id: ${{ secrets.LOKI_ID || '' }}
loki_username: ${{ secrets.LOKI_ID || '' }}
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
- name: Upload tmpnet network dir for load testing
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.8
require (
github.com/VictoriaMetrics/fastcache v1.12.1
github.com/antithesishq/antithesis-sdk-go v0.3.8
github.com/ava-labs/avalanchego v1.12.2
github.com/ava-labs/avalanchego v1.12.3-warp-verify4
github.com/cespare/cp v0.1.0
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
github.com/davecgh/go-spew v1.1.1
Expand Down Expand Up @@ -57,7 +57,7 @@ require (
require (
github.com/DataDog/zstd v1.5.2 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/ava-labs/coreth v0.14.1-rc.1 // indirect
github.com/ava-labs/coreth v0.14.2-verify-interface4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
Expand Down Expand Up @@ -174,3 +174,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/ava-labs/avalanchego => github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/ava-labs/avalanchego v1.12.2 h1:vZroUgB5xMMczDQnw9etDD1XhZsejFlKky+ZZv8wOKc=
github.com/ava-labs/avalanchego v1.12.2/go.mod h1:uEDLbAUPcGCfDWW680rVfysEofUe/jWte5qQk0j5hMs=
github.com/ava-labs/coreth v0.14.1-rc.1 h1:U72XlRm/fKyASmjThsWzfO/ZRvu1kaONFaX+KdJNxIc=
github.com/ava-labs/coreth v0.14.1-rc.1/go.mod h1:lxDSXLcrszMo0N/PVJzfZ//H+bRwXF/KQWtpEYgXZqM=
github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92 h1:92IhW5Al44mwwotcOjj0vYfAlqlliTN76ScKGW9wKGU=
github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92/go.mod h1:PkpeGfEdsTccz87SDHidto21U5+BSBGZ+BNPW6Zplbc=
github.com/ava-labs/coreth v0.14.2-verify-interface4 h1:AYeN8R6ZnNu/K8KwBQD4ELphvLpvNxAjkX3SBcJ+bps=
github.com/ava-labs/coreth v0.14.2-verify-interface4/go.mod h1:wQaeiolUP0vCHS1mC0lIMXzHF05vbjugSLCBFDnO4Gs=
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
Expand Down
12 changes: 12 additions & 0 deletions scripts/nix_develop.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

set -euo pipefail

# Load the versions
SUBNET_EVM_PATH=$(
cd "$(dirname "${BASH_SOURCE[0]}")"
cd .. && pwd
)
source "$SUBNET_EVM_PATH"/scripts/versions.sh

nix develop github:ava-labs/avalanchego?ref="${AVALANCHE_VERSION}" "${@}"
2 changes: 1 addition & 1 deletion scripts/run_ginkgo_load.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ if [[ -n "${AVALANCHEGO_BUILD_PATH}" ]]; then
echo "Running with extra args:" "${EXTRA_ARGS[@]}"
fi

ginkgo -vv --label-filter="${GINKGO_LABEL_FILTER:-}" ./tests/load -- "${EXTRA_ARGS[@]}"
ginkgo -vv --label-filter="${GINKGO_LABEL_FILTER:-}" ./tests/load -- "${EXTRA_ARGS[@]}" "${@}"
2 changes: 1 addition & 1 deletion scripts/run_ginkgo_warp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ if [[ -n "${AVALANCHEGO_BUILD_PATH}" ]]; then
echo "Running with extra args:" "${EXTRA_ARGS[@]}"
fi

ginkgo -vv --label-filter="${GINKGO_LABEL_FILTER:-}" ./tests/warp -- "${EXTRA_ARGS[@]}"
ginkgo -vv --label-filter="${GINKGO_LABEL_FILTER:-}" ./tests/warp -- "${EXTRA_ARGS[@]}" "${@}"
120 changes: 0 additions & 120 deletions scripts/run_prometheus.sh

This file was deleted.

115 changes: 0 additions & 115 deletions scripts/run_promtail.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# shellcheck disable=SC2034

# Don't export them as they're used in the context of other calls
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.12.2'}
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'15c496b09f92cc5ac23b5aa2937d17a258d9a14f'}
GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'}

0 comments on commit 190ef64

Please sign in to comment.