Skip to content

Commit a86ebfa

Browse files
maru-avamaru-ava
committed
[testing] Simplify log and metric collection
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.
1 parent 6d2521c commit a86ebfa

File tree

8 files changed

+104
-260
lines changed

8 files changed

+104
-260
lines changed

‎.github/workflows/tests.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,15 @@ jobs:
147147
shell: bash
148148
run: ./scripts/build.sh
149149
- name: Run Warp E2E Tests
150-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
150+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@194a2d3e1ff668d601005b5fd60bd74384ced90d
151151
with:
152-
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_warp.sh
153-
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
152+
run: ./scripts/run_ginkgo_warp.sh
153+
run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego
154+
artifact_prefix: warp
155+
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
154156
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
155-
loki_id: ${{ secrets.LOKI_ID || '' }}
157+
loki_username: ${{ secrets.LOKI_ID || '' }}
156158
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
157-
- name: Upload tmpnet network dir for warp testing
158-
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
159-
if: always()
160-
with:
161-
name: warp-tmpnet-data
162159
e2e_load:
163160
name: e2e load tests
164161
runs-on: ubuntu-latest
@@ -178,18 +175,15 @@ jobs:
178175
shell: bash
179176
run: ./scripts/build.sh
180177
- name: Run E2E Load Tests
181-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
178+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@194a2d3e1ff668d601005b5fd60bd74384ced90d
182179
with:
183-
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_load.sh
184-
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
180+
run: ./scripts/run_ginkgo_load.sh
181+
run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego
182+
artifact_prefix: load
183+
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
185184
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
186-
loki_id: ${{ secrets.LOKI_ID || '' }}
185+
loki_username: ${{ secrets.LOKI_ID || '' }}
187186
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
188-
- name: Upload tmpnet network dir for load testing
189-
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
190-
if: always()
191-
with:
192-
name: load-tmpnet-data
193187
test_build_image:
194188
name: Image build
195189
runs-on: ubuntu-latest

‎flake.lock

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
# To use:
3+
# - install nix: https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-file#install-nix
4+
# - run `nix develop` or use direnv (https://direnv.net/)
5+
# - for quieter direnv output, set `export DIRENV_LOG_FORMAT=`
6+
7+
description = "Subnet-EVM development environment";
8+
9+
inputs = {
10+
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.*.tar.gz";
11+
avalanchego.url = "github:ava-labs/avalanchego?ref=194a2d3e1ff668d601005b5fd60bd74384ced90d";
12+
};
13+
14+
outputs = { self, nixpkgs, avalanchego, ... }:
15+
let
16+
allSystems = builtins.attrNames avalanchego.devShells;
17+
forAllSystems = nixpkgs.lib.genAttrs allSystems;
18+
in {
19+
# Define the development shells for this repository
20+
devShells = forAllSystems (system: {
21+
default = avalanchego.devShells.${system}.default;
22+
});
23+
};
24+
}

‎go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.6
55
require (
66
github.com/VictoriaMetrics/fastcache v1.12.1
77
github.com/antithesishq/antithesis-sdk-go v0.3.8
8-
github.com/ava-labs/avalanchego v1.12.3-0.20250218154446-f1ec9a13b90a
8+
github.com/ava-labs/avalanchego v1.12.3-warp-verify4
99
github.com/cespare/cp v0.1.0
1010
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
1111
github.com/davecgh/go-spew v1.1.1
@@ -57,7 +57,7 @@ require (
5757
require (
5858
github.com/DataDog/zstd v1.5.2 // indirect
5959
github.com/NYTimes/gziphandler v1.1.1 // indirect
60-
github.com/ava-labs/coreth v0.14.1-rc.1.0.20250217192834-6060a4a6a6d3 // indirect
60+
github.com/ava-labs/coreth v0.14.2-verify-interface4 // indirect
6161
github.com/beorn7/perks v1.0.1 // indirect
6262
github.com/bits-and-blooms/bitset v1.10.0 // indirect
6363
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
@@ -174,3 +174,5 @@ require (
174174
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
175175
sigs.k8s.io/yaml v1.3.0 // indirect
176176
)
177+
178+
replace github.com/ava-labs/avalanchego => github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
6060
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6161
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6262
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
63-
github.com/ava-labs/avalanchego v1.12.3-0.20250218154446-f1ec9a13b90a h1:cBuGdwpaB1TBnfHS0w7oJyBJlM2UGOS4CEioxqMCG2g=
64-
github.com/ava-labs/avalanchego v1.12.3-0.20250218154446-f1ec9a13b90a/go.mod h1:pgUuh27zaeaXeMiIqqu/OWpbAhJQkYMJMft6nxXG9FE=
65-
github.com/ava-labs/coreth v0.14.1-rc.1.0.20250217192834-6060a4a6a6d3 h1:0OrQidq+b3kb7KlnDqc5mkB/73i1zxYEMiXioWSU4+w=
66-
github.com/ava-labs/coreth v0.14.1-rc.1.0.20250217192834-6060a4a6a6d3/go.mod h1:/XrU+CAm/0wiY5Ui05TLj2/n+czbCV6/Qrw/UMWp5aI=
63+
github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92 h1:92IhW5Al44mwwotcOjj0vYfAlqlliTN76ScKGW9wKGU=
64+
github.com/ava-labs/avalanchego v1.12.3-0.20250202045707-15c496b09f92/go.mod h1:PkpeGfEdsTccz87SDHidto21U5+BSBGZ+BNPW6Zplbc=
65+
github.com/ava-labs/coreth v0.14.2-verify-interface4 h1:AYeN8R6ZnNu/K8KwBQD4ELphvLpvNxAjkX3SBcJ+bps=
66+
github.com/ava-labs/coreth v0.14.2-verify-interface4/go.mod h1:wQaeiolUP0vCHS1mC0lIMXzHF05vbjugSLCBFDnO4Gs=
6767
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6868
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
6969
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

‎scripts/run_prometheus.sh

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)