chore: add task

Author: RodrigoVillar

Taskfile.yml

@@ -342,6 +342,12 @@ tasks:
       - task: build
       - cmd: go run ./tests/load/main --avalanchego-path=./build/avalanchego {{.CLI_ARGS}}
 
+  test-load-devnet: 
+    desc: Runs e2e test for load testing against an external network
+    cmds:
+      - task: build
+      - cmd: go test -run ^TestDevnetConnection ./tests/load --avalanchego-path=../../build/avalanchego
+
   test-load-exclusive:
     desc: Runs load tests against kube with exclusive scheduling
     cmds:

scripts/build_test.sh

@@ -19,7 +19,7 @@ if [[ -n "${NO_RACE:-}" ]]; then
     race=""
 fi
 
-EXCLUDED_TARGETS="| grep -v /mocks | grep -v proto | grep -v tests/e2e | grep -v tests/load/c | grep -v tests/upgrade | grep -v tests/fixture/bootstrapmonitor/e2e | grep -v tests/reexecute"
+EXCLUDED_TARGETS="| grep -v /mocks | grep -v proto | grep -v tests/e2e | grep -v tests/load | grep -v tests/upgrade | grep -v tests/fixture/bootstrapmonitor/e2e | grep -v tests/reexecute"
 
 if [[ "$(go env GOOS)" == "windows" ]]; then
   # Test discovery for the antithesis test setups is broken due to

tests/load/main/main.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/libevm/crypto"
 	"github.com/ava-labs/libevm/ethclient"
+	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
@@ -97,19 +98,36 @@ func main() {
 		require.NoError(metricsServer.Stop())
 	})
 
-	var workers []load.Worker
+	var (
+		workers []load.Worker
+		labels  map[string]string
+	)
+
 	if devnetConfigPath != "" {
 		b, err := os.ReadFile(devnetConfigPath)
 		require.NoError(err)
 
 		var devnetConfig load.DevnetConfig
 		require.NoError(json.Unmarshal(b, &devnetConfig))
 
-		workers = load.ConnectNetwork(tc, metricsServer, devnetConfig)
+		workers = load.ConnectNetwork(tc, devnetConfig)
+
+		networkUUID := uuid.New()
+		labels = map[string]string{
+			"job":               "load-test",
+			"is_ephemeral_node": "false",
+			"chain":             "C",
+			"networkUUID":       networkUUID.String(),
+		}
 	} else {
-		workers = startNetwork(tc, metricsServer)
+		network, wkrs := startNetwork(tc)
+
+		workers = wkrs
+		labels = network.GetMonitoringLabels()
 	}
 
+	startPrometheusMonitoring(tc, labels, metricsServer.Address())
+
 	chainID, err := workers[0].Client.ChainID(ctx)
 	require.NoError(err)
 
