From f96680615f56a5605b1b9f2515fd685e11922924 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 9 Jan 2024 17:37:37 -0300 Subject: [PATCH] update tracing readme, use latest ctf --- .github/tracing/README.md | 11 ++++++++++- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/testconfig/testconfig.go | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/tracing/README.md b/.github/tracing/README.md index f60bcfc4107..06b2eef6652 100644 --- a/.github/tracing/README.md +++ b/.github/tracing/README.md @@ -9,7 +9,16 @@ One way to generate traces locally today is with the OCR2 basic smoke test. 1. navigate to `.github/tracing/` and then run `docker compose --file local-smoke-docker-compose.yaml up` 2. setup a local docker registry at `127.0.0.1:5000` (https://www.docker.com/blog/how-to-use-your-own-registry-2/) 3. run `make build_push_plugin_docker_image` in `chainlink/integration-tests/Makefile` -4. preapre your `overrides.toml` file with selected network and CL image name and version +4. preapre your `overrides.toml` file with selected network and CL image name and version and place it anywhere +inside `integration-tests` directory. Sample `overrides.toml` file: +```toml +[ChainlinkImage] +image="127.0.0.1:5000/chainlink" +version="develop" + +[Network] +selected_networks=["simulated"] +``` 5. run `go test -run TestOCRv2Basic ./smoke/ocr2_test.go` 6. navigate to `localhost:3000/explore` in a web browser to query for traces diff --git a/integration-tests/go.mod b/integration-tests/go.mod index d0312154094..55804eb68c0 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.1 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231222010926-795676d23c7a - github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240105210947-56eb407fb059 + github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240109203534-6dbbc61e5f10 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 0eab097efc0..b8071a0d61b 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1497,8 +1497,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231219140448-151a4725f31 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231219140448-151a4725f312/go.mod h1:vqnojBNdzHNI6asWezJlottUiVEXudMEGf2Mz5R+xps= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231219014050-0c4a7831293a h1:atCXqF8e5U2zfEaA87cKJs+K1MAbOVh3V05gEd60fR0= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231219014050-0c4a7831293a/go.mod h1:YWKpf+hO9XMlzIWQT8yGoky3aeFLzMUVsjbs80LD77M= -github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240105210947-56eb407fb059 h1:NRE4HGK/uZaPgINJkMiVpjreh4I5oluriAJJ2osjlYw= -github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240105210947-56eb407fb059/go.mod h1:AHZ4xvgp9TM8pHGYj25CeaU4oY+gVJ2iJegP2oQDgoA= +github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240109203534-6dbbc61e5f10 h1:m6cdT56w1ZE32VhXVA3J8zcd1ISvQqoUHEIm5w10Ngs= +github.com/smartcontractkit/chainlink-testing-framework v1.22.3-0.20240109203534-6dbbc61e5f10/go.mod h1:AHZ4xvgp9TM8pHGYj25CeaU4oY+gVJ2iJegP2oQDgoA= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go index 8aabe78250c..b8d883b7e4b 100644 --- a/integration-tests/testconfig/testconfig.go +++ b/integration-tests/testconfig/testconfig.go @@ -165,11 +165,13 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { for _, fileName := range fileNames { logger.Debug().Msgf("Looking for config file %s", fileName) - filePath, err := osutil.FindFile(fileName, osutil.DEFAULT_STOP_FILE_NAME) + filePath, err := osutil.FindFile(fileName, osutil.DEFAULT_STOP_FILE_NAME, 2) if err != nil && errors.Is(err, os.ErrNotExist) { logger.Debug().Msgf("Config file %s not found", fileName) continue + } else if err != nil { + return TestConfig{}, errors.Wrapf(err, "error looking for file %s", filePath) } logger.Debug().Str("location", filePath).Msgf("Found config file %s", fileName)