@@ -143,7 +161,7 @@ func main() {
 // interact with the network.
 //
 // Customization of the network and the number of workers can be set via flags.
-func startNetwork(tc tests.TestContext, metricsServer *tests.PrometheusServer) []load.Worker {
+func startNetwork(tc tests.TestContext) (*tmpnet.Network, []load.Worker) {
 	require := require.New(tc)
 
 	numNodes, err := flagVars.NodeCount()
@@ -169,19 +187,6 @@ func startNetwork(tc tests.TestContext, metricsServer *tests.PrometheusServer) [
 	wsURIs, err := tmpnet.GetNodeWebsocketURIs(network.Nodes, blockchainID)
 	require.NoError(err)
 
-	monitoringConfigFilePath, err := tmpnet.WritePrometheusSDConfig("load-test", tmpnet.SDConfig{
-		Targets: []string{metricsServer.Address()},
-		Labels:  network.GetMonitoringLabels(),
-	}, false)
-	require.NoError(err, "failed to generate monitoring config file")
-
-	tc.DeferCleanup(func() {
-		require.NoError(
-			os.Remove(monitoringConfigFilePath),
-			"failed †o remove monitoring config file",
-		)
-	})
-
 	workers := make([]load.Worker, len(keys))
 	for i := range len(keys) {
 		wsURI := wsURIs[i%len(wsURIs)]
@@ -194,7 +199,27 @@ func startNetwork(tc tests.TestContext, metricsServer *tests.PrometheusServer) [
 		}
 	}
 
-	return workers
+	return network, workers
+}
+
+// startPrometheusMonitoring enables Prometheus monitoring for any client-side
+// metrics and registers a cleanup function to remove the monitoring
+// configuration file when the test completes.
+func startPrometheusMonitoring(tc tests.TestContext, labels map[string]string, serverAddress string) {
+	require := require.New(tc)
+
+	monitoringConfigFilePath, err := tmpnet.WritePrometheusSDConfig("load-test", tmpnet.SDConfig{
+		Targets: []string{serverAddress},
+		Labels:  labels,
+	}, false)
+	require.NoError(err, "failed to generate monitoring config file")
+
+	tc.DeferCleanup(func() {
+		require.NoError(
+			os.Remove(monitoringConfigFilePath),
+			"failed †o remove monitoring config file",
+		)
+	})
 }
 
 // newTokenContract deploys an instance of an ERC20 token and distributes the

tests/load/network.go

@@ -4,14 +4,10 @@
 package load
 
 import (
-	"os"
-
 	"github.com/ava-labs/libevm/ethclient"
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/tests"
-	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
 )
 
@@ -28,10 +24,11 @@ type DevnetConfig struct {
 func (d DevnetConfig) ParseKeys() ([]*secp256k1.PrivateKey, error) {
 	keys := make([]*secp256k1.PrivateKey, len(d.PrivateKeys))
 	for i, pk := range d.PrivateKeys {
-		key, err := secp256k1.ToPrivateKey([]byte(pk))
-		if err != nil {
+		key := new(secp256k1.PrivateKey)
+		if err := key.UnmarshalText([]byte(pk)); err != nil {
 			return nil, err
 		}
+
 		keys[i] = key
 	}
 
@@ -40,11 +37,7 @@ func (d DevnetConfig) ParseKeys() ([]*secp256k1.PrivateKey, error) {
 
 // ConnectNetwork connects to an existing network and returns a list of workers
 // that can interact with the network.
-//
-// The function also configures Prometheus monitoring for any client-side
-// metrics defined in metricsServer and registers a cleanup function to remove the
-// monitoring configuration file when the test completes.
-func ConnectNetwork(tc tests.TestContext, metricsServer *tests.PrometheusServer, devnetConfig DevnetConfig) []Worker {
+func ConnectNetwork(tc tests.TestContext, devnetConfig DevnetConfig) []Worker {
 	require := require.New(tc)
 
 	keys, err := devnetConfig.ParseKeys()
@@ -67,27 +60,5 @@ func ConnectNetwork(tc tests.TestContext, metricsServer *tests.PrometheusServer,
 		}
 	}
 
-	// XXX: we could probably remove this metrics code from ConnectNetwork
-	networkUUID := uuid.NewString()
-	labels := map[string]string{
-		"job":               "load-test",
-		"is_ephemeral_node": "false",
-		"chain":             "C",
-		"networkUUID":       networkUUID,
-	}
-
-	monitoringConfigFilePath, err := tmpnet.WritePrometheusSDConfig("load-test", tmpnet.SDConfig{
-		Targets: []string{metricsServer.Address()},
-		Labels:  labels,
-	}, false)
-	require.NoError(err, "failed to generate monitoring config file")
-
-	tc.DeferCleanup(func() {
-		require.NoError(
-			os.Remove(monitoringConfigFilePath),
-			"failed †o remove monitoring config file",
-		)
-	})
-
 	return workers
 }

tests/load/network_test.go

@@ -4,13 +4,15 @@
 package load
 
 import (
+	"context"
+	"math/big"
 	"testing"
+	"time"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ava-labs/avalanchego/tests"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
 )
@@ -30,6 +32,7 @@ func init() {
 var _ = ginkgo.Describe("[Devnet Connection]", func() {
 	tc := e2e.NewTestContext()
 	require := require.New(tc)
+	ctx := context.Background()
 
 	var devnetConfig DevnetConfig
 
@@ -54,7 +57,10 @@ var _ = ginkgo.Describe("[Devnet Connection]", func() {
 
 		pks := make([]string, len(keys))
 		for i, key := range keys {
-			pks[i] = string(key.Bytes())
+			b, err := key.MarshalJSON()
+			require.NoError(err)
+
+			pks[i] = string(b)
 		}
 
 		devnetConfig = DevnetConfig{
@@ -64,10 +70,21 @@ var _ = ginkgo.Describe("[Devnet Connection]", func() {
 	})
 
 	ginkgo.It("can connect to an existing network", func() {
+		workers := ConnectNetwork(tc, devnetConfig)
+
+		client := workers[0].Client
+		chainID, err := client.ChainID(ctx)
+		require.NoError(err)
+
+		test := TransferTest{
+			Value: big.NewInt(1),
+		}
+
 		registry := prometheus.NewRegistry()
-		metricsServer, err := tests.NewPrometheusServer(registry)
+		generator, err := NewLoadGenerator(workers, chainID, "devnet-connection-test", registry, test)
 		require.NoError(err)
 
-		_ = ConnectNetwork(tc, metricsServer, devnetConfig)
+		timeout := 30 * time.Second
+		generator.Run(ctx, tc.Log(), timeout, timeout)
 	})
 })